13 files changed, 45 insertions, 57 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 287c4ca..aa57970 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -11,8 +11,7 @@ font pango: Font Awesome 8
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec --no-startup-id st # -f "Liberation Mono:size=10" 
-#bindsym $mod+Return exec --no-startup-id xfce4-terminal -T "term" --font "Liberation Mono 10" 
+bindsym $mod+Return exec --no-startup-id st 
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -57,7 +56,7 @@ bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
-#bindsym $mod+x move workspace to output right
+bindsym $mod+x move workspace to output right
 
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
@@ -171,7 +170,7 @@ set $volumestep 5
 bindsym XF86AudioRaiseVolume exec --no-startup-id $volumepath/volume -n -t $statuscmd -u $statussig up $volumestep
 bindsym XF86AudioLowerVolume exec --no-startup-id $volumepath/volume -n -t $statuscmd -u $statussig down $volumestep
 bindsym XF86AudioMute        exec --no-startup-id $volumepath/volume -n -t $statuscmd -u $statussig mute
-
+####################################################################################
 
 # screen brightness controls
 bindsym XF86MonBrightnessUp         exec xbacklight -inc 5
@@ -274,16 +273,8 @@ for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Require
 for_window [title="^Steam Keyboard$"] floating enable
 
 ############## AUTOSTART ##########################################################################
-# daemons/tray/etc
-exec --no-startup-id nm-applet
-exec --no-startup-id syncthing
-exec --no-startup-id xfce4-power-manager
-exec --no-startup-id protonmail-bridge --no-window
-exec --no-startup-id redshift -l40:2 
 #workspace 2
-#exec --no-startup-id xfce4-terminal --font "Liberation Mono 10" --command nnn
-# workspace 6
-exec --no-startup-id qbittorrent
+#exec --no-startup-id st -e nnn
 # workspace 7
 exec --no-startup-id teamviewer 
 exec --no-startup-id virt-manager
@@ -293,31 +284,35 @@ exec --no-startup-id keepassxc
 #workspace 9
 exec --no-startup-id thunderbird 
 # workspace 10
+exec --no-startup-id signal-desktop
 exec --no-startup-id telegram-desktop
-exec --no-startup-id discord
 
 # keyboard layout toggle
-exec_always --no-startup-id "setxkbmap -model pc105 -layout fr,ru -variant us, -option grp:ctrl_shift_toggle lv3:alt_switch"
+exec_always --no-startup-id "/usr/bin/setxkbmap -model pc105 -layout fr,ru -variant us, -option grp:ctrl_shift_toggle lv3:alt_switch"
 
-exec_always --no-startup-id "~/.local/bin/remaps"
+# keyboard repeat rate and remappings
 # external keyboard Alt_R may be mapped to Multi_Key instead of ISO_Level3_Shift, which breaks French QWERTY layout
-#exec_always --no-startup-id xmodmap -e "keycode 64 = Alt_L"
-#exec_always --no-startup-id xmodmap -e "keycode 64 = ISO_Level3_Shift"
-#exec_always --no-startup-id xmodmap -e "keycode 108 = ISO_Level3_Shift"
+#exec_always --no-startup-id "~/.local/bin/remaps"
 
-# keyboard hold-down buttons rate
-#exec_always --no-startup-id "xset r rate 200 75"
+# set wallpaper and terminal color theme
+exec --no-startup-id "wal -R" # unnesessary?
+exec_always "~/.local/bin/setbg ~/.local/share/wallpapers/bg"
 
-# set wallpaper
-exec_always --no-startup-id "feh --no-fehbg --bg-scale ~/.local/share/wallpapers/bg.jpg"
+# restart compton
+exec_always --no-startup-id "/usr/bin/pkill compton ; /usr/bin/compton --config ~/.config/compton/compton.conf"
 
-# generate terminal colors based on wallpaper
-exec_always --no-startup-id "~/.local/bin/wal -i ~/.local/share/wallpapers/bg.jpg"
+# restart notification daemon
+exec_always --no-startup-id "/usr/bin/pkill dunst ; /usr/bin/dunst"
 
-# restart compton
-exec_always --no-startup-id "pkill compton ; compton --config ~/.config/compton/compton.conf"
+# screen blue color filter
+exec --no-startup-id redshift -l40:2 
 
-# notification daemon
-exec_always --no-startup-id "pkill dunst ; dunst"
+# other daemons/tray/etc
+exec --no-startup-id nm-applet
+exec --no-startup-id syncthing
+exec --no-startup-id xfce4-power-manager
+exec --no-startup-id protonmail-bridge --no-window
 
+# for some reason only on my PC i3 keybinding stop working after login
+# this is solved by manual i3 restart
 exec --no-startup-id "i3-msg restart"
diff --git a/install.sh b/install.sh
index e48f2fe..0a446ac 100755
--- a/install.sh
+++ b/install.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+rm ~/.config/mimeapps.list
 stow $(ls -d */)
diff --git a/nnn/.config/nnn/plugins/preview-tabbed b/nnn/.config/nnn/plugins/preview-tabbed
index 98a4be8..01050bd 100755
--- a/nnn/.config/nnn/plugins/preview-tabbed
+++ b/nnn/.config/nnn/plugins/preview-tabbed
@@ -157,7 +157,7 @@ previewer_loop () {
                 ;;
             image/*)
                 if which sxiv >/dev/null 2>&1 ; then
-                    sxiv -e "$XID" "$FILE" &
+                    sxiv -a -e "$XID" "$FILE" &
                 else
                     term_nuke "$XID" "$FILE"
                 fi
diff --git a/pix/.local/share/wallpapers/bg.jpg b/pix/.local/share/wallpapers/bg
index 77264eb..77264eb 120000
--- a/pix/.local/share/wallpapers/bg.jpg
+++ b/pix/.local/share/wallpapers/bg
diff --git a/scripts/.local/bin/lock b/scripts/.local/bin/lock
index 7cdd54d..5bea750 100755
--- a/scripts/.local/bin/lock
+++ b/scripts/.local/bin/lock
@@ -6,7 +6,7 @@ tmpbg='/tmp/screen.png'
 (( $# )) && { icon=$1; }
 
 rm "$tmpbg"
-scrot "$tmpbg"
+maim > "$tmpbg"
 convert "$tmpbg" -scale 10% -scale 1000% "$tmpbg"
 convert "$tmpbg" "$icon" -gravity center -composite -matte "$tmpbg"
 i3lock -u -i "$tmpbg"
diff --git a/scripts/.local/bin/remaps b/scripts/.local/bin/remaps
index 4afa47e..87d0951 100755
--- a/scripts/.local/bin/remaps
+++ b/scripts/.local/bin/remaps
@@ -9,5 +9,6 @@ xset r rate 200 75
 xmodmap -e 'keycode 135 = Super_R'
 
 # external keyboard Alt_R may be mapped to Multi_Key instead of ISO_Level3_Shift, which breaks French QWERTY layout
+#xmodmap -e "keycode 64 = Alt_L"
 xmodmap -e "keycode 64 = ISO_Level3_Shift"
 xmodmap -e "keycode 108 = ISO_Level3_Shift"
diff --git a/scripts/.local/bin/setbg b/scripts/.local/bin/setbg
index 8112bcd..397646d 100755
--- a/scripts/.local/bin/setbg
+++ b/scripts/.local/bin/setbg
@@ -7,9 +7,10 @@
 #	If wal is installed, also generates a colorscheme.
 
 # Location of link to wallpaper link.
-bgloc="${XDG_DATA_HOME:-$HOME/.local/share/}/bg"
+bgloc="${XDG_DATA_HOME:-$HOME/.local/share/wallpapers}/bg"
 
 trueloc="$(readlink -f "$1")" &&
+
 case "$(file --mime-type -b "$trueloc")" in
 	image/* ) ln -sf "$(readlink -f "$1")" "$bgloc" && notify-send -i "$bgloc" "Changing wallpaper..." ;;
 	inode/directory ) ln -sf "$(find "$trueloc" -iregex '.*.\(jpg\|jpeg\|png\|gif\)' -type f | shuf -n 1)" "$bgloc" && notify-send -i "$bgloc" "Random Wallpaper chosen." ;;
diff --git a/shell/.config/shell/aliasrc b/shell/.config/shell/aliasrc
index c8becd9..46e7d8e 100644
--- a/shell/.config/shell/aliasrc
+++ b/shell/.config/shell/aliasrc
@@ -1,5 +1,13 @@
+#!/bin/sh
+
+# Use neovim for vim if present.
 [ -x "$(command -v nvim)" ] && alias vim='nvim' vimdiff='nvim -d'
 
+# sudo not required for some system commands
+for command in mount umount sv pacman updatedb su ; do
+	alias $command="sudo $command"
+done; unset command
+
 # allow calls of aliases by xargs
 alias xargs='xargs '
 
@@ -35,8 +43,8 @@ alias \
         a='sudo apt' \
         z='zathura'
 
-# spawn terminal
-alias st="$TERMINAL </dev/null &>/dev/null & disown ;"
+# spawn detached terminal 
+alias dst="$TERMINAL </dev/null &>/dev/null & disown ;"
 
 # run mpv with SVP, if SVP not active, works as usual mpv
 alias mpv60='mpv --input-ipc-server=/tmp/mpvsocket --hwdec=auto-copy'
diff --git a/shell/.config/shell/profile b/shell/.config/shell/profile
index 615add8..5293195 100644
--- a/shell/.config/shell/profile
+++ b/shell/.config/shell/profile
@@ -60,5 +60,3 @@ export PYTHONPATH=/usr/local/lib/python3.9/site-packages
 if [ -d "$HOME/platform-tools" ] ; then
     export PATH="$HOME/platform-tools:$PATH"
 fi
-
-
diff --git a/shell/.zshenv b/shell/.zshenv
new file mode 120000
index 0000000..8486fca
--- /dev/null
+++ b/shell/.zshenv
@@ -0,0 +1 @@
+.config/shell/profile
+\ No newline at end of file
diff --git a/x11/.xinitrc b/x11/.xinitrc
index 345e193..518bb5d 100644..120000
--- a/x11/.xinitrc
+++ b/x11/.xinitrc
@@ -1,2 +1 @@
-export QT_STYLE_OVERRIDE=gtk
-export QT_QPA_PLATFORMTHEME=gtk2
+.config/x11/xinitrc
+\ No newline at end of file
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 4a2fa82..77906ac 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -2,7 +2,7 @@
 
 # Enable colors and change prompt:
 autoload -U colors && colors	# Load colors
-PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
+PS1="%B%{$fg[blue]%}[%{$fg[blue]%}%n%{$fg[blue]%}@%{$fg[blue]%}%M %{$fg[blue]%}%~%{$fg[blue]%}]%{$reset_color%}$%b "
 setopt autocd		# Automatically cd into typed directory.
 stty stop undef		# Disable ctrl-s to freeze terminal.
 setopt interactive_comments
@@ -63,34 +63,19 @@ zle -N zle-line-init
 echo -ne '\e[5 q' # Use beam shape cursor on startup.
 preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt.
 
-# Use lf to switch directories and bind it to ctrl-o
-lfcd () {
-    tmp="$(mktemp)"
-    lf -last-dir-path="$tmp" "$@"
-    if [ -f "$tmp" ]; then
-        dir="$(cat "$tmp")"
-        rm -f "$tmp"
-        [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
-    fi
-}
-bindkey -s '^o' 'lfcd\n'
-
-bindkey -s '^a' 'bc -lq\n'
-bindkey -s '^f' 'cd "$(dirname "$(fzf)")"\n'
-bindkey '^[[P' delete-char
-
 
 # Edit line in vim with ctrl-e:
 autoload edit-command-line; zle -N edit-command-line
 bindkey '^e' edit-command-line
 
-
 # Import colorscheme from 'wal' asynchronously
 # &   # Run the process in the background.
 # ( ) # Hide shell job control messages.
 # Not supported in the "fish" shell.
 (cat ~/.cache/wal/sequences &)
 
+# To add support for TTYs this line can be optionally added.
+source ~/.cache/wal/colors-tty.sh
 
 # Load zsh-syntax-highlighting; should be last.
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
diff --git a/zsh/.zshenv b/zsh/.zshenv
deleted file mode 120000
index 858e49d..0000000
--- a/zsh/.zshenv
+++ /dev/null
@@ -1 +0,0 @@
-../shell/.config/shell/profile
-\ No newline at end of file