From 4b0b24696049b284812b3c8aae9bca25e24a8731 Mon Sep 17 00:00:00 2001 From: "Simen A. W. Olsen" Date: Sat, 21 Mar 2026 21:37:47 +0100 Subject: refactor(home): make git signing Darwin-specific and add tmux --- modules/home/default.nix | 1 + 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 {}); }; } -- cgit v1.2.3