diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/lib/mkSystem.nix | 12 | ||||
| -rw-r--r-- | nix/lib/overlays.nix | 3 | ||||
| -rw-r--r-- | nix/users/fcuny/1password.nix | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/nix/lib/mkSystem.nix b/nix/lib/mkSystem.nix index cb581c7..c9c8074 100644 --- a/nix/lib/mkSystem.nix +++ b/nix/lib/mkSystem.nix @@ -14,13 +14,11 @@ let # NixOS vs nix-darwin functionst systemFunc = if darwin then inputs.darwin.lib.darwinSystem else nixpkgs.lib.nixosSystem; - home-manager = - if darwin then - inputs.home-manager.darwinModules - else - inputs.home-manager.nixosModules; -in -systemFunc rec { + home-manager = if darwin then + inputs.home-manager.darwinModules + else + inputs.home-manager.nixosModules; +in systemFunc rec { inherit system; modules = [ diff --git a/nix/lib/overlays.nix b/nix/lib/overlays.nix index 1ec6f49..531c725 100644 --- a/nix/lib/overlays.nix +++ b/nix/lib/overlays.nix @@ -1,6 +1,5 @@ let path = ../../overlays; in with builtins; -map (n: import (path + ("/" + n))) (filter - (n: +map (n: import (path + ("/" + n))) (filter (n: match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (attrNames (readDir path))) diff --git a/nix/users/fcuny/1password.nix b/nix/users/fcuny/1password.nix index 0e16f8e..fd1dfbe 100644 --- a/nix/users/fcuny/1password.nix +++ b/nix/users/fcuny/1password.nix @@ -4,8 +4,7 @@ let darwinSockPath = "${home}/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"; sockPath = ".1password/agent.sock"; -in -{ +in { home.sessionVariables = { SSH_AUTH_SOCK = "${home}/${sockPath}"; }; home.file.sock = { |