diff options
| -rw-r--r-- | darwin/default.nix | 2 | ||||
| -rw-r--r-- | lib/mk_darwin.nix | 2 | ||||
| -rw-r--r-- | lib/mk_system.nix | 4 | ||||
| -rw-r--r-- | modules/cachix/caches/helix.nix (renamed from nixos/modules/cachix/caches/helix.nix) | 0 | ||||
| -rw-r--r-- | modules/cachix/caches/nix-community.nix (renamed from nixos/modules/cachix/caches/nix-community.nix) | 0 | ||||
| -rw-r--r-- | modules/cachix/default.nix (renamed from nixos/modules/cachix/default.nix) | 0 | ||||
| -rw-r--r-- | modules/default.nix (renamed from nixos/modules/default.nix) | 0 | ||||
| -rw-r--r-- | modules/flakes.nix (renamed from nixos/modules/flakes.nix) | 0 | ||||
| -rw-r--r-- | modules/nix.nix (renamed from nixos/modules/nix.nix) | 0 | ||||
| -rw-r--r-- | modules/security.nix (renamed from nixos/modules/security.nix) | 0 | ||||
| -rw-r--r-- | nixos/default.nix | 6 |
11 files changed, 7 insertions, 7 deletions
diff --git a/darwin/default.nix b/darwin/default.nix index 1476617..acc1fcb 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -6,7 +6,7 @@ system = "aarch64-darwin"; nixpkgs = unstable; extraModules = [ - ../nixos/modules/cachix + ../modules/cachix ]; }; } diff --git a/lib/mk_darwin.nix b/lib/mk_darwin.nix index 1e81a3c..de4fc4e 100644 --- a/lib/mk_darwin.nix +++ b/lib/mk_darwin.nix @@ -16,7 +16,7 @@ darwin.lib.darwinSystem ( networking.hostName = name; } entryPoint - ../nixos/modules/nix.nix + ../modules/nix.nix ] ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } ++ nixpkgs.lib.optionals (extraModules != null) extraModules; } diff --git a/lib/mk_system.nix b/lib/mk_system.nix index 1753522..a1a4eab 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -21,8 +21,8 @@ nixpkgs.lib.nixosSystem ( } entryPoint hardware - ../nixos/modules/flakes.nix - ../nixos/modules/nix.nix + ../modules/flakes.nix + ../modules/nix.nix ] ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } ++ nixpkgs.lib.optionals (extraModules != null) extraModules; } diff --git a/nixos/modules/cachix/caches/helix.nix b/modules/cachix/caches/helix.nix index 7783a96..7783a96 100644 --- a/nixos/modules/cachix/caches/helix.nix +++ b/modules/cachix/caches/helix.nix diff --git a/nixos/modules/cachix/caches/nix-community.nix b/modules/cachix/caches/nix-community.nix index d323939..d323939 100644 --- a/nixos/modules/cachix/caches/nix-community.nix +++ b/modules/cachix/caches/nix-community.nix diff --git a/nixos/modules/cachix/default.nix b/modules/cachix/default.nix index 9dd55b5..9dd55b5 100644 --- a/nixos/modules/cachix/default.nix +++ b/modules/cachix/default.nix diff --git a/nixos/modules/default.nix b/modules/default.nix index df11f91..df11f91 100644 --- a/nixos/modules/default.nix +++ b/modules/default.nix diff --git a/nixos/modules/flakes.nix b/modules/flakes.nix index 76f89f3..76f89f3 100644 --- a/nixos/modules/flakes.nix +++ b/modules/flakes.nix diff --git a/nixos/modules/nix.nix b/modules/nix.nix index 8396739..8396739 100644 --- a/nixos/modules/nix.nix +++ b/modules/nix.nix diff --git a/nixos/modules/security.nix b/modules/security.nix index 358f27b..358f27b 100644 --- a/nixos/modules/security.nix +++ b/modules/security.nix diff --git a/nixos/default.nix b/nixos/default.nix index 611aa1d..ed40dad 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -5,8 +5,8 @@ name = "alpha"; nixpkgs = unstable; extraModules = [ - ./modules/security.nix - ./modules/cachix + ../modules/security.nix + ../modules/cachix inputs.sops-nix.nixosModules.sops ]; }; @@ -16,7 +16,7 @@ system = "aarch64-linux"; nixpkgs = unstable-small; extraModules = [ - ./modules/security.nix + ../modules/security.nix ]; }; |