summaryrefslogtreecommitdiff
path: root/tw
diff options
context:
space:
mode:
Diffstat (limited to 'tw')
-rw-r--r--tw/home/files/zshrc1
-rw-r--r--tw/home/lap.scm6
2 files changed, 6 insertions, 1 deletions
diff --git a/tw/home/files/zshrc b/tw/home/files/zshrc
index 5d26d9d3..2aac6a63 100644
--- a/tw/home/files/zshrc
+++ b/tw/home/files/zshrc
@@ -105,6 +105,7 @@ alias ga='git add'
alias gb='git branch'
alias gc='git commit'
alias gd='git diff'
+alias gdk='git difftool --no-symlinks --dir-diff'
alias gds='git diff --staged'
alias gf='git fetch'
alias gfa='git fetch --all --prune --tags'
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index ad5301ef..ab692cf9 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -296,7 +296,11 @@
;; TODO: "kdeglobals" works for some programs (e.g. kdeconnect-app),
;; but not for others (e.g. nheko, kdeconnect-settings)...
("kdeglobals" ,catppuccin-kdeglobals)
- ("kitty/diff.conf" ,catppuccin-kitty-diff)
+ ("kitty/diff.conf"
+ ,(combined-text-file "kitty-diff.conf"
+ (plain-file "kitty-diff-custom.conf"
+ "pygments_style = bw\n")
+ catppuccin-kitty-diff))
("kitty/kitty.conf"
,(combined-text-file "kitty.conf"
(local-file "files/kitty.conf")