refactor

flake.nix

@@ -17,8 +17,9 @@
     }@inputs:
     let
       lib = nixpkgs.lib;
-      mod = import ./mod { inherit lib; };
-      specialArgs = { inherit inputs mod; };
+      lib' = import ./lib.nix { inherit lib; };
+      mod = lib'.walk-dir ./mod;
+      specialArgs = { inherit inputs mod lib'; };
     in
     {
       nixosConfigurations = {

host/c2/default.nix

@@ -5,7 +5,7 @@
   imports =
     with mod;
     [
-      collections.pc-common
+      collections.pc
       ./hardware-configuration.nix
     ]
     ++ (with inputs.nixos-hardware.nixosModules; [

host/solo/default.nix

@@ -5,10 +5,10 @@
   services.xserver.enable = true;
 
   imports = with mod; [
-    collections.pc-common
-    keyboard
+    collections.pc
+    software.keyboard
+    software.games
     nvidia-gpu
-    games
     ./hardware-configuration.nix
   ];
 

lib.nix

@@ -1,7 +1,6 @@
 { lib, ... }:
-
-let
-  walk =
+rec {
+  walk-dir =
     path:
     let
       dir = builtins.readDir path;
@@ -12,10 +11,8 @@ let
         if value == "regular" then
           import (path + "/${name}")
         else if value == "directory" then
-          walk (path + "/${name}")
+          walk-dir (path + "/${name}")
         else
-          builtins.throw "Cannot handle item of type ${value}";
+          builtins.throw "Item of type ${value} are unsupported.";
     }) dir;
-
-in
-walk ./.
+}

mod/collections/pc.nix

@@ -6,12 +6,13 @@
     fonts
     locale
     network
-    nix
+    nix-configuration
     security
     services
-    shell
-    software
+    software.development
+    software.programs
+    software.shell
+    software.window-manager
     users
-    window-manager
   ];
 }

mod/network.nix

@@ -11,6 +11,8 @@
     useRoutingFeatures = "client";
   };
 
+  systemd.services.NetworkManager-wait-online.enable = false;
+
   networking.networkmanager.ensureProfiles.profiles = {
     "tuda-vpn" = {
       connection = {

mod/services.nix

@@ -1,6 +1,5 @@
 { ... }:
 {
-  systemd.services.NetworkManager-wait-online.enable = false;
   services.printing.enable = true;
   services.avahi = {
     enable = true;

mod/software/development.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+{
+  documentation.dev.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    rustup
+    python313
+    python313Packages.mypy
+    gcc
+    clang
+    gdb
+    gnumake
+    binutils
+    nixfmt-rfc-style
+    man-pages
+    man-pages-posix
+  ];
+}

mod/software/games.nix

@@ -3,6 +3,5 @@
   environment.systemPackages = with pkgs; [
     runelite
   ];
-
   programs.steam.enable = true;
 }

mod/software/programs.nix

@@ -35,15 +35,8 @@
         obsidian
       ];
 
-      dev = with pkgs; [
-        rustup
-        python313
-        gcc
-        binutils
-      ];
-
     in
-    editors ++ messengers ++ util ++ media ++ productivity ++ dev;
+    editors ++ messengers ++ util ++ media ++ productivity;
 
   virtualisation = {
     docker.enable = true;

mod/software/shell.nix

@@ -10,7 +10,6 @@
     docker-compose
     fd
     gh
-    gnumake
     htop
     killall
     ripgrep
@@ -19,7 +18,6 @@
     unzip
     wget
     wl-clipboard
-    nixfmt-rfc-style
   ];
 
   programs = {