gitconfig

home/configurations/bruce_at_chestnut.nix

@@ -32,7 +32,7 @@
 
       repos = {
         asdf = {
-          branch = "v0.14.0";
+          branch = "v0.14.1";
           repo = "https://github.com/asdf-vm/asdf.git";
           target = "${config.home.homeDirectory}/.asdf";
         };

home/modules/apps.nix

@@ -41,6 +41,7 @@
       cmake
       gh
       asdf-vm
+      difftastic
 
       # Nix
       nix-prefetch-git

home/modules/dotfiles/default.nix

@@ -0,0 +1,14 @@
+_: {
+  pkgs,
+  config,
+  ...
+}: {
+  config = {
+
+    xdg = {
+      enable = true;
+      configFile."git/config".source = ./gitconfig;
+      configFile."git/gitconfig-number5".source = ./gitconfig-number5;
+    };
+  };
+}

home/modules/dotfiles/gitconfig

@@ -0,0 +1,132 @@
+[user]
+  name = Bruce Wang
+  email = [email protected]
+
+[color]
+  ui = true
+  branch = auto
+  diff = auto
+  status = auto
+
+[color "branch"]
+  current = yellow reverse
+  local = yellow
+  remote = green
+
+[color "diff"]
+  meta = yellow
+  frag = magenta bold
+  old = red bold
+  new = green bold
+  commit = yellow bold
+  whitespace = red reverse
+
+[color "status"]
+  added = yellow
+  changed = green
+  untracked = cyan
+
+[alias]
+  st = status
+  ci = commit
+  br = branch
+  co = checkout
+  df = diff
+  lg = log -p
+  ll = log --graph --pretty=format:'%C(magenta)%h%Creset %Cgreen(%cr) -%C(bold green)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+  mg = merge -Xignore-space-at-eol
+  conflicts = diff --name-only --diff-filter=U
+
+[branch]
+  autosetupmerge = true
+
+[gui]
+  fontui = -family droid -size 10 -weight bold -slant roman -underline 0 -overstrike 0
+  fontdiff = -family helvetica -size 10 -weight normal -slant roman -underline 0 -overstrike 0
+
+[push]
+  default = tracking
+
+[core]
+  excludesfile = /Users/bruce.wang/.gitignore_global
+  autocrlf = false
+  pager = delta
+  sshCommand = ssh -i ~/.ssh/id_rsa -F /dev/null
+
+[apply]
+  whitespace = nowarn
+
+[filter "media"]
+  clean = git-media-clean %f
+  smudge = git-media-smudge %f
+
+[rebase]
+  autosquash = true
+	instructionFormat = (%an) %s
+
+[rerere]
+  enabled = true
+
+[color "diff-highlight"]
+  oldNormal = red bold
+  oldHighlight = red bold 52
+  newNormal = green bold
+  newHighlight = green bold 22
+
+[diff-so-fancy]
+  first-run = false
+
+[hub]
+  protocol = https
+
+[filter "lfs"]
+  smudge = git-lfs smudge --skip -- %f
+  process = git-lfs filter-process --skip
+  required = true
+  clean = git-lfs clean -- %f
+
+[pull]
+  rebase = false
+
+[interactive]
+  diffFilter = delta --color-only
+
+[delta]
+  features = side-by-side line-numbers decorations
+  syntax-theme = base16
+  plus-style = syntax "#003800"
+  minus-style = syntax "#3f0001"
+
+[delta "decorations"]
+  commit-decoration-style = bold yellow box ul
+  file-style = bold yellow ul
+  file-decoration-style = none
+  hunk-header-decoration-style = cyan box ul
+
+[delta "line-numbers"]
+  line-numbers-left-style = cyan
+  line-numbers-right-style = cyan
+  line-numbers-minus-style = 124
+  line-numbers-plus-style = 28
+
+[init]
+  defaultBranch = main
+
+[trim]
+  bases = develop,master,main
+
+[credential]
+  useHttpPath = true
+
+[diff]
+  external = difft
+
+
+[includeIf "gitdir:~/src/**"]
+  path=./gitconfig-number5
+
+[includeIf "hasconfig:remote.*.url:[email protected]:number5/**"]
+  path =./gitconfig-number5
+
+# vim: ft=gitconfig et sw=2
+

home/modules/dotfiles/gitconfig-number5

@@ -0,0 +1,9 @@
+#  Specific config for https://github.com/number5
+[user]
+  name = Bruce Wang
+  email = [email protected]
+
+[core]
+  sshCommand = ssh -i ~/.ssh/id_ed25519 -F /dev/null
+
+# vim: ft=gitconfig et sw=2

home/modules/programs/default.nix

@@ -1,7 +1,6 @@
 [
   ./direnv
   ./chromium
-  ./git
   ./gpg
   ./neovim
   ./rust

home/modules/wayland/hyprland/hyprland.conf

@@ -1,3 +1,4 @@
+debug:disable_scale_checks=true
 
 input {
     kb_layout=us
@@ -46,7 +47,6 @@ decoration {
     blur {
       enabled=true
     }
-    col.shadow=0x66000000
     fullscreen_opacity=1.0
     active_opacity=1.0
     inactive_opacity=0.8