flake.nix

@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 
     home-manager = {
@@ -18,6 +17,7 @@
         home-manager.follows = "";
       };
     };
+    flake-utils.url = "github:numtide/flake-utils";
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     nur.url = "github:nix-community/NUR";
@@ -124,21 +124,28 @@
       })
       inputs.golink.overlay
     ];
-    pkgs = import nixpkgs {
-      inherit overlays system;
-      config.allowUnfree = true;
-    };
     userSecret = path: {
       file = path;
       owner = username;
     };
-    commonConfig = {config, ...}: {
+    commonConfig = {gui ? true}: {config, ...}: {
       config = {
         nixpkgs.overlays = overlays;
         # TODO Remove when apps are updated
         nixpkgs.config.permittedInsecurePackages = [
           "electron-25.9.0"
         ];
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.${username}.imports =
+            if gui
+            then [./apps/gui]
+            else [./apps/nogui];
+          extraSpecialArgs = {
+            flakePath = "/home/${username}/.config/nixpkgs";
+          };
+        };
         age.secrets = {
           ssh-config = userSecret ./secrets/shared/ssh-config.age;
           ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age;
@@ -159,8 +166,9 @@
       };
     };
     workModules = [
+      home-manager.nixosModules.home-manager
       agenix.nixosModules.default
-      commonConfig
+      (commonConfig {})
       ({pkgs, ...}: {
         config = {
           nixpkgs.overlays = [
@@ -168,6 +176,10 @@
               py39 = import nixpkgs-py39 {inherit (pkgs) system;};
             })
           ];
+          home-manager.users.${username}.programs = {
+            git.package = pkgs.gitSVN;
+            firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)];
+          };
           age.secrets = {
             netrc = {
               file = ./secrets/work/netrc.age;
@@ -190,118 +202,92 @@
       })
     ];
     username = "jolheiser";
-    system = "x86_64-linux";
+  in
-  in {
+    {
-    homeConfigurations = let
+      nixosConfigurations = {
-      commonModules = [
+        "chai" = nixpkgs.lib.nixosSystem {
-        {
+          system = "x86_64-linux";
-          home = {
+          modules =
-            inherit username;
+            workModules
-            homeDirectory = "/home/${username}";
+            ++ [
-          };
+              ./machines/chai
-        }
+            ];
-        ./apps/gui
+        };
-      ];
+        "earlgrey" = nixpkgs.lib.nixosSystem {
-    in {
+          system = "x86_64-linux";
-      "jolheiser" = home-manager.lib.homeManagerConfiguration {
+          modules =
-        inherit pkgs;
+            workModules
-        modules = commonModules;
+            ++ [
-      };
+              ./machines/earlgrey
-      "work" = home-manager.lib.homeManagerConfiguration {
+            ];
-        inherit pkgs;
+        };
-        modules =
+        "masala" = nixpkgs.lib.nixosSystem {
-          commonModules
+          system = "x86_64-linux";
-          ++ [
+          modules =
-            {
+            workModules
-              nixpkgs.overlays = [
+            ++ [
-                (_: _: {
+              wsl.nixosModules.wsl
-                  py39 = import nixpkgs-py39 {inherit (pkgs) system;};
+              ./machines/masala
-                })
+            ];
-              ];
+        };
-              programs = {
+        "matcha" = nixpkgs.lib.nixosSystem {
-                git.package = pkgs.gitSVN;
+          system = "x86_64-linux";
-                firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)];
+          modules = [
-              };
+            home-manager.nixosModules.home-manager
-            }
+            agenix.nixosModules.default
+            ./machines/matcha
+            (commonConfig {})
           ];
-      };
+        };
-    };
+        "genmaicha" = nixpkgs.lib.nixosSystem {
-    nixosConfigurations = {
+          system = "x86_64-linux";
-      "chai" = nixpkgs.lib.nixosSystem {
+          modules = [
-        inherit system;
+            home-manager.nixosModules.home-manager
-        modules =
+            nixos-hardware.nixosModules.framework-13-7040-amd
-          workModules
+            agenix.nixosModules.default
-          ++ [
+            ./machines/genmaicha
-            ./machines/chai
+            (commonConfig {})
           ];
-      };
+        };
-      "earlgrey" = nixpkgs.lib.nixosSystem {
+        "sencha" = nixpkgs.lib.nixosSystem {
-        inherit system;
+          system = "x86_64-linux";
-        modules =
+          modules = [
-          workModules
+            home-manager.nixosModules.home-manager
-          ++ [
+            agenix.nixosModules.default
-            ./machines/earlgrey
+            ./machines/sencha
+            (commonConfig {})
           ];
-      };
-      "masala" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules =
-          workModules
-          ++ [
-            wsl.nixosModules.wsl
-            ./machines/masala
-          ];
-      };
-      "matcha" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          agenix.nixosModules.default
-          ./machines/matcha
-          commonConfig
-        ];
-      };
-      "genmaicha" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          nixos-hardware.nixosModules.framework-13-7040-amd
-          agenix.nixosModules.default
-          ./machines/genmaicha
-          commonConfig
-        ];
-      };
-      "sencha" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          agenix.nixosModules.default
-          ./machines/sencha
-          commonConfig
-        ];
-      };
-    };
-    colmena = {
-      meta = {
-        nixpkgs = import nixpkgs {
-          inherit overlays system;
         };
       };
-      dragonwell = {
+      colmena = {
-        imports = [
+        meta = {
-          inputs.agenix.nixosModules.default
+          nixpkgs = import nixpkgs {
-          inputs.golink.nixosModules.default
+            system = "x86_64-linux";
-          inputs.ugit.nixosModules.default
+            overlays = overlays;
-          ./machines/dragonwell
+          };
+        };
+        dragonwell = {
+          imports = [
+            inputs.agenix.nixosModules.default
+            inputs.golink.nixosModules.default
+            inputs.ugit.nixosModules.default
+            ./machines/dragonwell
+          ];
+        };
+      };
+      nixConfig = {
+        extra-substitutors = ["https://jolheiser.cachix.org"];
+        extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
+      };
+    }
+    // inputs.flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+      devShells.default = pkgs.mkShell {
+        nativeBuildInputs = [
+          agenix.packages.${system}.agenix
+          pkgs.colmena
         ];
       };
-    };
+    });
-    nixConfig = {
-      extra-substitutors = ["https://jolheiser.cachix.org"];
-      extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
-    };
-    devShells.${system}.default = pkgs.mkShell {
-      nativeBuildInputs = [
-        agenix.packages.${system}.agenix
-        pkgs.colmena
-      ];
-    };
-  };
 }

justfile

@@ -11,12 +11,6 @@ rebuild *args:
 switch *args:
 	@just rebuild switch {{args}}
 
-hm:
-	@home-manager switch --flake .
-
-work:
-	@home-manager switch --flake '.#work'
-
 # Rebuild the current machine for next boot
 boot *args:
 	@just rebuild boot {{args}}

machines/earlgrey/hardware.nix

@@ -1,35 +1,31 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
+  imports =
-  lib,
+    [ (modulesPath + "/installer/scan/not-detected.nix") ../common/cifs.nix
-  modulesPath,
+    ];
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    ../common/cifs.nix
-  ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = ["kvm-amd"];
+  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/e2274508-9989-4f6b-9bcf-a0d246f292f9";
+    { device = "/dev/disk/by-uuid/e2274508-9989-4f6b-9bcf-a0d246f292f9";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
   boot.initrd.luks.devices."luks-1121cd25-7c4c-47ee-b04a-2cab0cd251ea".device = "/dev/disk/by-uuid/1121cd25-7c4c-47ee-b04a-2cab0cd251ea";
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/86CA-6DF6";
+    { device = "/dev/disk/by-uuid/86CA-6DF6";
-    fsType = "vfat";
+      fsType = "vfat";
-  };
+    };
 
-  swapDevices = [];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's