From e916fc2103b6c3381a52167995b24033c1c30e97 Mon Sep 17 00:00:00 2001 From: Smirnov Alexandr Date: Sat, 20 Mar 2021 15:58:39 +0200 Subject: [PATCH] Update ranger --- config/bspwm/bspwmrc | 2 +- config/bspwm/polybar/bar.sh | 4 +- config/bspwm/polybar/polybar | 10 +- config/bspwm/sxhkd | 6 +- config/ranger/rc.conf | 467 ++--------------------------------- 5 files changed, 35 insertions(+), 454 deletions(-) diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 861fcaa..4a6ff2c 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -38,7 +38,7 @@ bspc rule -a kitty desktop='^1' focus=on follow=on bspc rule -a Google-chrome desktop='^2' focus=on follow=on bspc rule -a LibreWolf desktop='^2' focus=on follow=on bspc rule -a Code desktop='^3' focus=on follow=on -bspc rule -a '*:nvim' desktop='^4' focus=on follow=off +bspc rule -a '*:nvim' desktop='^3' focus=on follow=off bspc rule -a Todoist desktop='^4' focus=on follow=off bspc rule -a Joplin desktop='^4' focus=on follow=on bspc rule -a Simplenote desktop='^4' focus=on follow=on diff --git a/config/bspwm/polybar/bar.sh b/config/bspwm/polybar/bar.sh index 0aebcb0..d2ea137 100755 --- a/config/bspwm/polybar/bar.sh +++ b/config/bspwm/polybar/bar.sh @@ -1,5 +1,5 @@ #!/bin/bash killall -q polybar while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -#polybar -c ~/.config/bspwm/polybar/polybar min& -polybar -c ~/.config/bspwm/polybar/polybar bar& +polybar -c ~/.config/bspwm/polybar/polybar min& +#polybar -c ~/.config/bspwm/polybar/polybar bar& diff --git a/config/bspwm/polybar/polybar b/config/bspwm/polybar/polybar index be95781..eca9930 100644 --- a/config/bspwm/polybar/polybar +++ b/config/bspwm/polybar/polybar @@ -3,8 +3,8 @@ [settings] enable-ipc = true format-padding = 1 -;screenchange-reload = true -;pseudo-transparency = true +screenchange-reload = true +pseudo-transparency = true [colors] background = #262A2B @@ -38,7 +38,7 @@ override-redirect = true font-0 = Iosevka Nerd Font:style=Medium:size=8;3 font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5 modules-left = bspwm -modules-right = keyboard pulseaudio wifi-signal time +modules-right = keyboard pulseaudio time wifi-signal tray-position = right [module/bspwm] @@ -77,6 +77,7 @@ interval = 60 [module/archupd] type = custom/script exec = ~/.config/bspwm/polybar/scripts/updates-pacman-aur.sh +click-left = kitty -e ~/bin/arch-upd interval = 60 [module/wifi-signal] @@ -87,8 +88,7 @@ interval = 3 [module/keyboard] type = internal/xkeyboard -format-prefix = "" -label-layout = %layout% +label-layout =  %layout% blacklist-0 = num lock blacklist-1 = scroll lock blacklist-2= caps lock diff --git a/config/bspwm/sxhkd b/config/bspwm/sxhkd index 5dd9b65..1d27fb0 100644 --- a/config/bspwm/sxhkd +++ b/config/bspwm/sxhkd @@ -3,8 +3,7 @@ ## == USER keys super + {_,shift} Return - {kitty, \ - rofi -show drun -theme ntenV2} + {kitty, rofi -show drun -theme ntenV2} super + shift + {w, e, f, c, t, q} {google-chrome-stable, \ @@ -29,8 +28,7 @@ super + q bspc node -c super + control + r - bspc wm -r && \ - sxhkd -c ~/.config/bspwm/sxhkd + bspc wm -r; sxhkd -c ~/.config/bspwm/sxhkd ### == BSPWM windows ## Resize window diff --git a/config/ranger/rc.conf b/config/ranger/rc.conf index dfc5004..63d4242 100644 --- a/config/ranger/rc.conf +++ b/config/ranger/rc.conf @@ -1,450 +1,33 @@ -############ -### Options -############ - -### Appearance +#== Appearance set colorscheme solarized -set viewmode miller -set column_ratios 1,3,4 -set hidden_filter ^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$|.DS_Store$|.directory -set show_hidden false -set confirm_on_delete always -set use_preview_script true +set confirm_on_delete always set automatically_count_files false -set open_all_images true -set status_bar_on_top false -### Versin control system -set vcs_aware true -set vcs_backend_git enabled -set vcs_backend_hg disabled -set vcs_backend_bzr disabled -set vcs_backend_svn disabled -set vcs_msg_length 30 - -### Preview -set preview_images true -#set preview_images_method kitty -set preview_images_method ueberzug - -set unicode_ellipsis false -set bidi_support false -set show_hidden_bookmarks true -set preview_files true -set preview_directories true -set collapse_preview true -set wrap_plaintext_previews false -set draw_progress_bar_in_status_bar true -set draw_borders none -set dirname_in_tabs false -set mouse_enabled true -set display_size_in_main_column true -set display_size_in_status_bar true -set display_free_space_in_status_bar false -set display_tags_in_all_columns true -set update_title false -set update_tmux_title false -set shorten_title 3 -set hostname_in_titlebar false +#== General +set update_tmux_title false set tilde_in_titlebar true -### History -set max_history_size 20 -set max_console_history_size 50 +#== Git integration +set vcs_aware true +set vcs_backend_git enabled +set vcs_msg_length 30 + +#== Image preview +set preview_images true +set preview_images_method ueberzug + +#== History +set max_console_history_size 20 set save_console_history false set scroll_offset 4 -set flushinput true -set padding_right true -set autosave_bookmarks true -set save_backtick_bookmark true -set autoupdate_cumulative_size false -set show_cursor false -set sort natural -set sort_reverse false -set sort_case_insensitive true -set sort_directories_first true -set sort_unicode false -set xterm_alt_key false -set cd_bookmarks true -set cd_tab_case sensitive -set cd_tab_fuzzy false -set preview_max_size 0 -set hint_collapse_threshold 10 -set show_selection_in_titlebar true -set idle_delay 2000 -set metadata_deep_search false -set clear_filters_on_dir_change false -set line_numbers false -set relative_current_zero false -set one_indexed false -set save_tabs_on_exit false -set wrap_scroll false -set global_inode_type_filter -set freeze_files false -set size_in_bytes false -set nested_ranger_warning true -################################# -# Command Aliases in the Console -################################# - -map E edit -alias e edit - -# "a" key -map a rename_append -map A eval fm.open_console('rename ' + fm.thisfile.relative_path.replace("%", "%%")) - -# "s" key -map sa shell zip -r file.zip %s -map ss shell tar -czvf file.tar.gz %s -map sd shell 7z a file.7z %s -map se shell extract %s - -# "q"/quit keys/alias -map Q quitall -alias qa quitall -map q quit -alias q quit -alias q! quit! -map abort - -# scout alias -alias filter scout -prts -alias find scout -aets -alias mark scout -mr -alias unmark scout -Mr -alias search scout -rs -alias search_inc scout -rts -alias travel scout -aefklst - -# Restart/reload fm -map R reload_cwd -map reset - -# Modes -map ~ set viewmode! -map redraw_window -map change_mode normal -map ? help - -# Go keys -map gh cd ~ -map gc cd ~/code -map gd cd ~/Documents -map gb cd ~/Documents/books -map gm cd ~/.dotfiles -map gn cd ~/bin -map gs cd ~/.script -map gv cd /media/veracrypt1 -map gw cd ~/Downloads - -# Console -map : console -map ! console shell%space -map @ shell $SHELL -map r chain draw_possible_programs; console open_with%space -map f console find%space -map cd console cd%space - -# Linemode -map Mf linemode filename -map Mi linemode fileinfo -map Mm linemode mtime -map Mh linemode humanreadablemtime -map Mp linemode permissions -map Ms linemode sizemtime -map MH linemode sizehumanreadablemtime -map Mt linemode metatitle - -# Visual mode -map mark_files toggle=True -map v mark_files all=True toggle=True -map uv mark_files all=True val=False -map V toggle_visual_mode -map uV toggle_visual_mode reverse=True - -# Tab keys -map tab_new -map tab_close -map tab_move 1 -map tab_move -1 -map tab_move 1 -map tab_move -1 -map tt tab_new -map ty tab_close -map tv tag_toggle -map uv tag_remove -map " tag_toggle tag=%any -map uq tab_restore -map tab_open 1 -map tab_open 2 -map tab_open 3 -map tab_open 4 -map tab_open 5 -map tab_open 6 -map tab_open 7 -map tab_open 8 -map tab_open 9 -map tab_shift 1 -map tab_shift -1 - -# Other keys -map move up=1 -map move down=1 -map move left=1 -map move right=1 -map move to=0 -map move to=-1 -map move down=1 pages=True -map move up=1 pages=True -map move right=1 -map console delete -map console touch%space -copymap k -copymap j -copymap h -copymap l -copymap gg -copymap G -copymap -copymap -map J move down=0.5 pages=True -map K move up=0.5 pages=True -copymap J -copymap K -map H history_go -1 -map L history_go 1 -map ] move_parent 1 -map [ move_parent -1 -map } traverse -map { traverse_backwards -map ) jump_non - - -# File keys -map dD shell mv %s /home/${USER}/.local/share/Trash/files/ -map dd cut -map ud uncut -map da cut mode=add -map dr cut mode=remove -map dt cut mode=toggle -map pp paste -map po paste overwrite=True -map pP paste append=True -map pO paste overwrite=True append=True -map pl paste_symlink relative=False -map pL paste_symlink relative=True -map phl paste_hardlink -map pht paste_hardlinked_subtree -map pd console paste dest= -map p` paste dest=%any_path -map p' paste dest=%any_path -map yy copy -map uy uncut -map ya copy mode=add -map yr copy mode=remove -map yt copy mode=toggle - -map dgg eval fm.cut(dirarg=dict(to=0), narg=quantifier) -map dG eval fm.cut(dirarg=dict(to=-1), narg=quantifier) -map dj eval fm.cut(dirarg=dict(down=1), narg=quantifier) -map dk eval fm.cut(dirarg=dict(up=1), narg=quantifier) -map ygg eval fm.copy(dirarg=dict(to=0), narg=quantifier) -map yG eval fm.copy(dirarg=dict(to=-1), narg=quantifier) -map yj eval fm.copy(dirarg=dict(down=1), narg=quantifier) -map yk eval fm.copy(dirarg=dict(up=1), narg=quantifier) - -# Search keys -map / console search%space -map n search_next -map N search_next forward=False -map ct search_next order=tag -map cs search_next order=size -map ci search_next order=mimetype -map cc search_next order=ctime -map cm search_next order=mtime -map ca search_next order=atime - -map or set sort_reverse! -map oz set sort=random -map os chain set sort=size; set sort_reverse=False -map ob chain set sort=basename; set sort_reverse=False -map on chain set sort=natural; set sort_reverse=False -map om chain set sort=mtime; set sort_reverse=False -map oc chain set sort=ctime; set sort_reverse=False -map oa chain set sort=atime; set sort_reverse=False -map ot chain set sort=type; set sort_reverse=False -map oe chain set sort=extension; set sort_reverse=False - -map oS chain set sort=size; set sort_reverse=True -map oB chain set sort=basename; set sort_reverse=True -map oN chain set sort=natural; set sort_reverse=True -map oM chain set sort=mtime; set sort_reverse=True -map oC chain set sort=ctime; set sort_reverse=True -map oA chain set sort=atime; set sort_reverse=True -map oT chain set sort=type; set sort_reverse=True -map oE chain set sort=extension; set sort_reverse=True - -map dc get_cumulative_size - -map zc set collapse_preview! -map zd set sort_directories_first! -map zh set show_hidden! -map set show_hidden! -copymap -copymap -map zI set flushinput! -map zi set preview_images! -map zm set mouse_enabled! -map zp set preview_files! -map zP set preview_directories! -map zs set sort_case_insensitive! -map zu set autoupdate_cumulative_size! -map zv set use_preview_script! -map zf console filter%space -copymap zf zz - -map .d filter_stack add type d -map .f filter_stack add type f -map .l filter_stack add type l -map .m console filter_stack add mime%space -map .n console filter_stack add name%space -map .# console filter_stack add hash%space -map ." filter_stack add duplicate -map .' filter_stack add unique -map .| filter_stack add or -map .& filter_stack add and -map .! filter_stack add not -map .r filter_stack rotate -map .c filter_stack clear -map .* filter_stack decompose -map .p filter_stack pop -map .. filter_stack show - -map ` enter_bookmark %any -map ' enter_bookmark %any -map m set_bookmark %any -map um unset_bookmark %any - -map m draw_bookmarks -copymap m um ` ' - -eval for arg in "rwxXst": cmd("map +u{0} shell -f chmod u+{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map +g{0} shell -f chmod g+{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map +o{0} shell -f chmod o+{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map +a{0} shell -f chmod a+{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map +{0} shell -f chmod u+{0} %s".format(arg)) - -eval for arg in "rwxXst": cmd("map -u{0} shell -f chmod u-{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map -g{0} shell -f chmod g-{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map -o{0} shell -f chmod o-{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map -a{0} shell -f chmod a-{0} %s".format(arg)) -eval for arg in "rwxXst": cmd("map -{0} shell -f chmod u-{0} %s".format(arg)) - -################################ -### Define keys for the console -################################ -cmap eval fm.ui.console.tab() -cmap eval fm.ui.console.tab(-1) -cmap eval fm.ui.console.close() -cmap eval fm.ui.console.execute() -cmap redraw_window - -copycmap -copycmap - -cmap eval fm.ui.console.history_move(-1) -cmap eval fm.ui.console.history_move(1) -cmap eval fm.ui.console.move(left=1) -cmap eval fm.ui.console.move(right=1) -cmap eval fm.ui.console.move(right=0, absolute=True) -cmap eval fm.ui.console.move(right=-1, absolute=True) -cmap eval fm.ui.console.move_word(left=1) -cmap eval fm.ui.console.move_word(right=1) - -copycmap -copycmap - -cmap eval fm.ui.console.delete(-1) -cmap eval fm.ui.console.delete(0) -cmap eval fm.ui.console.delete_word() -cmap eval fm.ui.console.delete_word(backward=False) -cmap eval fm.ui.console.delete_rest(1) -cmap eval fm.ui.console.delete_rest(-1) -cmap eval fm.ui.console.paste() - -copycmap -copycmap -copycmap -copycmap -copycmap -copycmap -copycmap -copycmap -copycmap - -copycmap - -cmap false - -###################### -### Pager Keybindings -###################### -pmap pager_move down=1 -pmap pager_move up=1 -pmap pager_move left=4 -pmap pager_move right=4 -pmap pager_move to=0 -pmap pager_move to=-1 -pmap pager_move down=1.0 pages=True -pmap pager_move up=1.0 pages=True -pmap pager_move down=0.5 pages=True -pmap pager_move up=0.5 pages=True - -copypmap k -copypmap j -copypmap h -copypmap l -copypmap g -copypmap G -copypmap d -copypmap u -copypmap n f -copypmap p b - -pmap redraw_window -pmap pager_close -copypmap q Q i -pmap E edit_file - -######################### -### Taskview Keybindings -######################### -tmap taskview_move up=1 -tmap taskview_move down=1 -tmap taskview_move to=0 -tmap taskview_move to=-1 -tmap taskview_move down=1.0 pages=True -tmap taskview_move up=1.0 pages=True -tmap taskview_move down=0.5 pages=True -tmap taskview_move up=0.5 pages=True - -copytmap k -copytmap j -copytmap g -copytmap G -copytmap u -copytmap n f -copytmap p b - -tmap J eval -q fm.ui.taskview.task_move(-1) -tmap K eval -q fm.ui.taskview.task_move(0) -tmap dd eval -q fm.ui.taskview.task_remove() -tmap eval -q fm.ui.taskview.task_move(-1) -tmap eval -q fm.ui.taskview.task_move(0) -tmap eval -q fm.ui.taskview.task_remove() - -tmap redraw_window -tmap taskview_close -copytmap q Q w +#== Mappings +map gc cd ~/code +map gd cd ~/Documents +map gw cd ~/Downloads +map g. cd ~/.dotfiles +map @ shell $SHELL +map dD delete +map dT trash +map tab_shift 1 +map tab_shift -1