yahoo

nixos/core/system/cnix-nh.nix

@@ -0,0 +1,11 @@
+{
+  environment.variables.FLAKE = "/home/cnst/.nix-config";
+  programs = {
+    nh = {
+      enable = true;
+      clean.enable = true;
+      clean.extraArgs = "--keep-since 4d --keep 3";
+      flake = "/home/cnst/.nix-config";
+    };
+  };
+}

nixos/core/system/default.nix

@@ -6,7 +6,6 @@
   ...
 }: {
   imports = [
-    ./nh.nix
     ./substituters.nix
     ./nixpkgs.nix
   ];

nixos/core/system/nh.nix

@@ -1,13 +0,0 @@
-let
-  homeDir = builtins.getEnv "HOME";
-in {
-  environment.variables.FLAKE = "${homeDir}/.nix-config";
-  programs = {
-    nh = {
-      enable = true;
-      clean.enable = true;
-      clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "${homeDir}/.nix-config";
-    };
-  };
-}

nixos/core/system/toothpc-nh.nix

@@ -0,0 +1,11 @@
+{
+  environment.variables.FLAKE = "/home/toothpick/.nix-config";
+  programs = {
+    nh = {
+      enable = true;
+      clean.enable = true;
+      clean.extraArgs = "--keep-since 4d --keep 3";
+      flake = "/home/toothpick/.nix-config";
+    };
+  };
+}

nixos/default.nix

@@ -1,5 +1,5 @@
 let
-  desktop = [
+  shared = [
     ./core
 
     ./locale
@@ -17,10 +17,20 @@ let
   ];
 
   laptop =
-    desktop
+    shared
     ++ [
       ./services/fwupd
     ];
+  cnix =
+    shared
+    ++ [
+      ./core/system/cnix-nh.nix
+    ];
+  toothpc =
+    shared
+    ++ [
+      ./core/system/toothpc-nh.nix
+    ];
 in {
-  inherit desktop laptop;
+  inherit shared laptop cnix toothpc;
 }

nixos/hosts/default.nix

@@ -10,7 +10,7 @@
     mod = "${self}/nixos";
 
     # get the basic config to build on top of
-    inherit (import "${self}/nixos") desktop laptop;
+    inherit (import "${self}/nixos") laptop cnix toothpc;
 
     # get these into the module system
     specialArgs = {inherit inputs self;};
@@ -18,7 +18,7 @@
     cnix = nixosSystem {
       inherit specialArgs;
       modules =
-        desktop
+        cnix
         ++ [
           ./cnix
           "${mod}/core/lanzaboote.nix"
@@ -46,7 +46,7 @@
     toothpc = nixosSystem {
       inherit specialArgs;
       modules =
-        desktop
+        toothpc
         ++ [
           ./toothpc
           "${mod}/core"

nixos/services/xserver/cnix.nix

@@ -1,6 +1,4 @@
-let
+{config, ...}: {
-  homeDir = builtins.getEnv "HOME";
-in {
   services.xserver = {
     enable = true;
     videoDrivers = ["amdgpu"];
@@ -8,7 +6,7 @@ in {
       extraLayouts.hhkbse = {
         description = "HHKBse by cnst";
         languages = ["se"];
-        symbolsFile = "${homeDir}/.nix-config/nixos/hosts/cnix/xkb/symbols/hhkbse";
+        symbolsFile = /home/cnst/.nix-config/nixos/hosts/cnix/xkb/symbols/hhkbse;
       };
       layout = "hhkbse";
       # dir = "/home/cnst/.nix-config/nixos/xkb";