feat: Add new configs and updates

This commit is contained in:
2025-03-28 11:45:43 +11:00
parent 588eba9125
commit 5724576905
7 changed files with 99 additions and 67 deletions

View File

@@ -16,7 +16,12 @@ blur = true
[font] [font]
normal = { family = "Fira Code", style = "Regular" } normal = { family = "Fira Code", style = "Regular" }
size = 6.5 size = 8
[selection] [selection]
save_to_clipboard = true save_to_clipboard = true
[mouse]
bindings = [{ mouse = "Right", action = "Paste" }]

View File

@@ -225,7 +225,8 @@ format = | <label>
[module/close] [module/close]
type = custom/script type = custom/script
exec = echo "  " ; exec = echo "  "
exec = echo " "
click-left = /home/nathan/scripts/close_window.sh click-left = /home/nathan/scripts/close_window.sh

View File

@@ -20,3 +20,5 @@
spellcheck = false spellcheck = false
[credential] [credential]
helper = store helper = store
[push]
autoSetupRemote = true

3
.tldrrc Normal file
View File

@@ -0,0 +1,3 @@
{
"theme":"base16"
}

View File

@@ -1 +1,5 @@
. "$HOME/.cargo/env" . "$HOME/.cargo/env"
export PATH="$PATH:/home/nathan/.cyfrin/bin"
export PATH="$PATH:/home/nathan/.foundry/bin"

63
.zshrc
View File

@@ -1,5 +1,4 @@
# If you come from bash you might have to change your $PATH. # If you come from bash you might have to change your $PATH. export PATH=$HOME/bin:/usr/local/bin:$PATH
# export PATH=$HOME/bin:/usr/local/bin:$PATH
# Path to your oh-my-zsh installation. # Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh" export ZSH="$HOME/.oh-my-zsh"
@@ -70,7 +69,7 @@ ZSH_THEME="robbyrussell"
# Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # 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 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 [ -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 # Path stuff
export PATH="/home/nathan/Downloads/go/bin:$PATH" export PATH="/home/$USER/Downloads/go/bin:$PATH"
export PATH="/home/nathan/Downloads/idea-IU-232.10072.27/bin:$PATH" export PATH="/home/$USER/Downloads/idea-IU-232.10072.27/bin:$PATH"
export PATH="/home/nathan/.local/bin:$PATH" export PATH="/home/$USER/.local/bin:$PATH"
export PATH="$PATH:$ANDROID_HOME/platform-tools" 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:$HOME/.pub-cache/bin"
export PATH="$PATH:/opt/flutter/flutter/bin" export PATH="$PATH:/opt/flutter/flutter/bin"
export PATH="/home/nathan/.local/share/solana/install/active_release/bin:$PATH" export PATH="/home/$USER/.local/share/solana/install/active_release/bin:$PATH"
export FZF_DEFAULT_OPTS='--preview "bat --style=numbers --color=always --line-range :500 {}"' export PATH="$PATH:/home/$USER/exe/zig-linux-x86_64-0.13.0"
export MANPAGER="sh -c 'col -bx | bat -l man -p'" 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 stuff
alias hcurl='curl --doh-url https://hnsdoh.com/dns-query' alias hcurl='curl --doh-url https://hnsdoh.com/dns-query'
alias ls='exa' alias ls='eza --icons=auto'
alias ll='exa --long --group --header --icons --classify' alias ll='eza --long --group --header --icons --classify'
alias ani-cli='FZF_DEFAULT_OPTS= ani-cli'
eval "$(zoxide init --cmd cd zsh)" eval "$(zoxide init --cmd cd zsh)"
eval "$(oh-my-posh init zsh --config ~/theme.omp.json)" eval "$(oh-my-posh init zsh --config ~/theme.omp.json)"
@@ -138,19 +142,27 @@ export HSD_API_KEY=30e7b7974d99c62b241a9daf3d4924a108515b03
alias z='zellij' alias z='zellij'
alias za='zellij attach' 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 opacity='/home/$USER/scripts/opacity.sh'
alias op='/home/nathan/scripts/opacity.sh' alias op='/home/$USER/scripts/opacity.sh'
alias blur='/home/nathan/scripts/blur.sh' alias blur='/home/$USER/scripts/blur.sh'
alias music='/home/nathan/scripts/music.sh' alias music='/home/$USER/scripts/music.sh'
alias venv='source /home/nathan/scripts/venv.sh' alias venv='source /home/$USER/scripts/venv.sh'
alias copy='/home/nathan/scripts/copy.sh' alias copy='/home/$USER/scripts/copy.sh'
alias upload='/home/nathan/scripts/upload.sh' alias upload='/home/$USER/scripts/upload.sh'
alias ts='/home/nathan/scripts/ts.sh' alias ts='/home/$USER/scripts/ts.sh'
alias hold='/home/nathan/scripts/hold.sh' alias hold='/home/$USER/scripts/hold.sh'
alias message='/home/nathan/scripts/message.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() { unzip() {
/usr/bin/unzip -d "${1%.*}" "$1" /usr/bin/unzip -d "${1%.*}" "$1"
} }
@@ -164,7 +176,12 @@ eval "$(atuin init zsh --disable-up-arrow)"
bindkey '^[[1;5A' atuin-up-search bindkey '^[[1;5A' atuin-up-search
fpath+=${ZDOTDIR:-~}/.zsh_functions fpath+=${ZDOTDIR:-~}/.zsh_functions
FPATH+=${ZDOTDIR:-~}/.zsh_functions
export FPATH="/home/$USER/Git/eza/completions/zsh:$FPATH"
# Start zellij # Start zellij
ZELLIJ_AUTO_EXIT=true ZELLIJ_AUTO_EXIT=true
eval "$(zellij setup --generate-auto-start zsh)" 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"

View File

@@ -1,50 +1,49 @@
{ {
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
"version": 2,
"blocks": [ "blocks": [
{ {
"type": "prompt", "type": "prompt",
"alignment": "left", "alignment": "left",
"segments": [ "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": { "properties": {
"display_host": true "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": { "properties": {
"fetch_version": true, "display_mode": "context",
"fetch_virtual_env": true,
"display_version": true, "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": { "properties": {
"folder_separator_icon": "<#c0c0c0>/</>", "folder_separator_icon": "<#c0c0c0>/</>",
"style": "full" "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", "style": "plain",
"template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</>{{ .HEAD }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>",
"foreground": "white", "foreground": "white",
"template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>-[</>{{ .HEAD }}<{{ if .Root }}lightBlue{{ else }}green{{ end }}>]</>" "type": "git"
} }
] ]
}, },
@@ -53,28 +52,28 @@
"alignment": "right", "alignment": "right",
"segments": [ "segments": [
{ {
"type": "executiontime",
"style": "plain",
"foreground": "white",
"template": " {{ .FormattedMs }} ",
"properties": { "properties": {
"always_enabled": false, "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", "style": "plain",
"template": " {{ if gt .Code 0 }}\u2a2f{{else}}{{if gt .Ms 50}}✓{{ end }}{{ end }} ",
"foreground": "green", "foreground": "green",
"type": "executiontime",
"foreground_templates": [ "foreground_templates": [
"{{ if gt .Code 0 }}red{{ end }}" "{{ 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", "alignment": "left",
"segments": [ "segments": [
{ {
"type": "text",
"style": "plain", "style": "plain",
"template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>\u2514\u2500</>{{ if .Root }}<lightRed>#</>{{ else }}${{ end }} ",
"foreground": "lightBlue", "foreground": "lightBlue",
"template": "<{{ if .Root }}lightBlue{{ else }}green{{ end }}>\u2514\u2500</>{{ if .Root }}<lightRed>#</>{{ else }}${{ end }} " "type": "text"
} }
], ],
"newline": true "newline": true
} }
] ],
} "version": 3
}