Merge branch 'main' of paperclover.dev:nix/config
2 files changed, 11 insertions(+), 5 deletions(-)
modules/home/default.nix+3-3
| ... | ... | @@ -141,10 +141,10 @@ in |
| 141 | 141 | email = config.programs.git.userEmail; |
| 142 | 142 | name = config.programs.git.userName; |
| 143 | 143 | }; |
| 144 | | signing = { |
| 144 | signing = lib.mkIf (config.programs.git.signing.key != null) { |
| 145 | inherit (config.programs.git.signing) key; |
| 146 | backend = "gpg"; |
| 145 | 147 | behavior = "own"; |
| 146 | | backend = "ssh"; |
| 147 | | key = "~/.ssh/id_ed25519.pub"; |
| 148 | 148 | }; |
| 149 | 149 | git = { |
| 150 | 150 | sign-on-push = true; |
users/clover/home.nix+8-2
| ... | ... | @@ -14,7 +14,8 @@ in |
| 14 | 14 | ripgrep |
| 15 | 15 | uv |
| 16 | 16 | nh |
| 17 | | pkgs.autofmt |
| 17 | autofmt |
| 18 | gnupg |
| 18 | 19 | ]; |
| 19 | 20 | # packages to install for desktop environments (non-server) |
| 20 | 21 | desktop = [ |
| ... | ... | @@ -101,6 +102,10 @@ in |
| 101 | 102 | |
| 102 | 103 | # use a git-specific email |
| 103 | 104 | git.userEmail = "git@paperclover.net"; |
| 105 | git.signing = { |
| 106 | signByDefault = true; |
| 107 | key = "C0D577FD799F9D11"; |
| 108 | }; |
| 104 | 109 | |
| 105 | 110 | jujutsu = { |
| 106 | 111 | enable = true; |
| ... | ... | @@ -286,13 +291,14 @@ in |
| 286 | 291 | ) |
| 287 | 292 | ''; |
| 288 | 293 | }; |
| 294 | |
| 289 | 295 | }; |
| 290 | 296 | }; |
| 291 | 297 | |
| 292 | 298 | ssh = { |
| 293 | 299 | enable = true; |
| 294 | 300 | extraConfig = '' |
| 295 | | SetEnv TERM=xterm-color |
| 301 | SetEnv TERM=xterm-256color |
| 296 | 302 | ''; |
| 297 | 303 | matchBlocks = rec { |
| 298 | 304 | zenith = { |
Natalie Marks <nmarks413@gmail.com> 2025-12-07 03:19:20-08:00