diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 14 | ||||
| -rw-r--r-- | flake/apps.nix (renamed from nix/flake/apps.nix) | 4 | ||||
| -rw-r--r-- | flake/checks.nix (renamed from nix/flake/checks.nix) | 0 | ||||
| -rw-r--r-- | flake/devshells.nix (renamed from nix/flake/devshells.nix) | 11 | ||||
| -rw-r--r-- | flake/formatter.nix (renamed from nix/flake/formatter.nix) | 0 | ||||
| -rw-r--r-- | flake/hosts.nix (renamed from nix/flake/hosts.nix) | 4 | ||||
| -rw-r--r-- | flake/overlays.nix (renamed from nix/flake/overlays.nix) | 0 | ||||
| -rw-r--r-- | flake/packages.nix (renamed from nix/flake/packages.nix) | 4 |
8 files changed, 21 insertions, 16 deletions
@@ -56,13 +56,13 @@ ]; imports = [ - ./nix/flake/apps.nix - ./nix/flake/checks.nix - ./nix/flake/devshells.nix - ./nix/flake/formatter.nix - ./nix/flake/hosts.nix - ./nix/flake/overlays.nix - ./nix/flake/packages.nix + ./flake/apps.nix + ./flake/checks.nix + ./flake/devshells.nix + ./flake/formatter.nix + ./flake/hosts.nix + ./flake/overlays.nix + ./flake/packages.nix ]; }; } diff --git a/nix/flake/apps.nix b/flake/apps.nix index ef764eb..e0b23f4 100644 --- a/nix/flake/apps.nix +++ b/flake/apps.nix @@ -1,9 +1,9 @@ -{ ... }: +{ self, ... }: { perSystem = { pkgs, ... }: let - mkFcunyNet = import ../../src/fcuny.net { inherit pkgs; }; + mkFcunyNet = import "${self}/src/fcuny.net" { inherit pkgs; }; in { apps = { diff --git a/nix/flake/checks.nix b/flake/checks.nix index 87d4a7f..87d4a7f 100644 --- a/nix/flake/checks.nix +++ b/flake/checks.nix diff --git a/nix/flake/devshells.nix b/flake/devshells.nix index 339a8f4..d28c4b3 100644 --- a/nix/flake/devshells.nix +++ b/flake/devshells.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ self, inputs, ... }: { perSystem = { system, pkgs, ... }: @@ -35,8 +35,13 @@ }; pre-commit-check = mkPreCommitHooks ./.; - scripts = import ../../nix/scripts { - inherit pkgs system inputs; + scripts = import "${self}/scripts" { + inherit + pkgs + self + system + inputs + ; }; in { diff --git a/nix/flake/formatter.nix b/flake/formatter.nix index 44c0190..44c0190 100644 --- a/nix/flake/formatter.nix +++ b/flake/formatter.nix diff --git a/nix/flake/hosts.nix b/flake/hosts.nix index d3454bf..ecfcca1 100644 --- a/nix/flake/hosts.nix +++ b/flake/hosts.nix @@ -71,14 +71,14 @@ let inputs.agenix.nixosModules.age inputs.disko.nixosModules.disko inputs.home-manager.nixosModules.home-manager - "${self}/nix/modules/default.nix" + "${self}/modules/default.nix" ]; darwinDefaultModules = [ nixSettings inputs.agenix.darwinModules.age inputs.home-manager.darwinModules.home-manager - "${self}/nix/modules/default-darwin.nix" + "${self}/modules/default-darwin.nix" ]; darwinConfigurations = mapAttrs' ( diff --git a/nix/flake/overlays.nix b/flake/overlays.nix index 83eadd0..83eadd0 100644 --- a/nix/flake/overlays.nix +++ b/flake/overlays.nix diff --git a/nix/flake/packages.nix b/flake/packages.nix index a166803..68f43c0 100644 --- a/nix/flake/packages.nix +++ b/flake/packages.nix @@ -1,9 +1,9 @@ -{ ... }: +{ self, ... }: { perSystem = { pkgs, ... }: let - mkFcunyNet = import ../../src/fcuny.net { inherit pkgs; }; + mkFcunyNet = import "${self}/src/fcuny.net" { inherit pkgs; }; in { packages = { |