Clean up config step1

flake.lock

@@ -140,21 +140,6 @@
         "type": "indirect"
       }
     },
-    "nur": {
-      "locked": {
-        "lastModified": 1693424795,
-        "narHash": "sha256-7HBiRszliR7UjR9q4H4SXov6T7Tvoluuz/0M58jev0E=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "4a0b2e813a93e5932fbedaafab47e9c404e0a812",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "ags": "ags",
@@ -163,7 +148,6 @@
         "impermanence": "impermanence",
         "jq": "jq",
         "nixpkgs": "nixpkgs",
-        "nur": "nur",
         "tuxedo-nixos": "tuxedo-nixos"
       }
     },

flake.nix

@@ -9,7 +9,7 @@
     };
     impermanence.url = "github:nix-community/impermanence";
     # neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
-    nur.url = "github:nix-community/NUR";
+    # nur.url = "github:nix-community/NUR";
     jq = {
       url = "github:reegnz/jq-zsh-plugin";
       flake = false;
@@ -33,7 +33,7 @@
     self,
     home-manager,
     # neovim-nightly,
-    nur,
+    # nur,
     ags,
     nixpkgs,
     tuxedo-nixos,
@@ -42,87 +42,67 @@
   } @ rawInput: let
     user = "zoriya";
 
-    mkSystem = system: hostname: de: let
+    mkSystem = system: hostname: de: custom: let
       inputs = rawInput // {inherit user;};
     in
       nixpkgs.lib.nixosSystem {
         specialArgs = inputs;
-        modules = [
-          ./modules/misc
-          (./modules + "/${de}")
-          nur.nixosModules.nur
-          {
-            nixpkgs.overlays = [
-              (import ./overlays { inherit dwl-source; })
-              nur.overlay
-              # neovim-nightly.overlay
-            ];
-          }
-
-          ({pkgs, ...}: {
-            networking.hostName = hostname;
-            users.users.root.hashedPassword = builtins.readFile ./password/root;
-            users.users.${user} = {
-              hashedPassword = builtins.readFile ./password/${user};
-              isNormalUser = true;
-              extraGroups = ["wheel" "input" "docker" "audio" "mlocate"];
-              shell = pkgs.zsh;
-              packages = with pkgs; [
-                git
-                docker-compose
-                jq
+        modules =
+          [
+            ./modules/misc
+            (./modules + "/${de}")
+            # nur.nixosModules.nur
+            {
+              nixpkgs.overlays = [
+                (import ./overlays {inherit dwl-source;})
+                # nur.overlay
+                # neovim-nightly.overlay
               ];
-            };
-          })
-          ./hosts/${hostname}/hardware-configuration.nix
+            }
 
-          home-manager.nixosModules.home-manager
-          {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              extraSpecialArgs = inputs;
-              users.${user} = {
-                imports = [
-                  ./modules/home
-                  (./modules + "/${de}/home.nix")
+            ({pkgs, ...}: {
+              networking.hostName = hostname;
+              users.users.root.hashedPassword = builtins.readFile ./password/root;
+              users.users.${user} = {
+                hashedPassword = builtins.readFile ./password/${user};
+                isNormalUser = true;
+                extraGroups = ["wheel" "input" "docker" "audio" "mlocate"];
+                shell = pkgs.zsh;
+                packages = with pkgs; [
+                  git
+                  docker-compose
+                  jq
                 ];
               };
-            };
-          }
+            })
+            ./hosts/${hostname}/hardware-configuration.nix
 
-          ({pkgs, ...}: {
-            programs.zsh.enable = true;
-            environment.shells = with pkgs; [zsh];
-
-            services.locate = {
-              enable = true;
-              locate = pkgs.mlocate;
-              interval = "hourly";
-              localuser = null;
-            };
-
-            virtualisation.docker.enable = true;
-            environment.systemPackages = with pkgs; [
-              docker-compose
-              git
-              man-pages
-              man-pages-posix
-              ags.packages.x86_64-linux.default
-            ];
-            documentation.dev.enable = true;
-          })
-
-          tuxedo-nixos.nixosModules.default
-          ({lib, ...}: {
-            hardware.tuxedo-keyboard.enable = true;
-            hardware.tuxedo-control-center.enable = true;
-          })
-        ];
+            home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                extraSpecialArgs = inputs;
+                users.${user} = {
+                  imports = [
+                    ./modules/home
+                    (./modules + "/${de}/home.nix")
+                  ];
+                };
+              };
+            }
+          ]
+          ++ custom;
       };
   in {
     nixosConfigurations = {
-      fuhen = mkSystem "x86_64-linux" "fuhen" "dwl";
+      fuhen = mkSystem "x86_64-linux" "fuhen" "dwl" [
+        tuxedo-nixos.nixosModules.default
+        ({lib, ...}: {
+          hardware.tuxedo-keyboard.enable = true;
+          hardware.tuxedo-control-center.enable = true;
+        })
+      ];
     };
   };
 }

modules/dwl/default.nix

@@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ags, ...}: {
   services.xserver = {
     enable = true;
     displayManager = {
@@ -24,12 +18,28 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [dwl];
+  environment.systemPackages = with pkgs; [
+    dwl
+    ags.packages.x86_64-linux.default
+  ];
 
   # Those two lines prevent a crash with gdm autologin.
   systemd.services."getty@tty1".enable = false;
   systemd.services."autovt@tty1".enable = false;
 
+  services.printing.enable = true;
+  security.rtkit.enable = true;
+
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    jack.enable = true;
+    pulse.enable = true;
+  };
+  hardware.bluetooth.enable = true;
+
   security.polkit.enable = true;
   systemd.user.services.polkit-gnome-authentication-agent-1 = {
     description = "polkit-gnome-authentication-agent-1";

modules/home/zsh/default.nix

@@ -28,6 +28,7 @@ in {
     pciutils
     sshfs-fuse
     zip
+    scc
     nodePackages.http-server
     nodePackages.live-server
   ];

modules/misc/default.nix

@@ -1,29 +1,9 @@
-{
-  lib,
-  config,
-  pkgs,
-  user,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./fonts.nix
     ./impermanence.nix
   ];
 
-  services.printing.enable = true;
-  security.rtkit.enable = true;
-  security.polkit.enable = true;
-
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    jack.enable = true;
-    pulse.enable = true;
-  };
-  hardware.bluetooth.enable = true;
-
   security.sudo.extraConfig = ''
     Defaults  lecture="never"
   '';
@@ -55,8 +35,25 @@
     wineWowPackages.stable
     wineWowPackages.waylandFull
     winetricks
+    docker-compose
+    git
+    man-pages
+    man-pages-posix
   ];
 
+  programs.zsh.enable = true;
+  environment.shells = with pkgs; [zsh];
+
+  services.locate = {
+    enable = true;
+    locate = pkgs.mlocate;
+    interval = "hourly";
+    localuser = null;
+  };
+
+  virtualisation.docker.enable = true;
+  documentation.dev.enable = true;
+
   # boot.kernelPackages = pkgs.linuxPackages_latest;
   # This was needed on older versions of the kernel.
   #boot.kernelParams = ["i915.force_probe=46a6" "i915.enable_psr=0"];

modules/misc/fonts.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   config,
-  lib,
   ...
 }: {
   console = {

modules/misc/impermanence.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  config,
-  impermanence,
-  ...
-}: {
+{impermanence, ...}: {
   imports = [impermanence.nixosModules.impermanence];
   nix = {
     settings = {