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