diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/home/default.nix | 2 | ||||
| -rw-r--r-- | modules/home/git.nix | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/home/default.nix b/modules/home/default.nix index 1c0ae0e..bf1900d 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -11,7 +11,7 @@ home = { username = "simenandre"; - homeDirectory = "/Users/simenandre"; + homeDirectory = if pkgs.stdenv.isDarwin then "/Users/simenandre" else "/home/simenandre"; # Do not change this after the first installation stateVersion = "24.11"; }; diff --git a/modules/home/git.nix b/modules/home/git.nix index b42161e..e79a760 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { programs.git = { @@ -40,7 +40,10 @@ merge.log = true; push.autoSetupRemote = true; gpg.format = "ssh"; - "gpg \"ssh\"".program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; + "gpg \"ssh\"".program = + if pkgs.stdenv.isDarwin + then "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" + else "/opt/1Password/op-ssh-sign"; github.user = "simenandre"; pull.rebase = true; "url \"ssh://git@github.com/\"".insteadOf = "https://github.com/"; |