summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/compton.conf7
-rwxr-xr-x.config/feh/keys12
-rw-r--r--.config/i3/config6
-rw-r--r--.config/ranger/rc.conf22
-rwxr-xr-x.config/sxiv/exec/key-handler8
-rwxr-xr-x.scripts/tools/ifinstalled3
-rwxr-xr-x.scripts/tools/setbg3
7 files changed, 14 insertions, 47 deletions
diff --git a/.config/compton.conf b/.config/compton.conf
deleted file mode 100644
index 949bcae..0000000
--- a/.config/compton.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# vim: filetype=conf
-backend = "glx"
-paint-on-overlay = true;
-glx-no-stencil = true;
-glx-no-rebind-pixmap = true;
-vsync = "opengl-swc";
-unredir-if-possible = false;
diff --git a/.config/feh/keys b/.config/feh/keys
deleted file mode 100755
index b5e3872..0000000
--- a/.config/feh/keys
+++ /dev/null
@@ -1,12 +0,0 @@
-zoom_in K XF86Forward
-zoom_out J XF86Back
-next_img L space
-prev_img BackSpace H
-
-scroll_up k Up
-scroll_down j Down
-scroll_right l Right
-scroll_left h Left
-
-toggle_fullscreen f
-save_filelist F
diff --git a/.config/i3/config b/.config/i3/config
index b087d17..c30ef9a 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -137,7 +137,7 @@ bindsym $mod+Shift+w exec --no-startup-id $BROWSER
bindsym $mod+e exec $term -e neomutt && pkill -RTMIN+12 i3blocks
bindsym $mod+Shift+e exec --no-startup-id tutorialvids
-bindsym $mod+r exec $term -e ranger
+bindsym $mod+r exec $term -e $FILE
bindsym $mod+Shift+r exec --no-startup-id winresize
bindsym $mod+t split toggle
@@ -195,10 +195,10 @@ bindsym $mod+Shift+z gaps outer current minus 5
bindsym $mod+x exec --no-startup-id lockscreen
bindsym $mod+Shift+x exec --no-startup-id prompt "Shutdown computer?" "$shutdown"
-#bindsym $mod+c
+bindsym $mod+c exec --no-startup-id freealf
bindsym $mod+Shift+c exec --no-startup-id camtoggle
-#bindsym $mod+v
+bindsym $mod+v exec --no-startup-id st -e vim -c "VimwikiIndex"
#bindsym $mod+Shift+v
bindsym $mod+b bar mode toggle
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index ecd7373..d15a98c 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -24,8 +24,8 @@ set collapse_preview true
set save_console_history false
set status_bar_on_top false
set draw_progress_bar_in_status_bar true
-set draw_borders false
-set dirname_in_tabs false
+set draw_borders true
+set dirname_in_tabs true
set mouse_enabled true
set display_size_in_main_column true
set display_size_in_status_bar true
@@ -54,7 +54,6 @@ set show_selection_in_titlebar true
set idle_delay 2000
set metadata_deep_search false
-
###ALIASES###
alias e edit
alias q quit
@@ -71,7 +70,6 @@ alias search scout -rs
alias search_inc scout -rts
alias travel scout -aefiklst
-
###BASIC KEYS###
#BASIC
@@ -101,7 +99,6 @@ map r chain draw_possible_programs; console open_with%%space
map f console find%space
map cd console cd%space
-
# Change the line mode
#map Mf linemode filename
#map Mi linemode fileinfo
@@ -120,8 +117,6 @@ map cd console cd%space
#map Mo shell mocp -j 0%%
#map MK shell killall mocp
-
-
# Tagging / Marking
map at tag_toggle
map ut tag_remove
@@ -132,8 +127,6 @@ map uv mark_files all=True val=False
map vs toggle_visual_mode
map uV toggle_visual_mode reverse=True
-
-
# For the nostalgics: Midnight Commander bindings
map <F1> help
map <F3> display_file
@@ -145,7 +138,6 @@ map <F7> console mkdir%space
map <F8> console delete
map <F10> exit
-
# In case you work on a keyboard with dvorak layout
map <UP> move up=1
map <DOWN> move down=1
@@ -159,7 +151,6 @@ map <CR> move right=1
map <DELETE> console delete
map <INSERT> console touch%space
-
# VIM-like
copymap <UP> k
copymap <DOWN> j
@@ -175,7 +166,6 @@ map K move up=0.5 pages=True
copymap J <C-D>
copymap K <C-U>
-
# Jumping around
map H history_go -1
map L history_go 1
@@ -468,7 +458,7 @@ map mkd console mkdir%space
map sc console shell ln -sT%space
map D console delete
map X shell extract %f
-map Z shell tar -cvzf %f.tar.gz %f
+map Z shell tar -cvzf %f.tar.gz %s
map <C-f> fzf_select
map <C-l> fzf_locate
@@ -484,8 +474,8 @@ map Txs console shell cp ~/Documents/LaTeX/beamer.tex%space
map Txh console shell cp ~/Documents/LaTeX/handout.tex%space
#Image commands
-map bg shell cp %f ~/.config/wall.png && feh --bg-scale %f
-map bw shell wal -c -i %f && cp %f ~/.config/wall.png
+map bg shell setbg %f
+map bw shell wal -i %f && cp %f ~/.config/wall.png
map C shell killall w3mimgdisplay && convert -rotate 90 %s %s
map F shell killall w3mimgdisplay && convert -flop %s %s
map bl shell killall w3mimgdisplay && convert %s -resize 1440x1080\> bl_%s
@@ -515,6 +505,4 @@ map Tn eval fm.open_console('shell eyeD3 -n "" ' + fm.thisfile.relative_path, po
#Downloading
map ytv console shell youtube-dl -ic%space
map yta console shell youtube-dl -xic%space
-
-# Source shortcuts
source ~/.config/ranger/shortcuts.conf
diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler
index b457dd1..71aab4b 100755
--- a/.config/sxiv/exec/key-handler
+++ b/.config/sxiv/exec/key-handler
@@ -2,10 +2,7 @@
while read file
do
case "$1" in
- "w")
- cp "$file" ~/.config/wall.png &&
- setbg
- notify-send -i "$HOME/.config/wall.png" "Wallpaper changed." ;;
+ "w") setbg "$file" & ;;
"c")
[ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ~/.bmdirs | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")"
[ -z "$destdir" ] && exit
@@ -30,7 +27,6 @@ do
notify-send "$(readlink -f "$file") copied to clipboard" & ;;
"d")
[ "$(printf "No\\nYes" | dmenu -i -p "Really delete $file?")" = "Yes" ] && rm "$file" && notify-send "$file deleted." ;;
- "G")
- gimp "$file" & ;;
+ "g") ifinstalled gimp && gimp "$file" & ;;
esac
done
diff --git a/.scripts/tools/ifinstalled b/.scripts/tools/ifinstalled
new file mode 100755
index 0000000..bdbcbc4
--- /dev/null
+++ b/.scripts/tools/ifinstalled
@@ -0,0 +1,3 @@
+#!/bin/sh
+# If $1 command is not available, error code and notify.
+command -v "$1" >/dev/null || { notify-send "$1 is not installed." && exit 1 ;}
diff --git a/.scripts/tools/setbg b/.scripts/tools/setbg
index c003b1a..6ffd21d 100755
--- a/.scripts/tools/setbg
+++ b/.scripts/tools/setbg
@@ -1,4 +1,3 @@
#!/bin/sh
# Sets the background. Many scripts need to do this, but I've put it here so you can easily change all their actions.
-#setroot -z ~/.config/wall.png # with setroot
-feh --bg-scale "$HOME/.config/wall.png" # feh
+xwallpaper --center ~/.config/wall.png