Update hakase configuration

yousiki · Mar 17, 2024 · f246704 · f246704
1 parent 3255ab1
commit f246704
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 37 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -125,6 +125,8 @@
 
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
   nixConfig = rec {

diff --git a/src/configurations/nixos/hakase/default.nix b/src/configurations/nixos/hakase/default.nix
@@ -1,40 +1,45 @@
 # Configuration for hakase.
-{globals, ...}: let
-  nixosModules = with globals.outputs; [
-    # Host-specific modules
-    ./_configuration.nix
-    ./_hardware-configuration.nix
+{globals, ...}:
+globals.inputs.nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  specialArgs = {inherit globals;};
+  modules =
+    [
+      ./_configuration.nix
+      ./_hardware-configuration.nix
 
-    # Host-specific profiles
-    commonProfiles.nix
-    commonProfiles.packages
-    nixosProfiles.desktop
-    nixosProfiles.nvidia-gpu
-    nixosProfiles.sops
-    nixosProfiles.vscode-server
-    nixosProfiles.nas
-
-    # Home-manager module
-    globals.inputs.home-manager.nixosModules.home-manager
-    {
-      home-manager = {
-        useGlobalPkgs = true;
-        useUserPackages = true;
-        extraSpecialArgs = {inherit globals;};
-        users.yousiki = {
-          imports = with homeProfiles; [
-            base
-            lang.complete
-            shell
-            ssh
-          ];
+      globals.inputs.home-manager.nixosModules.home-manager
+      {
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          extraSpecialArgs = {inherit globals;};
+          users.yousiki = {
+            imports = with globals.outputs.homeProfiles; [
+              base
+              lang.complete
+              shell
+              ssh
+            ];
+          };
         };
-      };
-    }
-  ];
-in
-  globals.inputs.nixpkgs.lib.nixosSystem {
-    system = "x86_64-linux";
-    specialArgs = {inherit globals;};
-    modules = nixosModules;
-  }
+      }
+    ]
+    ++ (with globals.inputs.nixos-hardware.nixosModules; [
+      common-cpu-intel-cpu-only
+      common-gpu-nvidia-nonprime
+      common-pc-hdd
+      common-pc-ssd
+    ])
+    ++ (with globals.outputs.commonProfiles; [
+      nix
+      packages
+    ])
+    ++ (with globals.outputs.nixosProfiles; [
+      desktop
+      nas
+      nvidia-gpu
+      sops
+      vscode-server
+    ]);
+}