diff options
| author | Simen A. W. Olsen <hello@simenandre.no> | 2026-03-21 21:37:47 +0100 |
|---|---|---|
| committer | Simen A. W. Olsen <hello@simenandre.no> | 2026-03-21 21:37:47 +0100 |
| commit | 4b0b24696049b284812b3c8aae9bca25e24a8731 (patch) | |
| tree | 002c8cd900c392eb07b18edadfe0b720fa3a54ee /modules | |
| parent | 1960903c3146a9b0fcda032bdaf8323a8547edea (diff) | |
| download | dotfiles-4b0b24696049b284812b3c8aae9bca25e24a8731.tar.gz dotfiles-4b0b24696049b284812b3c8aae9bca25e24a8731.zip | |
refactor(home): make git signing Darwin-specific and add tmux
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/home/default.nix | 1 | ||||
| -rw-r--r-- | modules/home/git.nix | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/modules/home/default.nix b/modules/home/default.nix index 2a27f04..201f513 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -25,6 +25,7 @@ claude-code git-get nodejs_22 + tmux twm ]; diff --git a/modules/home/git.nix b/modules/home/git.nix index d9710e6..1915304 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -4,9 +4,11 @@ programs.git = { enable = true; - signing = { + signing = if pkgs.stdenv.isDarwin then { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCyUn5BfmAnd/6xi0X1mYF/+jPOmCS0bpNUePF55gCY"; signByDefault = true; + } else { + signByDefault = false; }; settings = { @@ -41,17 +43,13 @@ help.autocorrect = 1; merge.log = true; push.autoSetupRemote = true; - gpg.format = "ssh"; - "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; } // (if pkgs.stdenv.isDarwin then { + gpg.format = "ssh"; + "gpg \"ssh\"".program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; "url \"ssh://git@github.com/\"".insteadOf = "https://github.com/"; - } else {}) // { commit.gpgsign = true; - }; + } else {}); }; } |