diff --git a/dotdrop b/dotdrop index 18a61bc..5330d39 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 18a61bce60c30d147f630f74e863a0f29004f34e +Subproject commit 5330d395b35f64968fbda51533d0f036b34a02d0 diff --git a/dotfiles/compton/compton.conf b/dotfiles/compton/compton.conf index 093f941..13047bb 100644 --- a/dotfiles/compton/compton.conf +++ b/dotfiles/compton/compton.conf @@ -9,7 +9,7 @@ opacity-rule = [ # Blur blur-background = true; blur-method = "kawase"; -blur-strength = 4; +blur-strength = 6; # Other vsync = true; diff --git a/dotfiles/i3/config b/dotfiles/i3/config index c5fad69..c98a495 100644 --- a/dotfiles/i3/config +++ b/dotfiles/i3/config @@ -198,8 +198,10 @@ exec --no-startup-id "firefox" for_window [class="Firefox"] move container to workspace 9 # Monitors -set $monitor1 "HDMI-1" # Primary -set $monitor2 "HDMI-2" # Secondary +# Primary +set $monitor1 "HDMI-1" +# Secondary +set $monitor2 "HDMI-2" workspace $ws10 output $monitor2 workspace $ws9 output $monitor2 @@ -228,8 +230,10 @@ for_window [class="Chromium"] move container to workspace 9 for_window [class="Firefox"] move container to workspace 9 # Monitors -set $monitor1 "eDP-1" # Integrated -set $monitor2 "HDMI-1" # pot. Secondary +# Integrated +set $monitor1 "eDP-1" +# potential Secondary +set $monitor2 "HDMI-1" workspace $ws10 output $monitor2 diff --git a/dotfiles/scripts/wallpaper.py b/dotfiles/scripts/wallpaper.py index ba56250..75b16fa 100755 --- a/dotfiles/scripts/wallpaper.py +++ b/dotfiles/scripts/wallpaper.py @@ -35,7 +35,7 @@ def list_wallpapers(wallpaper_list, *args): if __name__ == "__main__": ### DEFAULT WALLPAPER DIRECTORY HERE - path = "." + path = "wallpaper" parser = argparse.ArgumentParser() parser.add_argument("-q", "--query", help="Refine selection") diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc index 239edce..7daafa6 100644 --- a/dotfiles/vim/vimrc +++ b/dotfiles/vim/vimrc @@ -1,3 +1,4 @@ +let mapleader = "\" " ------------------------------------- Vundle Setup --------------------------- set nocompatible set rtp+=~/.vim/bundle/Vundle.vim @@ -7,9 +8,15 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'tpope/vim-fugitive' " Git wrapper Plugin 'tmsvg/pear-tree' " parathesis matching + +" Markdown Plugin 'vimwiki/vimwiki' Plugin 'dhruvasagar/vim-table-mode' " manage markdown tables +" fzf +Plugin 'junegunn/fzf' +Plugin 'junegunn/fzf.vim' + " Colors Plugin 'arcticicestudio/nord-vim' Plugin 'vim-airline/vim-airline' @@ -43,6 +50,9 @@ let g:airline_powerline_fonts = 1 let g:bufferline_echo = 0 set guifont="InconsolataLGC Nerd Font Mono" + +" fzf +nmap :Files " ------------------------------------- Colors --------------------------------- syntax on colorscheme nord @@ -100,14 +110,13 @@ set foldnestmax=30 set foldmethod=indent " ------------------------------------- netrw ---------------------------------- -map :Ex +nmap :Ex let g:netrw_winsize = 25 let g:netrw_liststyle = 3 " Tree-like structure let g:netrw_banner = 0 " Remove useless banner at the top of netrw " ------------------------------------- Macros & Mappings ---------------------- -let mapleader = "\" cmap Wq wq cmap Q q cmap W w @@ -120,6 +129,6 @@ if has("autocmd") endif " ------------------------------------- Pandoc --------------------------------- -map c :w! \| !~/scripts/pandoc-comp % -map o :!~/scripts/open-pdf % +nmap c :w! \| !~/scripts/pandoc-comp % +nmap o :!~/scripts/open-pdf % diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc index a95db17..1d439f5 100644 --- a/dotfiles/zsh/zshrc +++ b/dotfiles/zsh/zshrc @@ -8,12 +8,19 @@ DISABLE_UNTRACKED_FILES_DIRTY="true" plugins=( git - common-aliases compleat - history + common-aliases ssh-agent + vi-mode ) +# https://github.com/ohmyzsh/ohmyzsh/wiki/Plugins +# git: git shortcuts +# compleat: complete flags +# common-aliases: the name says it +# ssh-agent: preload ssh-keys +# vi-mode: use vim-bindings in zsh + zstyle :omz:plugins:ssh-agent identities source $ZSH/oh-my-zsh.sh @@ -34,13 +41,31 @@ alias fonts="/home/$USER/.local/share/fonts" alias listfonts="fc-list :scalable=true:spacing=mono: family" alias cachefonts="fc-cache -f -v" -alias c="clear" -alias v="vim" alias w="vim ~/vimwiki/index.md" +# change cursor thickness for vi-mode +function zle-keymap-select { + if [[ ${KEYMAP} == vicmd ]] || + [[ $1 = 'block' ]]; then + echo -ne '\e[1 q' + + elif [[ ${KEYMAP} == main ]] || + [[ ${KEYMAP} == viins ]] || + [[ ${KEYMAP} = '' ]] || + [[ $1 = 'beam' ]]; then + echo -ne '\e[6 q' + fi + } +zle -N zle-keymap-select + +_fix_cursor() { + echo -ne '\e[6 q' +} + +precmd_functions+=(_fix_cursor) # fzf -export FZF_DEFAULT_OPTS='--height 40% --preview="head {}" --layout=reverse --bind "enter:execute(vim {})" --bind "tab:down" --bind "btab:up"' +export FZF_DEFAULT_OPTS='--preview="head {}" --layout=reverse' # Allow local aliases if [ -f ~/.zshrc_local ]; then