nixos/common/

srid · Sep 28, 2024 · 7f6fc20 · 7f6fc20
1 parent d88e133
commit 7f6fc20
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/nixos/caches/default.nix → nixos/common/caches/default.nix b/nixos/caches/default.nix → nixos/common/caches/default.nix
diff --git a/nixos/caches/oss.nix → nixos/common/caches/oss.nix b/nixos/caches/oss.nix → nixos/common/caches/oss.nix
diff --git a/nixos/common/default.nix b/nixos/common/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./nix.nix
+    ./primary-as-admin.nix
+    ./caches
+  ];
+}
diff --git a/nixos/nix.nix → nixos/common/nix.nix b/nixos/nix.nix → nixos/common/nix.nix
@@ -1,5 +1,8 @@
 { flake, pkgs, lib, ... }:
 
+let
+  inherit (flake.inputs) self;
+in
 {
   nixpkgs = {
     config = {
@@ -9,7 +12,7 @@
     };
     overlays = [
       flake.inputs.nuenv.overlays.default
-      (import ../packages/overlay.nix { inherit flake; inherit (pkgs) system; })
+      (import "${self}/packages/overlay.nix" { inherit flake; inherit (pkgs) system; })
     ];
   };
 

diff --git a/nixos/self/primary-as-admin.nix → nixos/common/primary-as-admin.nix b/nixos/self/primary-as-admin.nix → nixos/common/primary-as-admin.nix
diff --git a/nixos/default.nix b/nixos/default.nix
@@ -6,11 +6,7 @@
     nixosModules = {
       # NixOS modules that are known to work on nix-darwin.
       # Thsi is shared with nix-darwin/default.nix
-      common.imports = [
-        ./nix.nix
-        ./caches
-        ./self/primary-as-admin.nix
-      ];
+      common = ./common;
 
       default.imports = [
         {
@@ -24,7 +20,7 @@
         self.nixosModules.common
         inputs.ragenix.nixosModules.default
         inputs.github-nix-ci.nixosModules.default
-        ./self/self-ide.nix
+        ./self-ide.nix
         ./current-location.nix
       ];
     };

diff --git a/nixos/self/self-ide.nix → nixos/self-ide.nix b/nixos/self/self-ide.nix → nixos/self-ide.nix
diff --git a/systems/ax41.nix b/systems/ax41.nix
@@ -9,8 +9,7 @@ in
     inputs.disko.nixosModules.disko
     self.nixosModules.default
     "${self}/nixos/disko/trivial.nix"
-    "${self}/nixos/nix.nix"
-    "${self}/nixos/self/primary-as-admin.nix"
+    "${self}/nixos/common/primary-as-admin.nix"
     "${self}/nixos/docker.nix"
     "${self}/nixos/actualism-app.nix"
     "${self}/nixos/hedgedoc.nix"