| author | |
| committer | |
| log | 45482ab529279dbbd47b87a9603ebd2e129f01ff |
| tree | 643868dd5cd4d93cbc123e53ecdf0144904d305c |
| parent | 27868a5a06e85240e79662164b9be89c1e683fdc |
| signature | Signed by SSH key SHA256:xbd+BjjhyBfwk7GVoURf9Yx0gzDerHbvYv7SddNWmAs |
3 files changed, 25 insertions(+), 0 deletions(-)
modules/home/default.nix+22| ... | @@ -77,6 +77,7 @@ in | ... | @@ -77,6 +77,7 @@ in |
| 77 | # ViM and Neovim | 77 | # ViM and Neovim |
| 78 | ".*.swp" | 78 | ".*.swp" |
| 79 | ".nvimlog" | 79 | ".nvimlog" |
| 80 | ".jj" | ||
| 80 | ]; | 81 | ]; |
| 81 | }; | 82 | }; |
| 82 | 83 | ||
| ... | @@ -134,6 +135,27 @@ in | ... | @@ -134,6 +135,27 @@ in |
| 134 | autocd = true; | 135 | autocd = true; |
| 135 | history.size = 10000; | 136 | history.size = 10000; |
| 136 | }; | 137 | }; |
| 138 | jujutsu = { | ||
| 139 | settings = { | ||
| 140 | user = { | ||
| 141 | email = config.programs.git.userEmail; | ||
| 142 | name = config.programs.git.userName; | ||
| 143 | }; | ||
| 144 | signing = { | ||
| 145 | behavior = "own"; | ||
| 146 | backend = "ssh"; | ||
| 147 | key = "~/.ssh/id_ed25519.pub"; | ||
| 148 | }; | ||
| 149 | git = { | ||
| 150 | sign-on-push = true; | ||
| 151 | push-new-bookmarks = true; | ||
| 152 | }; | ||
| 153 | ui = { | ||
| 154 | default-command = "log"; | ||
| 155 | pager = "${pkgs.bat}/bin/bat --style=plain"; | ||
| 156 | }; | ||
| 157 | }; | ||
| 158 | }; | ||
| 137 | 159 | ||
| 138 | ghostty.settings.custom-shader = lib.mkIf ( | 160 | ghostty.settings.custom-shader = lib.mkIf ( |
| 139 | cfg.ghostty.shader != null | 161 | cfg.ghostty.shader != null |
modules/neovim/default.nix+1| ... | @@ -131,6 +131,7 @@ | ... | @@ -131,6 +131,7 @@ |
| 131 | hide_dotfiles = false; | 131 | hide_dotfiles = false; |
| 132 | never_show = [ | 132 | never_show = [ |
| 133 | ".git" | 133 | ".git" |
| 134 | ".jj" | ||
| 134 | ".DS_Store" # macOS | 135 | ".DS_Store" # macOS |
| 135 | "thumbs.db" # Windows | 136 | "thumbs.db" # Windows |
| 136 | ]; | 137 | ]; |
users/clover/home.nix+2| ... | @@ -81,6 +81,8 @@ in | ... | @@ -81,6 +81,8 @@ in |
| 81 | # use a git-specific email | 81 | # use a git-specific email |
| 82 | git.userEmail = "git@paperclover.net"; | 82 | git.userEmail = "git@paperclover.net"; |
| 83 | 83 | ||
| 84 | jujutsu.enable = true; | ||
| 85 | |||
| 84 | ssh = { | 86 | ssh = { |
| 85 | enable = true; | 87 | enable = true; |
| 86 | matchBlocks = rec { | 88 | matchBlocks = rec { |