Moar catppuccin theming!! Bat and delta viewer for git

This commit is contained in:
Nathan Anderson 2024-03-20 15:00:06 -06:00
parent 1e02aaf73d
commit 45d9cadc71
5 changed files with 2074 additions and 18 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,26 @@
[delta "Catppuccin Macchiato"]
blame-palette = "#24273a #1e2030 #181926 #363a4f #494d64"
commit-decoration-style = "box ul"
dark = true
file-decoration-style = "#cad3f5"
file-style = "#cad3f5"
hunk-header-decoration-style = "box ul"
hunk-header-file-style = "bold"
hunk-header-line-number-style = "bold #a5adcb"
hunk-header-style = "file line-number syntax"
line-numbers = true
line-numbers-left-style = "#6e738d"
line-numbers-minus-style = "bold #ed8796"
line-numbers-plus-style = "bold #a6da95"
line-numbers-right-style = "#6e738d"
line-numbers-zero-style = "#6e738d"
# 25% red 75% base
minus-emph-style = "bold syntax #564052"
# 10% red 90% base
minus-style = "syntax #383143"
# 25% green 75% base
plus-emph-style = "bold syntax #455552"
# 10% green 90% base
plus-style = "syntax #313943"
# Should match the name of the bat theme
syntax-theme = "Catppuccin-macchiato"

View File

@ -145,8 +145,8 @@ exec swayidle -w\
# Move focus to the parent container # Move focus to the parent container
bindsym $mod+a focus parent bindsym $mod+a focus parent
bindsym $mod+g exec ~/.config/sway/scripts/scale.sh inc # bindsym $mod+g exec ~/.config/sway/scripts/scale.sh inc
bindsym $mod+m exec ~/.config/sway/scripts/scale.sh dec # bindsym $mod+m exec ~/.config/sway/scripts/scale.sh dec
# #
# Scratchpad: # Scratchpad:

View File

@ -113,6 +113,7 @@
libsForQt5.qt5ct libsForQt5.qt5ct
# Install fonts # Install fonts
(nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; }) (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; })
recursive
]; ];
# Home Manager is pretty good at managing dotfiles. The primary way to manage # Home Manager is pretty good at managing dotfiles. The primary way to manage
@ -133,6 +134,8 @@
}; };
home.sessionVariables = { home.sessionVariables = {
# MANPAGER="sh -c 'col -bx | bat -l man -p'";
BAT_THEME="Catppuccin Macchiato";
EDITOR = "hx"; EDITOR = "hx";
XDG_CURRENT_DESKTOP="sway"; XDG_CURRENT_DESKTOP="sway";
}; };
@ -143,13 +146,14 @@
userEmail = email; userEmail = email;
userName = fullName; userName = fullName;
extraConfig = { extraConfig = {
include = { path = "${config.xdg.configHome}/macchiato.gitconfig"; };
init = { defaultBranch = "main"; }; init = { defaultBranch = "main"; };
pull = { ff = "only"; }; pull = { ff = "only"; };
merge = { conflictStyle="zdiff3"; }; merge = { conflictStyle="zdiff3"; };
push = { autoSetupRemote="true"; }; push = { autoSetupRemote="true"; };
delta = { features = "Catppuccin Macchiato"; };
}; };
delta.enable = true; delta.enable = true;
}; };
programs = { programs = {
@ -172,28 +176,31 @@
}; };
initExtra = '' initExtra = ''
eval "$(direnv hook zsh)" eval "$(direnv hook zsh)"
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
# fzf_projects() {
# DIR=`
# fd .git --search-path="$HOME/source/" -H --ignore-file ~/.config/fd-ignore -tdirectory | \
# xargs dirname | \
# sed 's|$HOME||g' | \
# sort | \
# uniq | \
# fzf --preview 'ls $HOME/{}/README.md 2>/dev/null && bat $HOME/{}/README.md || printf "No README.md file found in this directory\n%s" {}' --preview-window=top | \
# xargs printf "$HOME/%s/"
# `
# cd $DIR
# }
# alias p="fzf_projects ~/source/"
# Better Unix Aliases
alias ask="nix-shell -p python310Packages.openai --run 'python ~/source/python/chat.py'" alias ask="nix-shell -p python310Packages.openai --run 'python ~/source/python/chat.py'"
fzf_projects() {
DIR=`
fd .git --search-path="$HOME/source/" -H --ignore-file ~/.config/fd-ignore -tdirectory | \
xargs dirname | \
sed 's|$HOME||g' | \
sort | \
uniq | \
fzf --preview 'ls $HOME/{}/README.md 2>/dev/null && bat $HOME/{}/README.md || printf "No README.md file found in this directory\n%s" {}' --preview-window=top | \
xargs printf "$HOME/%s/"
`
cd $DIR
}
alias p="fzf_projects ~/source/"
alias ls="lsd" alias ls="lsd"
alias l="lsd --almost-all --long" alias l="lsd --almost-all --long"
alias llm="lsd --timesort --long" alias llm="lsd --timesort --long"
alias lS="lsd --oneline --classic" alias lS="lsd --oneline --classic"
alias lt="lsd --tree --depth=2" alias lt="lsd --tree --depth=2"
alias grep="rg" alias grep="rg"
alias cat="bat --paging=never"
alias rm="rm -i" alias rm="rm -i"
''; '';
}; };

View File

@ -111,6 +111,8 @@
programs.adb.enable = true; programs.adb.enable = true;
# kdeconnect setup # kdeconnect setup
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
# service file to start the sshAgent
programs.ssh.startAgent = true;
### ###
## Services ## Services