diff --git a/.config/aliasrc b/.config/aliasrc index b436336..0823da9 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -40,3 +40,6 @@ alias synced-repos-status=' ' alias rm='rm -I --one-file-system -v' + +alias vim-grep='function _vim-grep(){ vim $(grep $@) }; _vim-grep' +alias vim-find='function _vim-find(){ vim $(find $@) }; _vim-find' diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 792e26c..005c0c7 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -32,9 +32,12 @@ bspc config automatic_scheme alternate bspc config external_rules_command "$HOME/.config/bspwm/external_rules" bspc rule -a 'firefox' desktop='web' + bspc rule -a 'firefox:Toolkit' follow='true' desktop='side-view' state='fullscreen' bspc rule -a 'vlc' follow='true' desktop='side-view' state='fullscreen' bspc rule -a 'MPlayer' follow='true' desktop='side-view' state='fullscreen' +bspc rule -a 'mpv:gl' follow='true' desktop='side-view' state='fullscreen' + bspc rule -a 'TeamSpeak 3' desktop='voip' locked='true' bspc rule -a 'Alacritty:mail' desktop='voip' locked='true' bspc rule -a 'Element' desktop='voip' locked='true' diff --git a/.config/git/config b/.config/git/config index 4d15c4d..6ae6e3f 100644 --- a/.config/git/config +++ b/.config/git/config @@ -14,6 +14,8 @@ [difftool] prompt = false [alias] + ci = commit -v + cia = commit -v --amend dt = difftool d = diff b = branch -vv diff --git a/.config/polybar/custom.ini b/.config/polybar/custom.ini index aca64ef..8910938 100644 --- a/.config/polybar/custom.ini +++ b/.config/polybar/custom.ini @@ -20,6 +20,6 @@ format-underline = #1794D1 format = <label> - click-left = alacritty -e sh -c "$HOME/.local/bin/archlinux-admin-update; read" & + click-left = alacritty -e sh -c "$HOME/.local/bin/archlinux-admin-update; $HOME/.local/bin/archlinux-check-updates > $HOME/.cache/archlinux-updates.txt; read" & label = %output% diff --git a/.config/rofi/config b/.config/rofi/config deleted file mode 100644 index c749e05..0000000 --- a/.config/rofi/config +++ /dev/null @@ -1,10 +0,0 @@ -rofi.combi-modi: drun,ssh,run -rofi.font: hack 10 -rofi.modi: combi,ssh,run,window -rofi.theme: /usr/share/rofi/themes/Arc-Dark.rasi - -rofi.ssh-command: {terminal} -e bash -ic "ssh {host} [-p {port}];" - -rofi.show-icons: true -rofi.icon-theme: "Papirus-Dark" -rofi.drun-display-format: "{name}" diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi new file mode 100644 index 0000000..88df91a --- /dev/null +++ b/.config/rofi/config.rasi @@ -0,0 +1,10 @@ +configuration { + modi: "combi,ssh,run,window"; + font: "hack 10"; + show-icons: true; + ssh-command: "{terminal} -e bash -ic "ssh {host} [-p {port}]""; + icon-theme: ""Papirus-Dark""; + drun-display-format: ""{name}""; + combi-modi: "drun,ssh,run"; + theme: "/usr/share/rofi/themes/Arc-Dark.rasi"; +} diff --git a/.config/vim/vimrc b/.config/vim/vimrc index eb9f039..f06b6d9 100644 --- a/.config/vim/vimrc +++ b/.config/vim/vimrc @@ -25,7 +25,7 @@ set nowrap set wildmode=longest,list,full -autocmd FileType yaml setlocal ai ts=2 sw=2 et cuc nu +autocmd FileType yaml setlocal ai tabstop=2 shiftwidth=2 expandtab cuc nu runtime ftplugin/man.vim set keywordprg=:Man @@ -52,6 +52,7 @@ call plug#begin('~/.config/vim/plugged') Plug 'vim-scripts/DoxygenToolkit.vim' Plug 'drmikehenry/vim-headerguard' Plug 'cespare/vim-toml' + Plug 'posva/vim-vue' call plug#end() map <leader>m :Magit<CR> diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 8e7b642..7db803d 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -50,6 +50,7 @@ autoload edit-command-line; zle -N edit-command-line bindkey '^e' edit-command-line [ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc +[ -x "$(command -v thefuck)" ] && eval $(thefuck --alias) # Load zsh-syntax-highlighting; should be last. source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null