diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 7c77626..ccbdecf 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -29,6 +29,10 @@ vim.keymap.set('n', 'st', ':set spell!') -- toggle nvim tree vim.keymap.set("n", "e", ":NvimTreeToggle") +-- mini pick +vim.keymap.set("n", "p", ":Pick files") + + -- barbar vim.keymap.set("n", "x", ":BufferClose") -- (I need both options, one for windows, one for linux) diff --git a/.config/nvim/lua/config/plugins/blink.lua b/.config/nvim/lua/config/plugins/blink.lua index 2d0879e..32635f2 100644 --- a/.config/nvim/lua/config/plugins/blink.lua +++ b/.config/nvim/lua/config/plugins/blink.lua @@ -1,6 +1,7 @@ vim.pack.add{"https://github.com/saghen/blink.cmp"} require("blink.cmp").setup({ + fuzzy = { implementation = "lua" }, keymap = { preset = "enter", [""] = { "select_and_accept", "fallback" }, diff --git a/.config/nvim/lua/config/plugins/mini.lua b/.config/nvim/lua/config/plugins/mini.lua index 3faf6ad..1f5029a 100644 --- a/.config/nvim/lua/config/plugins/mini.lua +++ b/.config/nvim/lua/config/plugins/mini.lua @@ -2,6 +2,7 @@ vim.pack.add{"https://github.com/nvim-mini/mini.nvim"} require("mini.ai").setup() require("mini.surround").setup() +require("mini.pick").setup() require("mini.pairs").setup({ modes = { insert = true, diff --git a/.config/nvim/lua/config/plugins/theme.lua b/.config/nvim/lua/config/plugins/theme.lua index d512875..e16fde0 100644 --- a/.config/nvim/lua/config/plugins/theme.lua +++ b/.config/nvim/lua/config/plugins/theme.lua @@ -1,3 +1,7 @@ -vim.pack.add{"https://github.com/neanias/everforest-nvim.git"} +-- vim.pack.add{"https://github.com/neanias/everforest-nvim.git"} +-- vim.pack.add{"https://github.com/eldritch-theme/eldritch.nvim"} +-- vim.pack.add{"https://github.com/xero/miasma.nvim"} +vim.pack.add{"https://github.com/EdenEast/nightfox.nvim"} -vim.cmd("colorscheme everforest") + +vim.cmd("colorscheme terafox") diff --git a/.xinitrc b/.xinitrc index 3514971..8b70c94 100755 --- a/.xinitrc +++ b/.xinitrc @@ -5,4 +5,6 @@ export QT_IM_MODULE=fcitx export XMODIFIERS=@im=fcitx fcitx5 -d +feh --bg-fill images/wg/yotsuba-ball.webp + exec i3 diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..cc34602 --- /dev/null +++ b/.zshrc @@ -0,0 +1,120 @@ +# Lines configured by zsh-newuser-install +HISTFILE=~/.histfile +HISTSIZE=1000000 +SAVEHIST=1000000 +setopt autocd extendedglob nomatch notify +unsetopt beep +bindkey -e +# End of lines configured by zsh-newuser-install +# The following lines were added by compinstall +zstyle :compinstall filename '/home/dominic/.zshrc' + +autoload -Uz compinit +if [[ -n ~/.zcompdump(#qN.mh+24) ]]; then + compinit +else + compinit -C +fi +# End of lines added by compinstall + +# THEME +# 1. Enable Git branch info +autoload -Uz vcs_info +precmd() { vcs_info } +zstyle ':vcs_info:git:*' formats '(%b)' + +# 2. Enable variable expansion in the prompt +setopt PROMPT_SUBST + +# 3. Define a function to show the Python venv name +python_venv() { + if [[ -n "$VIRTUAL_ENV" ]]; then + echo "(${VIRTUAL_ENV:t}) " + fi +} + +# 4. Set the prompt (e.g., [venv] path (branch) %) +PROMPT=$'%F{2}$(python_venv)%f%F{4}%n@%m:%~%f %F{1}${vcs_info_msg_0_}%f \n>>> %F{white}' +# END THEME + +# plugins +source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh +ZSH_AUTOSUGGEST_USE_ASYNC=1 +ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20 + +# custom stuff +zstyle ':completion:*' menu select + +export VISUAL=vim +export EDITOR="$VISUAL" + +#generic +alias ls='ls --color=auto' +alias grep='grep --color=auto' +alias hg='history | grep' +alias pg='ps aux | grep' +alias k9='kill -9' + +# git +alias gs="git status" +alias gc="git commit -m" +alias ga="git add" +alias gcc="git checkout -b" + +alias activate="source venv/bin/activate" + +alias dmenu="dmenu -nf '#BBBBBB' -nb '#3A515D' -sb '#83C092' -sf '#000000' -fn 'monospace-16'" + +alias dotfiles='/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME' + +# PYWAL --------------------- +# Import colorscheme from 'wal' asynchronously +# & # Run the process in the background. +# ( ) # Hide shell job control messages. +# Not supported in the "fish" shell. +alias wal="wal -o $HOME/.config/wal/done.sh" +(cat ~/.cache/wal/sequences &) + +# Alternative (blocks terminal for 0-3ms) +cat ~/.cache/wal/sequences + +# To add support for TTYs this line can be optionally added. +source ~/.cache/wal/colors-tty.sh + + +nvm() { + unset -f nvm + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" + nvm "$@" +} + +# pnpm +export PNPM_HOME="/home/dominic/.local/share/pnpm" +case ":$PATH:" in + *":$PNPM_HOME:"*) ;; + *) export PATH="$PNPM_HOME:$PATH" ;; +esac +# pnpm end + +# Created by `pipx` on 2025-11-23 18:01:25 +export PATH="$PATH:/home/dominic/.local/bin" + +GTK_IM_MODULE=fcitx +QT_IM_MODULE=fcitx +XMODIFIERS=@im=fcitx +SDL_IM_MODULE=fcitx +INPUT_METHOD=fcitx +GLFW_IM_MODULE=ibus + +if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then + startx +fi + +export TERM="xterm-kitty" +export PICO_SDK_PATH=/usr/share/pico-sdk + +export PATH="$HOME/bin:$PATH" +