diff --git a/.bash_aliases b/.bash_aliases index f427679..74d27e4 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -13,7 +13,7 @@ alias qutebrowser="qutebrowser --qt-arg stylesheet ~/.local/share/qutebrowser/fi alias aniwrapper='aniwrapper -D 144' ## Colorls -alias ls='exa -M --group-directories-first --icons --color=always --group --git' +alias ls='eza -M --group-directories-first --icons --color=always --group --git' alias ll='ls -l' alias la='ls -la' diff --git a/.config/ghostty/config##os.Darwin b/.config/ghostty/config##os.Darwin index 3fc5c20..b54ed74 100644 --- a/.config/ghostty/config##os.Darwin +++ b/.config/ghostty/config##os.Darwin @@ -16,3 +16,4 @@ copy-on-select = clipboard app-notifications = no-clipboard-copy keybind = all:ctrl+enter=unbind keybind = all:ctrl+grave_accent=toggle_quick_terminal +shell-integration = zsh diff --git a/.config/oh-my-posh/catppuccin_macchiato.omp.json b/.config/oh-my-posh/catppuccin_macchiato.omp.json##default similarity index 100% rename from .config/oh-my-posh/catppuccin_macchiato.omp.json rename to .config/oh-my-posh/catppuccin_macchiato.omp.json##default diff --git a/.config/oh-my-posh/catppuccin_macchiato.omp.json##os.Darwin b/.config/oh-my-posh/catppuccin_macchiato.omp.json##os.Darwin new file mode 100644 index 0000000..2ce5939 --- /dev/null +++ b/.config/oh-my-posh/catppuccin_macchiato.omp.json##os.Darwin @@ -0,0 +1,111 @@ +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "palette": { + "os": "#ACB0BE", + "closer": "p:os", + "pink": "#F5BDE6", + "lavender": "#B7BDF8", + "blue": "#8AADF4" + }, + "blocks": [ + { + "type": "rprompt", + "alignment": "right", + "segments": [ + { + "type": "command", + "style": "plain", + "foreground": "p:os", + "properties": { + "shell": "bash", + "command": "ip -4 -o addr show dev tailscale0 up 2>/dev/null | awk '{print $4}' | cut -d/ -f1" + } + } + ] + }, + { + "alignment": "left", + "segments": [ + { + "foreground": "p:os", + "style": "plain", + "type": "os" + }, + { + "foreground": "p:blue", + "style": "plain", + "template": "{{ .UserName }}@{{ .HostName }} ", + "type": "session" + }, + { + "foreground": "p:pink", + "properties": { + "folder_icon": "..\ue5fe..", + "home_icon": "~", + "style": "agnoster_full" + }, + "style": "plain", + "template": "{{ .Path }}", + "type": "path" + }, + { + "properties": { + "fetch_status": true, + "fetch_upstream_icon": true + }, + "foreground_templates": [ + "{{ if or (.Working.Changed) (.Staging.Changed) }}#EED49F{{ end }}", + "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#EE99A0{{ end }}", + "{{ if gt .Ahead 0 }}#C6A0F6{{ end }}", + "{{ if gt .Behind 0 }}#C6A0F6{{ end }}" + ], + "style": "powerline", + "type": "git" + }, + { + "type": "python", + "style": "powerline", + "foreground": "#a6da95", + "display_default": false, + "display_mode": "environment", + "fetch_version": false, + "fetch_virtual_env": true, + "default_venv_names": ["venv", "env"], + "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ if .Venv }}{{ .Venv }} {{ end }}{{ .Full }}{{ end }}" + }, + { + "type": "status", + "style": "powerline", + "foreground": "p:pink", + "properties": { + "always_enabled": false + } + } + ], + "type": "prompt" + } + ], + "tooltips": [ + { + "type": "git", + "tips": ["git", "g"], + "style": "diamond", + "foreground": "#a6da95", + "background": "#363a4f", + "leading_diamond": "", + "trailing_diamond": "", + "template": "{{ .HEAD }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}", + "properties": { + "fetch_status": true, + "fetch_upstream_icon": true + } + } + ], + "final_space": true, + "version": 3, + "transient_prompt": { + "background": "transparent", + "foreground": "#ACB0BE", + "template": "{{ .Shell }}> " + } +} diff --git a/.zsh/.zshrc##os.Darwin b/.zsh/.zshrc##os.Darwin index af3ac1d..9ec8942 100644 --- a/.zsh/.zshrc##os.Darwin +++ b/.zsh/.zshrc##os.Darwin @@ -48,4 +48,13 @@ zstyle :compinstall filename '/Users/sudacode/.zshrc' autoload -Uz compinit compinit -# End of lines added by compinstall + +# load both the URL‐quoting and paste‐magic widgets +autoload -Uz url-quote-magic bracketed-paste-magic + +# tell url-quote-magic which chars to escape +zstyle ':url-quote-magic:*' url-quotes '' + +# bind it to both typing and pasting +zle -N self-insert url-quote-magic +zle -N bracketed-paste bracketed-paste-magic diff --git a/README.md b/README.md index bf29a48..1d6f710 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ - [hyprland.conf](.config/hypr/hyprland.conf) - [keybindings.conf](.config/hypr/keybindings.conf) - Shell: [zsh (oh-my-posh)](https://ohmyposh.dev/) - - [.zshrc](.zsh/.zshrc) + - [.zshrc](.zsh/.zshrc##default) - Notification Server: [SwayNotificationCenter](https://github.com/ErikReider/SwayNotificationCenter) - [config.json](.config/swaync/config.json) - [style.css](.config/swaync/style.css) @@ -22,7 +22,7 @@ - Text Editor: [neovim](https://neovim.io/) - [config](.config/nvim) - Audio Player: [mpd](https://www.musicpd.org/) with [ncmpcpp](https://github.com/ncmpcpp/ncmpcpp) - - [mpd config](.config/mpd/mpd.conf) - - [ncmpcpp config](.config/ncmpcpp/config) + - [mpd config](.config/mpd/mpd.conf##default) + - [ncmpcpp config](.config/ncmpcpp/config##Default) - Audio Visualizer: [cava](https://github.com/karlstav/cava) - - [cava config](.config/cava/config) + - [cava config](.config/cava/config##default)