Moar catppuccin theming!! Bat and delta viewer for git

nate/dotfiles/macchiato.gitconfig

@@ -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"

nate/dotfiles/sway/config.d/default

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

nate/modules/home-manager/home.nix

@@ -113,6 +113,7 @@
     libsForQt5.qt5ct
     # Install fonts
     (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; })
+    recursive
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -133,6 +134,8 @@
   };
 
   home.sessionVariables = {
+    # MANPAGER="sh -c 'col -bx | bat -l man -p'";
+    BAT_THEME="Catppuccin Macchiato";
     EDITOR = "hx";
     XDG_CURRENT_DESKTOP="sway";
   };
@@ -143,13 +146,14 @@
       userEmail = email;
       userName = fullName;
       extraConfig = {
+        include = { path = "${config.xdg.configHome}/macchiato.gitconfig"; };
         init = { defaultBranch = "main"; };
         pull = { ff = "only"; };
         merge = { conflictStyle="zdiff3"; };
         push = { autoSetupRemote="true"; };
+        delta = { features = "Catppuccin Macchiato"; };
       };
       delta.enable = true;
-
   };
 
   programs = {
@@ -172,28 +176,31 @@
       };
       initExtra = ''
           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'"
-
-          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 l="lsd --almost-all --long"
           alias llm="lsd --timesort --long"
           alias lS="lsd --oneline --classic"
           alias lt="lsd --tree --depth=2"
           alias grep="rg"
+          alias cat="bat --paging=never"
           alias rm="rm -i"
        '';
   };

nate/modules/sway/sway_conf.nix

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