🧹 Moved almost all files to /modules. Moved some code to separate files

.gitignore

@@ -1,6 +1,3 @@
-# Autogenerated
-hardware-configuration.nix
-
 # Symlink create by `nix build`
 result
 

configuration.nix

@@ -9,19 +9,7 @@
 }:
 
 {
-  imports = [
+  imports = [ ./modules ];
-    ./gnome
-    ./hardware-configuration.nix
-    ./keyboard.nix
-    ./terminal
-    ./hyprland
-    ./audio.nix
-    ./networking.nix
-    ./development.nix
-    ./security.nix
-    ./locale.nix
-    ./sddm.nix
-  ];
 
   nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
 
@@ -37,7 +25,6 @@
       "networkmanager"
       "wheel"
     ];
-    packages = with pkgs; [ ];
   };
 
   # Allow unfree packages
@@ -46,24 +33,14 @@
   environment.sessionVariables = {
     # Tells Electron apps to use Wayland
     NIXOS_OZONE_WL = "1";
-    NIXOS_CONFIG_PATH = "/etc/nixos";
-    LIBVA_DRIVER_NAME = "iHD"; # For hardware acceleration
-  };
-
-  fonts = {
-    fontconfig.enable = true;
-    packages = with pkgs; [
-      nerd-fonts.jetbrains-mono
-    ];
   };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    gnupg
     wget
-    kitty
     xdg-utils
+    xdg-desktop-portal
     xdg-desktop-portal-gtk
     kdePackages.qtwayland
     kdePackages.qtsvg
@@ -89,16 +66,7 @@
   # programs.mtr.enable = true;
 
   programs = {
-    gnupg.agent.enable = true;
-
     kdeconnect.enable = true;
-
-    steam = {
-      enable = true;
-      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-      dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-      localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
-    };
   };
 
   # List services that you want to enable:
@@ -108,48 +76,11 @@
 
   services = {
     flatpak.enable = true;
-
+    xserver.enable = true;
-    xserver = {
-      enable = true;
-      # Load Nvidia driver for Xorg and Wayland
-      videoDrivers = [ "nvidia" ];
-    };
-  };
-
-  stylix = {
-    enable = true;
-    image = ./catppuccin.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-    polarity = "dark";
-    opacity.terminal = 0.8;
-    override = {
-      base02 = "b0b0b0"; # Comments in shell
-      base03 = "b0b0b0"; # Comments in nvim
-      base04 = "b0b0b0"; # Secondary text in shell
-    };
   };
 
   qt.enable = true;
 
-  hardware = {
-    # Enable OpenGL
-    graphics = {
-      enable = true;
-      extraPackages = with pkgs; [
-        intel-media-driver # For Broadwell (2014) or newer processors. LIBVA_DRIVER_NAME=iHD
-      ];
-    };
-
-    nvidia = {
-      # Required
-      modesetting.enable = true;
-      # Use closed-source drivers
-      open = false;
-      # Enable the Nvidia settings menu
-      nvidiaSettings = true;
-    };
-  };
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

flake.lock

@@ -318,15 +318,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1736013363,
+        "lastModified": 1735344290,
-        "narHash": "sha256-P4lsS2Y5GzBfC8OfXtD/xWEucX6oHGTjOzjEjEJbXfc=",
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d7908bd09165db6699908b7e3970f137327cbf0",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -360,15 +361,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1735774425,
+        "lastModified": 1735344290,
-        "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -423,6 +425,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1735922141,
+        "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1735834308,
         "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
@@ -438,22 +456,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1735648875,
-        "narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -463,7 +465,7 @@
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ],
         "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
@@ -509,6 +511,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "stylix": "stylix"
       }
@@ -524,22 +527,25 @@
         "git-hooks": "git-hooks_2",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems_2",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1736011580,
+        "lastModified": 1736019457,
-        "narHash": "sha256-8gmk/i9ZA5C6LGRnqHb5sZ8UKaqT5GnS6XxeSPMSz+s=",
+        "narHash": "sha256-MWe3RXEV9dov1wFZraWagVAxynPo/VceStIYfNRgqG4=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "7dfcdb410118dcd02ba1d85a2179a6f1c877403f",
+        "rev": "5204b085385c0bfaa1eb1bb0f8dc81922012128d",
         "type": "github"
       },
       "original": {
         "owner": "danth",
+        "ref": "release-24.11",
         "repo": "stylix",
         "type": "github"
       }

flake.nix

@@ -2,22 +2,28 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixvim = {
       url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+    stylix = {
+      url = "github:danth/stylix/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    stylix.url = "github:danth/stylix";
   };
 
   outputs =
     inputs@{
       self, # Get a ref to outputs
       nixpkgs,
+      nixpkgs-unstable,
       home-manager,
       stylix,
       ...
@@ -28,7 +34,7 @@
     in
     {
       # Adds the nix fmt command to format nix files
-      formatter."${system}" = nixpkgs.legacyPackages."${system}".nixfmt-rfc-style;
+      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
 
       nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
         system = system;
@@ -44,7 +50,7 @@
               useUserPackages = true;
               # Passes inputs as an argument to home-manager
               extraSpecialArgs = { inherit inputs; };
-              users.martin = import ./home;
+              users.martin = import ./home-manager;
             };
           }
           stylix.nixosModules.stylix
@@ -52,8 +58,9 @@
       };
 
       overlays = {
+        # Gives access to unstable packages everywhere
         unstable-packages = final: _prev: {
-          unstable = import inputs.nixpkgs {
+          unstable = import nixpkgs-unstable {
             system = final.system;
             config.allowUnfree = true;
           };

home-manager/hyprland/hypridle/default.nix

@@ -21,11 +21,11 @@ in
           on-timeout = "loginctl lock-session";
         }
         # Turn off screens TODO buggy main monitor, turns off and on after resume
-#        {
+        #        {
-#          timeout = 120;
+        #          timeout = 120;
-#          on-timeout = "hyprctl dispatch dpms off";
+        #          on-timeout = "hyprctl dispatch dpms off";
-#          on-resume = "hyprctl dispatch dpms on";
+        #          on-resume = "hyprctl dispatch dpms on";
-#        }
+        #        }
         # Suspend
         {
           timeout = suspendAfter;

modules/default.nix

@@ -0,0 +1,19 @@
+{ ... }:
+
+{
+  imports = [
+    ./development.nix
+    ./fonts.nix
+    ./gnome
+    ./hardware
+    ./locale.nix
+    ./networking.nix
+    ./nix-helper.nix
+    ./hyprland
+    ./sddm.nix
+    ./security.nix
+    ./steam.nix
+    ./stylix.nix
+    ./terminal
+  ];
+}

modules/fonts.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+
+  fonts = {
+    fontconfig.enable = true;
+    packages = with pkgs; [
+      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+      jetbrains-mono
+      # The line below will replace the lines above in 25.05
+      # nerd-fonts.jetbrains-mono
+    ];
+  };
+
+}

modules/gnome/default.nix

@@ -10,7 +10,7 @@
     glib
     adwaita-icon-theme
     gnomeExtensions.appindicator
-#    gnome-extension-manager
+    #    gnome-extension-manager
     loupe
     gnome-calculator
     gnome-disk-utility

modules/hardware/audio.nix

@@ -17,6 +17,8 @@
     spotify
   ];
 
+  hardware.pulseaudio.enable = false; # Will be moved to services
+
   security.rtkit.enable = true; # Enable RealtimeKit for audio purposes
 
   services = {
@@ -30,6 +32,6 @@
       # Uncomment the following line if you want to use JACK applications
       # jack.enable = true;
     };
-    pulseaudio.enable = false;
+    #    pulseaudio.enable = false;
   };
 }

modules/hardware/default.nix

@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  imports = [
+    ./audio.nix
+    ./graphics
+    ./hardware-configuration.nix
+    ./keyboard.nix
+  ];
+}

modules/hardware/graphics/default.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./nvidia.nix
+  ];
+
+  # For hardware acceleration
+  environment.sessionVariables.LIBVA_DRIVER_NAME = "iHD";
+
+  # Enable OpenGL
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      # Used for hardware-acceleration
+      intel-media-driver # For Broadwell (2014) or newer processors. LIBVA_DRIVER_NAME=iHD
+    ];
+  };
+}

modules/hardware/graphics/nvidia.nix

@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  hardware.nvidia = {
+    # Required
+    modesetting.enable = true;
+    # Use closed-source drivers
+    open = false;
+    # Enable the Nvidia settings menu
+    nvidiaSettings = true;
+  };
+
+  # Load Nvidia driver for Xorg and Wayland
+  services.xserver.videoDrivers = [ "nvidia" ];
+}

modules/networking.nix

@@ -16,7 +16,5 @@
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 
-  services.tailscale = {
+  services.tailscale.enable = true;
-    enable = true;
-  };
 }

modules/nix-helper.nix

@@ -0,0 +1,9 @@
+# Nix-Helper: swgithub.com/viperML/nh
+{ ... }:
+
+{
+  programs.nh = {
+    enable = true;
+    flake = ./.;
+  };
+}

modules/sddm.nix

@@ -6,7 +6,7 @@
       flavor = "mocha";
       font = "Noto Sans";
       fontSize = "9";
-      background = "${./catppuccin_high.png}";
+      background = "${../catppuccin_high.png}";
       loginBackground = true;
     })
   ];

modules/security.nix

@@ -2,9 +2,12 @@
 
 {
   environment.systemPackages = with pkgs; [
+    gnupg
     yubioath-flutter
   ];
 
+  programs.gnupg.agent.enable = true;
+
   security.pam = {
     services = {
       login.u2fAuth = false; # U2F and password

modules/steam.nix

@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  programs.steam = {
+   enable = true;
+   remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+   dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+   localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
+  };
+}

modules/stylix.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+   stylix = {
+      enable = true;
+      image = ../catppuccin.png;
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+      polarity = "dark";
+      opacity.terminal = 0.8;
+      override = {
+        base02 = "b0b0b0"; # Comments in shell
+        base03 = "b0b0b0"; # Comments in nvim
+        base04 = "b0b0b0"; # Secondary text in shell
+      };
+    };
+}

modules/terminal/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./shell.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    kitty
+  ];
+}

rebuild

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-# Rebuild and switch the environment if successful
-git add .
-sudo ./fmt
-sudo nixos-rebuild switch --flake .#