From 5724576905b6831c8792aef71ef0277b773d5ded Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Fri, 28 Mar 2025 11:45:43 +1100
Subject: [PATCH] feat: Add new configs and updates

---
 .alacritty.toml            |  7 +++-
 .config/polybar/config.ini |  3 +-
 .gitconfig                 |  2 +
 .tldrrc                    |  3 ++
 .zshenv                    |  4 ++
 .zshrc                     | 63 +++++++++++++++++-----------
 theme.omp.json             | 84 +++++++++++++++++++-------------------
 7 files changed, 99 insertions(+), 67 deletions(-)
 create mode 100644 .tldrrc

diff --git a/.alacritty.toml b/.alacritty.toml
index d978c6e..8c84b78 100644
--- a/.alacritty.toml
+++ b/.alacritty.toml
@@ -16,7 +16,12 @@ blur = true
 
 [font]
 normal = { family = "Fira Code", style = "Regular" }
-size = 6.5
+size = 8
+
 
 [selection]
 save_to_clipboard = true
+
+[mouse]
+bindings = [{ mouse = "Right", action = "Paste" }]
+
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 8d9327b..fd8deb4 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -225,7 +225,8 @@ format = | <label>
 
 [module/close]
 type = custom/script
-exec = echo "  "
+; exec = echo "  "
+exec = echo "    "
 click-left = /home/nathan/scripts/close_window.sh
 
 
diff --git a/.gitconfig b/.gitconfig
index 7712c72..39704c5 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,3 +20,5 @@
 	spellcheck = false
 [credential]
 	helper = store
+[push]
+	autoSetupRemote = true
diff --git a/.tldrrc b/.tldrrc
new file mode 100644
index 0000000..14d624b
--- /dev/null
+++ b/.tldrrc
@@ -0,0 +1,3 @@
+{
+"theme":"base16"
+}
diff --git a/.zshenv b/.zshenv
index c2f3182..8cabc93 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1 +1,5 @@
 . "$HOME/.cargo/env"
+
+export PATH="$PATH:/home/nathan/.cyfrin/bin"
+
+export PATH="$PATH:/home/nathan/.foundry/bin"
diff --git a/.zshrc b/.zshrc
index 3c40e49..13029cf 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,4 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+# If you come from bash you might have to change your $PATH. export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
@@ -70,7 +69,7 @@ ZSH_THEME="robbyrussell"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git sudo systemadmin)
+plugins=(git sudo systemadmin tldr)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -110,27 +109,32 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 
-export ANDROID_HOME=/home/nathan/Android/Sdk
+export ANDROID_HOME=/home/$USER/Android/Sdk
 
 # Path stuff
-export PATH="/home/nathan/Downloads/go/bin:$PATH"
-export PATH="/home/nathan/Downloads/idea-IU-232.10072.27/bin:$PATH"
-export PATH="/home/nathan/.local/bin:$PATH"
+export PATH="/home/$USER/Downloads/go/bin:$PATH"
+export PATH="/home/$USER/Downloads/idea-IU-232.10072.27/bin:$PATH"
+export PATH="/home/$USER/.local/bin:$PATH"
 export PATH="$PATH:$ANDROID_HOME/platform-tools"
-export PATH="$PATH:/home/nathan/Android/Sdk/cmdline-tools/latest/bin/"
+export PATH="$PATH:/home/$USER/Android/Sdk/cmdline-tools/latest/bin/"
 export PATH="$PATH:$HOME/.pub-cache/bin"
 export PATH="$PATH:/opt/flutter/flutter/bin"
-export PATH="/home/nathan/.local/share/solana/install/active_release/bin:$PATH"
-export FZF_DEFAULT_OPTS='--preview "bat --style=numbers --color=always --line-range :500 {}"'
-export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+export PATH="/home/$USER/.local/share/solana/install/active_release/bin:$PATH"
+export PATH="$PATH:/home/$USER/exe/zig-linux-x86_64-0.13.0"
+export PATH="$PATH:/home/$USER/go/bin"
+
+
+export FZF_DEFAULT_OPTS='--preview "bat --color=always {}"'
+#export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 
 
 
 
 # Alias stuff
 alias hcurl='curl --doh-url https://hnsdoh.com/dns-query'
-alias ls='exa'
-alias ll='exa --long --group --header --icons --classify'
+alias ls='eza --icons=auto'
+alias ll='eza --long --group --header --icons --classify'
+alias ani-cli='FZF_DEFAULT_OPTS= ani-cli'
 
 eval "$(zoxide init --cmd cd zsh)"
 eval "$(oh-my-posh init zsh --config ~/theme.omp.json)"
@@ -138,19 +142,27 @@ export HSD_API_KEY=30e7b7974d99c62b241a9daf3d4924a108515b03
 
 alias z='zellij'
 alias za='zellij attach'
+tre() { command tre "$@" && source "/tmp/tre_aliases_$USER" 2>/dev/null; }
+alias tree=tre
 
-alias opacity='/home/nathan/scripts/opacity.sh'
-alias op='/home/nathan/scripts/opacity.sh'
-alias blur='/home/nathan/scripts/blur.sh'
-alias music='/home/nathan/scripts/music.sh'
-alias venv='source /home/nathan/scripts/venv.sh'
-alias copy='/home/nathan/scripts/copy.sh'
-alias upload='/home/nathan/scripts/upload.sh'
-alias ts='/home/nathan/scripts/ts.sh'
-alias hold='/home/nathan/scripts/hold.sh'
-alias message='/home/nathan/scripts/message.sh'
+alias opacity='/home/$USER/scripts/opacity.sh'
+alias op='/home/$USER/scripts/opacity.sh'
+alias blur='/home/$USER/scripts/blur.sh'
+alias music='/home/$USER/scripts/music.sh'
+alias venv='source /home/$USER/scripts/venv.sh'
+alias copy='/home/$USER/scripts/copy.sh'
+alias upload='/home/$USER/scripts/upload.sh'
+alias ts='/home/$USER/scripts/ts.sh'
+alias hold='/home/$USER/scripts/hold.sh'
+alias message='/home/$USER/scripts/message.sh'
+alias dockerstart='/home/$USER/scripts/dockerstart.sh'
+alias dockerstop='/home/$USER/scripts/dockerstop.sh'
+alias domains='/home/$USER/scripts/domains.py'
 
 
+# Use gitkraken's cli tool
+unalias gk
+
 unzip() {
   /usr/bin/unzip -d "${1%.*}" "$1"
 }
@@ -164,7 +176,12 @@ eval "$(atuin init zsh --disable-up-arrow)"
 bindkey '^[[1;5A' atuin-up-search
 
 fpath+=${ZDOTDIR:-~}/.zsh_functions
+FPATH+=${ZDOTDIR:-~}/.zsh_functions
+export FPATH="/home/$USER/Git/eza/completions/zsh:$FPATH"
 
 # Start zellij
 ZELLIJ_AUTO_EXIT=true
 eval "$(zellij setup --generate-auto-start zsh)"
+setopt NO_SHARE_HISTORY
+
+export PATH="$PATH:/home/$USER/Downloads/javacc-javacc-7.0.13/javacc-javacc-7.0.13/scripts"
diff --git a/theme.omp.json b/theme.omp.json
index a6ee142..dacfe57 100644
--- a/theme.omp.json
+++ b/theme.omp.json
@@ -1,50 +1,49 @@
 {
   "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "version": 2,
   "blocks": [
     {
       "type": "prompt",
       "alignment": "left",
       "segments": [
         {
-          "type": "session",
-          "style": "plain",
-          "foreground": "lightBlue",
-          "foreground_templates": [
-            "{{ if .Root }}lightRed{{ end }}"
-          ],
-          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>\u250c\u2500\u2500(</>{{ .UserName }}{{ if .Root }}💀{{ else }}@{{ end }}{{ .HostName }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>)</>",
           "properties": {
             "display_host": true
-          }
+          },
+          "style": "plain",
+          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>\u250c\u2500\u2500(</>{{ .UserName }}{{ if .Root }}💀{{ else }}@{{ end }}{{ .HostName }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>)</>",
+          "foreground": "lightBlue",
+          "type": "session",
+          "foreground_templates": [
+            "{{ if .Root }}lightRed{{ end }}"
+          ]
         },
         {
-          "type": "python",
-          "style": "plain",
-          "foreground": "yellow",
-          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</> {{ if .Error }}{{ .Error }}{{ else }}{{ if .Venv }}{{ .Venv }} {{ end }}(v{{ .Full }}){{ end }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>",
           "properties": {
-            "fetch_version": true,
-            "fetch_virtual_env": true,
+            "display_mode": "context",
             "display_version": true,
-            "display_mode": "context"
-          }
+            "fetch_version": true,
+            "fetch_virtual_env": true
+          },
+          "style": "plain",
+          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</>\ue73c {{ if .Error }}{{ .Error }}{{ else }}{{ if .Venv }}{{ .Venv }} {{ end }}(v{{ .Full }}){{ end }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>",
+          "foreground": "yellow",
+          "type": "python"
         },
         {
-          "type": "path",
-          "style": "plain",
-          "foreground": "lightWhite",
-          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</>{{ .Path }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>",
           "properties": {
             "folder_separator_icon": "<#c0c0c0>/</>",
             "style": "full"
-          }
+          },
+          "style": "plain",
+          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</>{{ .Path }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>",
+          "foreground": "lightWhite",
+          "type": "path"
         },
         {
-          "type": "git",
           "style": "plain",
+          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</>{{ .HEAD }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>",
           "foreground": "white",
-          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</>{{ .HEAD }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>"
+          "type": "git"
         }
       ]
     },
@@ -53,28 +52,28 @@
       "alignment": "right",
       "segments": [
         {
-          "type": "executiontime",
-          "style": "plain",
-          "foreground": "white",
-          "template": " {{ .FormattedMs }} ",
           "properties": {
             "always_enabled": false,
-            "threshold": 50,
-            "style": "round"
-          }
+            "style": "round",
+            "threshold": 50
+          },
+          "style": "plain",
+          "template": " {{ .FormattedMs }} ",
+          "foreground": "white",
+          "type": "executiontime"
         },
         {
-          "type": "executiontime",
+          "properties": {
+            "always_enabled": true,
+            "threshold": 50
+          },
           "style": "plain",
+          "template": " {{ if gt .Code 0 }}\u2a2f{{else}}{{if gt .Ms 50}}✓{{ end }}{{ end }} ", 
           "foreground": "green",
+          "type": "executiontime",
           "foreground_templates": [
             "{{ if gt .Code 0 }}red{{ end }}"
-          ],
-          "template": " {{ if gt .Code 0 }}\u2a2f{{else}}✓{{ end }} ",
-          "properties": {
-            "always_enabled": false,
-            "threshold": 50
-          }
+          ]
         }
       ]
     },
@@ -83,13 +82,14 @@
       "alignment": "left",
       "segments": [
         {
-          "type": "text",
           "style": "plain",
+          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>\u2514\u2500</>{{ if .Root }}<lightRed>#</>{{ else }}${{ end }} ",
           "foreground": "lightBlue",
-          "template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>\u2514\u2500</>{{ if .Root }}<lightRed>#</>{{ else }}${{ end }} "
+          "type": "text"
         }
       ],
       "newline": true
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "version": 3
+}