treewide: refactor

flake.nix

@@ -138,11 +138,21 @@
       (mkNixOSConfig { hostname = "zachune-nixos"; })
 
       # Home-Manager configs
-      (mkHomeConfig { hostname = "home-linux"; })
       (mkHomeConfig {
-        hostname = "home-linux-minimal";
-        configuration = ./home-manager/minimal.nix;
+        hostname = "home-linux";
+        extraModules = [{
+          home-manager = {
+            desktop.enable = true;
+            dev = {
+              clojure.enable = true;
+              go.enable = true;
+              node.enable = true;
+              python.enable = true;
+            };
+          };
+        }];
       })
+      (mkHomeConfig { hostname = "home-linux-minimal"; })
       (mkHomeConfig {
         hostname = "steamdeck";
         username = "deck";

home-manager/default.nix

@@ -2,12 +2,11 @@
 
 {
   imports = [
+    ./cli
     ./desktop
     ./dev
-    ./minimal.nix
+    ./editor
+    ./meta
     ./theme
   ];
-
-  # More reliable user service restart
-  systemd.user.startServices = "sd-switch";
 }

home-manager/desktop/default.nix

@@ -11,7 +11,7 @@
     ./xterm.nix
   ];
 
-  options.home-manager.desktop.enable = lib.mkDefaultOption "desktop config";
+  options.home-manager.desktop.enable = lib.mkEnableOption "desktop config";
 
   config = lib.mkIf config.home-manager.desktop.enable {
     home.packages = with pkgs; [

home-manager/editor/emacs/default.nix

@@ -15,7 +15,7 @@ let
 in
 {
   options.home-manager.editor.emacs.enable = lib.mkEnableOption "Emacs config" // {
-    default = (config.home-manager.editor.enable && (config.home-manager.desktop.enable or false));
+    default = config.home-manager.editor.enable && config.home-manager.desktop.enable;
   };
 
   config = lib.mkIf config.home-manager.editor.emacs.enable {

home-manager/editor/vscode/default.nix

@@ -2,7 +2,7 @@
 
 {
   options.home-manager.editor.vscode.enable = lib.mkEnableOption "VScode config" // {
-    default = (config.home-manager.editor.enable && (config.home-manager.desktop.enable or false));
+    default = config.home-manager.editor.enable && config.home-manager.desktop.enable;
   };
 
   config = lib.mkIf config.home-manager.editor.vscode.enable {

home-manager/macos.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./minimal.nix
+    ./default.nix
   ];
 
   home-manager.editor.emacs.enable = true;

home-manager/meta/default.nix

@@ -61,5 +61,8 @@
   # changes in each release.
   home.stateVersion = (osConfig.system.stateVersion or "23.11");
 
+  # More reliable user service restart
+  systemd.user.startServices = lib.mkIf pkgs.stdenv.isLinux "sd-switch";
+
   manual.html.enable = true;
 }

home-manager/nixos.nix

@@ -1,14 +1,17 @@
-{ ... }:
+{ osConfig, ... }:
 
 {
   imports = [
     ./default.nix
   ];
 
-  home-manager.dev = {
-    clojure.enable = true;
-    go.enable = true;
-    node.enable = true;
-    python.enable = true;
+  home-manager = {
+    desktop.enable = (osConfig.nixos.desktop.enable or false);
+    dev = {
+      clojure.enable = true;
+      go.enable = true;
+      node.enable = true;
+      python.enable = true;
+    };
   };
 }

home-manager/steamdeck.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./minimal.nix
+    ./default.nix
   ];
 
   home-manager.editor.emacs.enable = true;

hosts/mirai-vps/default.nix

@@ -12,10 +12,6 @@
       ../../nixos
     ];
 
-  nixos.home.imports = [
-    ../../home-manager/minimal.nix
-  ];
-
   device.type = "server";
 
   nixos = {

hosts/zachune-nixos/default.nix

@@ -10,10 +10,6 @@
     "${modulesPath}/virtualisation/oci-common.nix"
   ];
 
-  nixos.home.imports = [
-    ../../home-manager/minimal.nix
-  ];
-
   device.type = "server";
 
   nixos = {

hosts/zatsune-nixos/default.nix

@@ -12,10 +12,6 @@
     flake.inputs.disko.nixosModules.disko
   ];
 
-  nixos.home.imports = [
-    ../../home-manager/minimal.nix
-  ];
-
   boot.kernelParams = [
     "nvme.shutdown_timeout=10"
     "nvme_core.shutdown_timeout=10"

lib/flake.nix

@@ -89,6 +89,7 @@ in
     , configPosfix ? "Projects/nix-configs"
     , configuration ? ../home-manager
     , deviceType ? "desktop"
+    , extraModules ? [ ]
     , system ? "x86_64-linux"
     , homeManagerConfiguration ? home.lib.homeManagerConfiguration
     }:
@@ -104,7 +105,7 @@ in
             home = { inherit username homeDirectory; };
             imports = [ configuration ];
           })
-        ];
+        ] ++ extraModules;
         lib = nixpkgs.lib.extend (final: prev:
           (import ../lib { lib = final; })
         );

nixos/default.nix

@@ -2,12 +2,14 @@
 
 {
   imports = [
+    ../modules
     ./desktop
     ./dev
     ./games
     ./home.nix
     ./laptop
-    ./minimal.nix
+    ./nix
     ./server
+    ./system
   ];
 }