ethanholz.com / nix-config
Reproducible dotfiles in nix
fork atom

fix: migrate to knew HM config for git, remove macos-icon

ethanholz.com 0915b90b f4705cb7

+13 -18
+13 -18
lib/shared/home.nix
··· 173 173 keybind = [ 174 174 "shift+enter=text:\n" 175 175 ]; 176 - macos-icon = "retro"; 177 176 }; 178 177 enableFishIntegration = true; 179 178 enableZshIntegration = true; ··· 255 254 256 255 programs.git = { 257 256 enable = true; 258 - userName = "Ethan Holz"; 259 - userEmail = "ethan.holz@thoriumworks.com"; 260 257 signing = { 261 258 key = "B4E94FDF35334301"; 262 259 signByDefault = true; ··· 271 268 ".oprc" 272 269 "repomix-output.txt" 273 270 ]; 271 + settings = { 272 + aliases = { 273 + co = "checkout"; 274 + a = "add"; 275 + }; 276 + user = { 277 + name = "Ethan Holz"; 278 + email = "ethan.holz@thoriumworks.com"; 279 + }; 280 + init.defaultBranch = "main"; 281 + rebase.autoStash = true; 282 + push.autoSetupRemote = true; 283 + }; 274 284 includes = [ 275 285 { 276 286 condition = "gitdir:${base}/Documents/code/work/**/*"; ··· 285 295 path = "${base}/Documents/code/work/.gitconfig-work"; 286 296 } 287 297 ]; 288 - aliases = { 289 - co = "checkout"; 290 - a = "add"; 291 - }; 292 - extraConfig = { 293 - # url."git@bitbucket.org:".insteadOf = "https://bitbucket.org/"; 294 - # url."git@github.com:".insteadOf = "https://github.com/"; 295 - # difftool.prompt = true; 296 - # difftool.nvimdiff.cmd = "nvim -d $LOCAL $REMOTE"; 297 - # diff.tool = "nvimdiff"; 298 - init.defaultBranch = "main"; 299 - rebase.autoStash = true; 300 - push.autoSetupRemote = true; 301 - # core.editor = "nvim"; 302 - }; 303 298 }; 304 299 305 300 programs.starship = {