From 3555b19be55d2ce4cfb17e4471e60dab7ee9ba37 Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Fri, 7 Dec 2018 18:20:08 -0500 Subject: [PATCH] Fixed i3 restart, setup vertical splits in Vim Also set EasyMotion prefix to single space. --- aliases/zsh_aliases | 3 ++- configs/i3/config | 16 +++++++++------- configs/ranger/rc.conf | 6 +++--- dotfiles/.Xresources | 4 ++-- dotfiles/.gitconfig | 4 ++-- dotfiles/.vimrc | 24 ++++++++++++------------ dotfiles/.zshrc | 1 + 7 files changed, 31 insertions(+), 27 deletions(-) diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index bd99b4c..7aff284 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -93,7 +93,7 @@ alias nbu="f /run/media/kevin/pc-backup/backups/nzxt && ll | grep gz" # }}} directory-related # # power options {{{ # -alias p="systemctl suspend" +alias su="systemctl suspend" alias sd="sudo shutdown 0" alias reb="sudo shutdown -r 0" alias lo="i3-msg exit" @@ -200,6 +200,7 @@ alias psi="pass insert -m" alias psg="pass generate -c" alias yh="echo 'kevin.mok@live.ca' | xclip -selection clipboard" alias yg="xclip -selection clipboard ~/.password-store/social/gmail" +alias yu="echo 'kevin.mok@mai.utoronto.ca' | xclip -selection clipboard" # python related {{{ # function grpy() { grep $1 *.py ; } diff --git a/configs/i3/config b/configs/i3/config index af30824..7ee9fbb 100644 --- a/configs/i3/config +++ b/configs/i3/config @@ -40,7 +40,7 @@ bindsym Mod4+p workspace $ws4; exec pgadmin3 bindsym Mod4+q exec qdirstat bindsym Mod4+r exec urxvt -e ranger # bindsym control+$mod+s exec systemctl suspend -bindsym control+$mod+p exec systemctl suspend +bindsym control+$mod+s exec systemctl suspend bindsym Mod4+t exec st bindsym Mod4+x exec $swex bindsym Print exec gscreenshot @@ -301,7 +301,7 @@ bindsym $mod+Shift+5 move container to workspace $ws15; workspace $ws15 bindsym $mod+Shift+s exec systemctl suspend # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) # bindsym $mod+control+r exec ~/.cache/wal/colors.sh; restart -bindsym $mod+control+r exec restart +bindsym $mod+control+r exec i3-msg restart # bindsym $mod+control+r exec $colors_sh && i3-msg restart # reload the configuration file @@ -325,6 +325,7 @@ bindsym $mod+control+l resize shrink width 3 px or 3 ppt # remove window titlebars for_window [class="^.*"] border pixel 3 +# for_window [class="^.*"] border pixel 1 set $inner_gaps 35 set $outer_gaps 0 @@ -395,8 +396,8 @@ set $bar_trans 00 set $benq_ws_trans aa bar { i3bar_command i3bar -t - # font pango:$sb_font 21 - font pango:$sb_font 14 + font pango:$sb_font 21 + # font pango:$sb_font 14 colors { # 0 (transparent) -> 255 (opaque) in hex background $black$bar_trans @@ -420,8 +421,8 @@ bar { bar { output $samsung - # font pango:$sb_font 25 - font pango:$sb_font 15 + font pango:$sb_font 25 + # font pango:$sb_font 15 # output $benq i3bar_command i3bar -t colors { @@ -461,7 +462,8 @@ set $mod Mod1 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. # font pango:Hack 11 -font pango:$sb_font 8 +# font pango:$sb_font 8 +font pango:$sb_font 11 # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). #font pango:DejaVu Sans Mono 8 diff --git a/configs/ranger/rc.conf b/configs/ranger/rc.conf index 6a270fe..4a1ba51 100644 --- a/configs/ranger/rc.conf +++ b/configs/ranger/rc.conf @@ -418,7 +418,8 @@ map yj eval fm.copy(dirarg=dict(down=1), narg=quantifier) map yk eval fm.copy(dirarg=dict(up=1), narg=quantifier) # Searching -map / console search%space +map gr console search%space +map / fzf_select map n search_next map N search_next forward=False map ct search_next order=tag @@ -679,5 +680,4 @@ map mb shell mv %f vibrant # bulk rename map cw eval fm.execute_console("bulkrename") if fm.thisdir.marked_items else fm.open_console("rename ") -map gr fzf_select -# map fzf_select +# map gr fzf_select diff --git a/dotfiles/.Xresources b/dotfiles/.Xresources index 0a46ef3..1272837 100644 --- a/dotfiles/.Xresources +++ b/dotfiles/.Xresources @@ -1,5 +1,5 @@ -! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14 -URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=9 +URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14 +! URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=9 ! URxvt.font: xft:Hack Nerd Font:size=14 ! URxvt.font: xft:Hack NF:size=18 diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig index 2541162..78f5e50 100644 --- a/dotfiles/.gitconfig +++ b/dotfiles/.gitconfig @@ -15,5 +15,5 @@ prompt = false [diff] tool = vimdiff -; [commit] - ; gpgsign = true +[commit] + gpgsign = true diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 7b35885..687d233 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -126,6 +126,7 @@ Plug 'tpope/vim-surround' " navigate around file easily and precisely Plug 'easymotion/vim-easymotion' + map (easymotion-prefix) " status bar displaying various info about the current buffer Plug 'vim-airline/vim-airline' @@ -154,7 +155,7 @@ Plug 'PotatoesMaster/i3-vim-syntax' " vim file explorer Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'terryma/vim-multiple-cursors' - let g:multi_cursor_select_all_word_key='' + " let g:multi_cursor_select_all_word_key='' call plug#end() @@ -166,9 +167,8 @@ colorscheme wal " Mappings {{{ " " function keys {{{ " -" map :wa -map :wqa -map :qa! +map :xa +map :q! " map :make -C ~/Documents/resume cv " map :AutoSaveToggle map :VimtexCompile:VimtexView @@ -200,8 +200,6 @@ nnoremap dg ggdG nnoremap D "+dd " delete entire buffer into system clipboard nnoremap DA "+ggdG -" reload file -nnoremap e :e " find merge conflicts nnoremap fc /[<>=\|]\{7\} " reload folds @@ -228,6 +226,8 @@ nnoremap plu :PlugUpdate nnoremap py :set tw=0 " replace in next x lines nnoremap r q:i.,.+s///gFsi +" reload file +nnoremap rf :e " replace in line nnoremap rl q:i.s///g " replace in visual selection @@ -240,19 +240,19 @@ nnoremap R q:i%s///g2F/i nnoremap so q:i.,.+sortFsi " set syntax to shell (for dotfiles) nnoremap sh :set syn=sh +" open vimrc in vertical split +nnoremap vv :vsp ~/.vimrc " format current line -nnoremap w Vgq +nnoremap ww Vgq " format this and next line -nnoremap ww Vjgq -" format current 3 lines -nnoremap www V2jgq -" toggle fold -nnoremap z za +nnoremap www Vjgq " copy next thing to system clipboard nnoremap y "+ nnoremap Y "+Y " yank entire buffer nnoremap yg ggyG +" toggle fold +nnoremap z za " }}} leader mappings " diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc index ec86db1..2824db3 100644 --- a/dotfiles/.zshrc +++ b/dotfiles/.zshrc @@ -106,6 +106,7 @@ source $ZSH/custom/antigen.zsh antigen bundle hlissner/zsh-autopair antigen bundle zsh-users/zsh-autosuggestions antigen bundle softmoth/zsh-vim-mode +antigen bundle desyncr/auto-ls antigen theme molovo/filthy antigen apply