diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index 2b02934..750e3ed 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -49,6 +49,7 @@ alias mkpk="makepkg -sri" alias mkex="chmod 777" alias udm="udisksctl mount -b" alias udu="udisksctl unmount -b" +alias udub="udisksctl unmount -b /dev/sdc2" alias mkex="chmod 777" alias ctle="systemctl enable" alias ctls="systemctl start" @@ -119,7 +120,8 @@ alias vlh="alsamixer -c 2" alias pc="sudo pacman -S" alias pcr="sudo pacman -Rs" alias spc="pacman -Qqe > ~/linux-config/txt/pacman-pkgs/pacman-pkgs.txt" -alias tri="trizen -S --noconfirm" +# alias tri="trizen -S --noconfirm" +alias tri="trizen -S" # }}} system # @@ -142,8 +144,8 @@ function vsnp() { ni ~/.vim/plugged/vim-snippets/UltiSnips/"$1".snippets ; } # applications {{{ # silent="> /dev/null 2>&1& " -alias h="htop -s PERCENT_CPU" -alias hm="htop -s PERCENT_MEM" +alias h="htop -s PERCENT_MEM" +alias hc="htop -s PERCENT_CPU" alias r="ranger" alias mr="man ranger" alias clc="cloc ." diff --git a/configs/i3/config b/configs/i3/config index 34e6ee7..bc3d716 100644 --- a/configs/i3/config +++ b/configs/i3/config @@ -215,7 +215,7 @@ bindsym $mod+F7 workspace $ws7; exec $def_term set $ws8 "8 " # assign [class="jetbrains-"] $ws8 workspace $ws8 output $samsung -bindsym $mod+F8 workspace $ws8; exec urxvt -e htop -s PERCENT_CPU +bindsym $mod+F8 workspace $ws8; exec urxvt -e htop -s PERCENT_MEM set $ws9 "9 " workspace $ws9 output $samsung @@ -347,16 +347,33 @@ set $sb_font Hack NF Bold set $black #000000 set $white #ffffff -set $inactive_ws_bg #444c52 +# inactive vars {{{ # + # set $inactive_ws_bg $white +set $inactive_ws_bg #444c52 # set $inactive_ws_text #bcccd7 -set $inactive_ws_text #838e96 +# set $inactive_ws_text #838e96 +set $inactive_ws_text #cbe4ff + # set $inactive_ws_trans c8 -set $inactive_ws_trans 96 +# set $inactive_ws_trans 96 +set $inactive_ws_trans 00 + +# }}} inactive # + +# active vars {{{ # + +set $active_ws_bg #444c52 +# set $active_ws_bg #566066 + +# set $active_ws_trans c8 +set $active_ws_trans 91 + +# }}} active # -# set $active_ws_text $white -set $active_ws_text #ffffff +# set $focused_ws_text $white +set $focused_ws_text #ffffff # benq bar {{{ # @@ -370,7 +387,9 @@ bar { # 0 (transparent) -> 255 (opaque) in hex background $black$bar_trans # border, bg, text color - focused_workspace $inactive_ws_bg $bg $active_ws_text + focused_workspace $inactive_ws_bg $bg $focused_ws_text + # active = focused on other screen + active_workspace $inactive_ws_bg $active_ws_bg$active_ws_trans $focused_ws_text inactive_workspace $inactive_ws_bg $inactive_ws_bg$inactive_ws_trans $inactive_ws_text } tray_output none @@ -392,7 +411,8 @@ bar { colors { background $black$bar_trans # border, bg, text color - focused_workspace $inactive_ws_bg $bg $active_ws_text + focused_workspace $inactive_ws_bg $bg $focused_ws_text + active_workspace $inactive_ws_bg $active_ws_bg$active_ws_trans $focused_ws_text inactive_workspace $inactive_ws_bg $inactive_ws_bg$inactive_ws_trans $inactive_ws_text } status_command i3blocks -c ~/.config/sam-i3blocks/sam-i3blocks.conf diff --git a/configs/ranger/rc.conf b/configs/ranger/rc.conf index 1751331..347baee 100644 --- a/configs/ranger/rc.conf +++ b/configs/ranger/rc.conf @@ -34,7 +34,7 @@ set column_ratios 1,3,4 set hidden_filter ^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$ # Show hidden files? You can toggle this by typing 'zh' -set show_hidden false +set show_hidden true # Ask for a confirmation when running the "delete" command? # Valid values are "always", "never", "multiple" (default) diff --git a/configs/ranger/rifle.conf b/configs/ranger/rifle.conf index e2653a7..5bd7387 100644 --- a/configs/ranger/rifle.conf +++ b/configs/ranger/rifle.conf @@ -140,6 +140,7 @@ mime ^video, terminal, !X, has mplayer = mplayer -- "$@" #------------------------------------------- # Documents #------------------------------------------- +ext pdf = ask ext pdf, has llpp, X, flag f = llpp "$@" ext pdf, has zathura, X, flag f = zathura -- "$@" ext pdf, has mupdf, X, flag f = mupdf "$@" diff --git a/dotfiles/Xresources b/dotfiles/Xresources index 54cc434..1de7364 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -1,3 +1,4 @@ +! URxvt.font: xft:DejaVu Sans Mono:size=14 URxvt.font: xft:Hack Nerd Font:size=14 ! URxvt.font: xft:Hack NF:size=18 ! URxvt.font: xft:Hack:size=18 diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 3d250c8..dc6af0a 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -12,3 +12,5 @@ conflictstyle = diff3 [mergetool] prompt = false +[diff] + tool = vimdiff diff --git a/dotfiles/vimrc b/dotfiles/vimrc index 7220ff9..2f13088 100644 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -38,9 +38,10 @@ autocmd BufNewFile,BufRead *.md set filetype=markdown autocmd Filetype markdown set textwidth=0 autocmd BufWritePost key_*.txt !bash ~/linux-config/scripts/shortcuts.sh +" auto-reload vimrc when saved augroup myvimrc - au! - au BufWritePost .vimrc,_vimrc,vimrc,.gvimrc,_gvimrc,gvimrc so $MYVIMRC | if has('gui_running') | so $MYGVIMRC | endif + au! + au BufWritePost .vimrc,_vimrc,vimrc,.gvimrc,_gvimrc,gvimrc so $MYVIMRC | if has('gui_running') | so $MYGVIMRC | endif augroup END " }}} commands for file types " @@ -118,8 +119,9 @@ Plug 'easymotion/vim-easymotion' " status bar displaying various info about the current buffer Plug 'vim-airline/vim-airline' - let g:airline_section_c = '%F' + " let g:airline_section_c = '%F' Plug 'vim-airline/vim-airline-themes' + let g:airline_powerline_fonts = 1 " continue Markdown lists when started Plug 'dkarter/bullets.vim' diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 738f107..bc197f4 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,5 +1,6 @@ -# ZSH_THEME="miloshadzic" ZSH_THEME="bira" +# ZSH_THEME="miloshadzic" +# ZSH_THEME="agnoster" # default {{{ # diff --git a/txt/key_dirs.txt b/txt/key_dirs.txt index a0f9d9b..8bddc74 100644 --- a/txt/key_dirs.txt +++ b/txt/key_dirs.txt @@ -1,6 +1,8 @@ # sys {{{ * bg /home/kevin/Pictures/Backgrounds +co /home/kevin/.config +lc /home/kevin/linux-config/ d /home/kevin/Downloads D /home/kevin/Documents ho /home/kevin/