diff options
| -rw-r--r-- | modules/darwin/base.nix | 9 | ||||
| -rw-r--r-- | modules/nixos/base.nix | 4 | ||||
| -rw-r--r-- | modules/shared/nix.nix | 7 | ||||
| -rw-r--r-- | systems/common.nix | 1 |
4 files changed, 15 insertions, 6 deletions
diff --git a/modules/darwin/base.nix b/modules/darwin/base.nix index 913ea04..9fc0d86 100644 --- a/modules/darwin/base.nix +++ b/modules/darwin/base.nix @@ -1,6 +1,13 @@ -_: { +{ + lib, + inputs, + ... +}: { imports = [../shared]; + # not sure why i have to force this + environment.etc."nix/inputs/nixpkgs".source = lib.mkForce inputs.nixpkgs.outPath; + programs = { bash.enable = true; vim.enable = true; diff --git a/modules/nixos/base.nix b/modules/nixos/base.nix index 6716839..a5c4318 100644 --- a/modules/nixos/base.nix +++ b/modules/nixos/base.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + inputs, ... }: let inherit (lib) mkDefault; @@ -14,6 +15,9 @@ in { documentation.nixos.enable = false; + # not sure why i can't use this on darwin? + environment.etc."nix/inputs/nixpkgs".source = lib.mkDefault inputs.nixpkgs.outPath; + i18n = { supportedLocales = [ "en_US.UTF-8/UTF-8" diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index 53bddee..60959f9 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -7,13 +7,10 @@ ... }: { nix = { - registry = { - n.flake = lib.mkDefault inputs.nixpkgs; - self.flake = self; - }; + registry.n.flake = lib.mkDefault inputs.nixpkgs; nixPath = [ - "nixpkgs=${inputs.nixpkgs.outPath}" + "nixpkgs=/etc/nix/inputs/nixpkgs" ]; settings = { diff --git a/systems/common.nix b/systems/common.nix index 4e69f42..7483474 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -67,6 +67,7 @@ in { }; nix.registry.n.flake = inputs.nixpkgs-stable; + environment.etc."nix/inputs/nixpkgs".source = inputs.nixpkgs-stable.outPath; } ]; } |