Add compatability with some ubuntu oddities
This commit is contained in:
@@ -49,7 +49,7 @@ stow -D nvim
|
|||||||
- Prompt: Powerlevel10k with instant prompt (async rendering)
|
- Prompt: Powerlevel10k with instant prompt (async rendering)
|
||||||
- Custom `prompt_jj` segment in `.p10k.zsh` shows jj change ID, bookmarks, and flags (conflict/divergent/empty)
|
- Custom `prompt_jj` segment in `.p10k.zsh` shows jj change ID, bookmarks, and flags (conflict/divergent/empty)
|
||||||
- Plugins: `zsh-autosuggestions` (fish-like inline suggestions), `fzf` (history/file search)
|
- Plugins: `zsh-autosuggestions` (fish-like inline suggestions), `fzf` (history/file search)
|
||||||
- Powerlevel10k sourced from `/usr/share/zsh-theme-powerlevel10k/` (Arch); on Debian clone manually to `~/powerlevel10k/`
|
- Powerlevel10k: sources from `/usr/share/zsh-theme-powerlevel10k/` (Arch/system) or `~/powerlevel10k/` (Debian manual clone) — whichever exists
|
||||||
|
|
||||||
**kitty** (`kitty/.config/kitty/kitty.conf`):
|
**kitty** (`kitty/.config/kitty/kitty.conf`):
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ stow git zsh nvim vim tmux jj kitty
|
|||||||
|
|
||||||
### Debian
|
### Debian
|
||||||
```sh
|
```sh
|
||||||
|
apt install git zsh tmux vim neovim kitty
|
||||||
apt install zsh zsh-autosuggestions fzf
|
apt install zsh zsh-autosuggestions fzf
|
||||||
# Install powerlevel10k manually:
|
# Install powerlevel10k manually:
|
||||||
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
|
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||||
"neo-tree.nvim": { "branch": "main", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" },
|
"neo-tree.nvim": { "branch": "main", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
|
"nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
|
||||||
"rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" },
|
"rose-pine": { "branch": "main", "commit": "9504524e5ed0e326534698f637f9d038ba4cd0ee" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||||
"vimtex": { "branch": "master", "commit": "82d2305ff71dfb3bd91602534cc9bb9a195bcb38" }
|
"vimtex": { "branch": "master", "commit": "9306903316c3ddd250676b7cf97c84a84c9c8f99" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,9 @@ bind-key R source-file ~/.tmux.conf \; display-message "tmux.conf reloaded."
|
|||||||
|
|
||||||
bind-key [ copy-mode
|
bind-key [ copy-mode
|
||||||
bind-key ] paste-buffer
|
bind-key ] paste-buffer
|
||||||
bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'wl-copy --foreground'
|
if-shell '[[ -n "$WAYLAND_DISPLAY" ]]' \
|
||||||
|
'bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "wl-copy --foreground"' \
|
||||||
|
'bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "xclip -selection clipboard"'
|
||||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
||||||
|
|
||||||
# Status Bar (Rosé Pine)
|
# Status Bar (Rosé Pine)
|
||||||
|
|||||||
14
zsh/.zshrc
14
zsh/.zshrc
@@ -19,9 +19,17 @@ bindkey '\e[1;3D' backward-word # Alt+Left
|
|||||||
|
|
||||||
# Completion
|
# Completion
|
||||||
autoload -Uz compinit && compinit
|
autoload -Uz compinit && compinit
|
||||||
|
if [[ -f /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh ]]; then
|
||||||
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
elif [[ -f /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh ]]; then
|
||||||
|
source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -f /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme ]]; then
|
||||||
source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
|
source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
|
||||||
|
elif [[ -f ~/powerlevel10k/powerlevel10k.zsh-theme ]]; then
|
||||||
|
source ~/powerlevel10k/powerlevel10k.zsh-theme
|
||||||
|
fi
|
||||||
[[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
|
[[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
|
||||||
|
|
||||||
# PATH configuration
|
# PATH configuration
|
||||||
@@ -39,5 +47,11 @@ alias open='xdg-open'
|
|||||||
alias transcat='queercat -f transgender'
|
alias transcat='queercat -f transgender'
|
||||||
alias bicat='queercat -f bisexual'
|
alias bicat='queercat -f bisexual'
|
||||||
|
|
||||||
|
# fzf shell integration: newer versions use --zsh, older Ubuntu installs use static files
|
||||||
|
if fzf --zsh &>/dev/null; then
|
||||||
source <(fzf --zsh)
|
source <(fzf --zsh)
|
||||||
|
elif [[ -f /usr/share/doc/fzf/examples/key-bindings.zsh ]]; then
|
||||||
|
source /usr/share/doc/fzf/examples/key-bindings.zsh
|
||||||
|
[[ -f /usr/share/doc/fzf/examples/completion.zsh ]] && source /usr/share/doc/fzf/examples/completion.zsh
|
||||||
|
fi
|
||||||
export PATH="$HOME/.local/bin:$PATH"
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
|
|||||||
Reference in New Issue
Block a user