all: gets module treatment

flake.nix

@@ -131,6 +131,7 @@
               sops-nix.nixosModules.sops
               ./common
               ./hosts/rico1
+              self.nixosModules.default
             ];
           };
         Rico2 =
@@ -151,6 +152,7 @@
               }
               lix-module.nixosModules.default
               sops-nix.nixosModules.sops
+              self.nixosModules.default
               ./common
               ./hosts/rico2
             ];
@@ -173,6 +175,7 @@
               }
               lix-module.nixosModules.default
               sops-nix.nixosModules.sops
+              self.nixosModules.default
               ./common
               ./hosts/wynne
             ];
@@ -195,6 +198,7 @@
               }
               lix-module.nixosModules.default
               sops-nix.nixosModules.sops
+              self.nixosModules.default
               ./common
               ./hosts/layne
             ];

hosts/layne/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }: {
+_: {
   imports = [
     ./hardware
     ./programs
@@ -7,26 +7,9 @@
     ./security.nix
   ];
 
-  nix.gc = {
+  nodeconfig = {
-    automatic = true;
+    minimize = true;
-    dates = "Fri *-*-* 00:00:00";
+    nix.auto-gc = true;
-    options = "--delete-old";
-    randomizedDelaySec = "1h";
-  };
-
-  documentation = {
-    enable = lib.mkDefault false;
-    doc.enable = lib.mkDefault false;
-    info.enable = lib.mkDefault false;
-    man.enable = lib.mkDefault false;
-    nixos.enable = lib.mkDefault false;
-  };
-
-  xdg = {
-    autostart.enable = lib.mkDefault false;
-    icons.enable = lib.mkDefault false;
-    mime.enable = lib.mkDefault false;
-    sounds.enable = lib.mkDefault false;
   };
 
   i18n = {

hosts/layne/programs/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./neovim.nix
     ./starship.nix
@@ -6,7 +6,6 @@
   ];
 
   programs = {
-    command-not-found.enable = lib.mkDefault false;
     git.enable = true;
   };
 

hosts/rico0/programs/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./neovim.nix
     ./starship.nix

hosts/rico1/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }: {
+_: {
   imports = [
     ./hardware
     ./programs
@@ -8,26 +8,9 @@
     ./security.nix
   ];
 
-  nix.gc = {
+  nodeconfig = {
-    automatic = true;
+    minimize = true;
-    dates = "Fri *-*-* 00:00:00";
+    nix.auto-gc = true;
-    options = "--delete-old";
-    randomizedDelaySec = "1h";
-  };
-
-  documentation = {
-    enable = lib.mkDefault false;
-    doc.enable = lib.mkDefault false;
-    info.enable = lib.mkDefault false;
-    man.enable = lib.mkDefault false;
-    nixos.enable = lib.mkDefault false;
-  };
-
-  xdg = {
-    autostart.enable = lib.mkDefault false;
-    icons.enable = lib.mkDefault false;
-    mime.enable = lib.mkDefault false;
-    sounds.enable = lib.mkDefault false;
   };
 
   # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243

hosts/rico1/programs/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./neovim.nix
     ./starship.nix
@@ -6,7 +6,6 @@
   ];
 
   programs = {
-    command-not-found.enable = lib.mkDefault false;
     git.enable = true;
   };
 

hosts/rico2/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }: {
+_: {
   imports = [
     ./hardware
     ./programs
@@ -8,26 +8,9 @@
     ./security.nix
   ];
 
-  nix.gc = {
+  nodeconfig = {
-    automatic = true;
+    minimize = true;
-    dates = "Fri *-*-* 00:00:00";
+    nix.auto-gc = true;
-    options = "--delete-old";
-    randomizedDelaySec = "1h";
-  };
-
-  documentation = {
-    enable = lib.mkDefault false;
-    doc.enable = lib.mkDefault false;
-    info.enable = lib.mkDefault false;
-    man.enable = lib.mkDefault false;
-    nixos.enable = lib.mkDefault false;
-  };
-
-  xdg = {
-    autostart.enable = lib.mkDefault false;
-    icons.enable = lib.mkDefault false;
-    mime.enable = lib.mkDefault false;
-    sounds.enable = lib.mkDefault false;
   };
 
   # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243

hosts/rico2/programs/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./neovim.nix
     ./starship.nix
@@ -6,7 +6,6 @@
   ];
 
   programs = {
-    command-not-found.enable = lib.mkDefault false;
     git.enable = true;
   };
 

hosts/wynne/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }: {
+_: {
   imports = [
     ./hardware
     ./programs
@@ -7,26 +7,9 @@
     ./security.nix
   ];
 
-  nix.gc = {
+  nodeconfig = {
-    automatic = true;
+    minimize = true;
-    dates = "Fri *-*-* 00:00:00";
+    nix.auto-gc = true;
-    options = "--delete-old";
-    randomizedDelaySec = "1h";
-  };
-
-  documentation = {
-    enable = lib.mkDefault false;
-    doc.enable = lib.mkDefault false;
-    info.enable = lib.mkDefault false;
-    man.enable = lib.mkDefault false;
-    nixos.enable = lib.mkDefault false;
-  };
-
-  xdg = {
-    autostart.enable = lib.mkDefault false;
-    icons.enable = lib.mkDefault false;
-    mime.enable = lib.mkDefault false;
-    sounds.enable = lib.mkDefault false;
   };
 
   i18n = {

hosts/wynne/programs/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./neovim.nix
     ./starship.nix
@@ -6,7 +6,6 @@
   ];
 
   programs = {
-    command-not-found.enable = lib.mkDefault false;
     git.enable = true;
   };