From cf2c2e76455c72eefa62fc08f266943db4780c1d Mon Sep 17 00:00:00 2001
From: fbt <fbt@fleshless.org>
Date: Sun, 29 Jul 2018 15:11:03 +0300
Subject: [PATCH] no idea

Signed-off-by: fbt <fbt@fleshless.org>
---
 homedir/.config/bspwm/bspwmrc                 |  1 -
 homedir/.config/bspwm/sxhkdrc                 | 82 ++++++++-----------
 homedir/.config/dunst/dunstrc                 |  8 +-
 homedir/.config/termite/config                |  2 +-
 homedir/.config/watchman/init.d/compton       |  4 -
 homedir/.config/watchman/init.d/dunst         |  4 -
 homedir/.config/watchman/init.d/jackd         |  4 -
 homedir/.config/watchman/init.d/lockd         | 30 -------
 homedir/.config/watchman/init.d/moltenbar     | 21 -----
 homedir/.config/watchman/init.d/mpc-notify    |  4 -
 homedir/.config/watchman/init.d/mpd           |  8 --
 homedir/.config/watchman/init.d/privoxy       | 21 -----
 homedir/.config/watchman/init.d/pulseaudio    | 14 ----
 homedir/.config/watchman/init.d/scron         |  5 --
 homedir/.config/watchman/init.d/socks         | 13 ---
 homedir/.config/watchman/init.d/ssh-agent     |  4 -
 homedir/.config/watchman/init.d/sxhkd         |  5 --
 homedir/.config/watchman/init.d/syncthing     |  4 -
 .../watchman/init.d/transmission-daemon       |  4 -
 homedir/.config/watchman/init.d/ufwd          |  5 --
 homedir/.config/zxinit/common                 |  7 +-
 homedir/.config/zxinit/sessions/bspwm         |  2 +-
 22 files changed, 46 insertions(+), 206 deletions(-)
 delete mode 100755 homedir/.config/watchman/init.d/compton
 delete mode 100755 homedir/.config/watchman/init.d/dunst
 delete mode 100755 homedir/.config/watchman/init.d/jackd
 delete mode 100755 homedir/.config/watchman/init.d/lockd
 delete mode 100755 homedir/.config/watchman/init.d/moltenbar
 delete mode 100755 homedir/.config/watchman/init.d/mpc-notify
 delete mode 100755 homedir/.config/watchman/init.d/mpd
 delete mode 100755 homedir/.config/watchman/init.d/privoxy
 delete mode 100755 homedir/.config/watchman/init.d/pulseaudio
 delete mode 100755 homedir/.config/watchman/init.d/scron
 delete mode 100755 homedir/.config/watchman/init.d/socks
 delete mode 100755 homedir/.config/watchman/init.d/ssh-agent
 delete mode 100755 homedir/.config/watchman/init.d/sxhkd
 delete mode 100755 homedir/.config/watchman/init.d/syncthing
 delete mode 100755 homedir/.config/watchman/init.d/transmission-daemon
 delete mode 100755 homedir/.config/watchman/init.d/ufwd

diff --git a/homedir/.config/bspwm/bspwmrc b/homedir/.config/bspwm/bspwmrc
index 320605e..8d6f8c6 100755
--- a/homedir/.config/bspwm/bspwmrc
+++ b/homedir/.config/bspwm/bspwmrc
@@ -46,7 +46,6 @@ bspc rule -a Firefox:Navigator state=tiled desktop=^2
 bspc rule -a \*:Hearthstone.exe desktop=^5
 bspc rule -a \* state=floating
 
-
 # start some services
 services=( sxhkd dunst ssh-agent )
 for s in "${services[@]}"; do
diff --git a/homedir/.config/bspwm/sxhkdrc b/homedir/.config/bspwm/sxhkdrc
index 81c0335..25114c9 100644
--- a/homedir/.config/bspwm/sxhkdrc
+++ b/homedir/.config/bspwm/sxhkdrc
@@ -2,71 +2,61 @@
 # bspwm hotkeys
 #
 
-super + {_,shift + } w
-	bspc node {-c,-k}
+# general
+super + w; {c,k}
+	bspc node -{c,k}
 
-super + q
-	bspc node -t '~fullscreen'
-
-super + {j,k}
+super + w; {n,p}
 	bspc node -f {next,prev}.local
 
-control + {h,j,k,l}
-	bspc node {@east -r -32,@south -r +32,@south -r -32,@east -r +32}
+super + w; {t,f,T,F}
+	bspc node -t {tiled,floating,pseudo_tiled,fullscreen}
 
-super + {_,shift + } space
-	bspc node -t '~'{tiled,floating}
+super + w; d; {0-9,h}
+	bspc node -d {0-9,h}
 
-super + Return
-	bspc node -s biggest
+super + w; s; {Left,Up,Right,Down}
+	bspc node --presel-dir '~'{west,north,east,south}
 
-super + {1-9,h}
-	bspc desktop -f {1-9,h}
+super + w; {0-9,h}
+	bspc desktop -f {0-9,h}
 
-super + shift + {1-9,h}
-	bspc node -d {1-9,h}
-
-super + t
+super + w; space
 	bspc desktop -l next
 
-super + shift + t
-	bspc node -t '~pseudo_tiled'
+super + w; z
+	ssm lockd stop
 
-super + x
-	terminal
+# simple hotkeys
+Print
+	snap -f
 
-super + {r,u,p}
-	dmenu-extras -l 9 {run,bmark,pass}
+shift + Print
+	snap
 
 super + z
 	ssm lockd lock
 
-super + shift + z
-	ssm lockd toggle
+super + {r,p}
+	dmenu-extras -l 9 {run,pass}
 
-Print
-	snap -f
+super + x
+	terminal
 
-super + {Left,Up,Right,Down}
-	bspc node --presel-dir '~'{west,north,east,south}
+super + {j,k}
+	bspc node -f {prev,next}.local
 
-super + {_,shift + } c
-	win-hd-center {1280x720,854x480}
+super + q
+	bspc node -c
 
-super + {a,s,n,p}
+# mpd
+super + m; {a,s,n,p}
 	mpc {play,stop,next,prev}
 
-super + bracketright
-	bspc node '@/' -R 90
+# Sound
+super + {comma,period}
+   amixer -c 0 set PCM 2dB{-,+}
 
-super + f
-	bspc rule -a \* -o state=floating
-
-super + comma
-	amixer -c 0 set PCM 2dB-
-
-super + period
-	amixer -c 0 set PCM 2dB+
-
-shift + control + {1-9}
-	echo {11,12,13,14,15,16,17,18,19} > /tmp/penis
+# Fucking Firefox man
+control + q
+   /bin/true
diff --git a/homedir/.config/dunst/dunstrc b/homedir/.config/dunst/dunstrc
index 099ffc5..38b92d0 100644
--- a/homedir/.config/dunst/dunstrc
+++ b/homedir/.config/dunst/dunstrc
@@ -160,18 +160,18 @@
     # Xev might be helpful to find names for keys.
     
     # Close notification.
-    close = ctrl+space
+    #close = ctrl+space
     
     # Close all notifications.
-    close_all = ctrl+shift+space
+    close_all = ctrl+mod4+space
     
     # Redisplay last message(s).
     # On the US keyboard layout "grave" is normally above TAB and left
     # of "1".
-    history = mod4+d
+    history = ctrl+mod4+l
     
     # Context menu.
-    context = mod4+shift+d
+    context = ctrl+mod4+c
 
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
diff --git a/homedir/.config/termite/config b/homedir/.config/termite/config
index 55e59d6..21b37a0 100644
--- a/homedir/.config/termite/config
+++ b/homedir/.config/termite/config
@@ -3,7 +3,7 @@ font = xos4 terminus 10
 #allow_bold = false
 cursor_blink = off
 cursor_shape = ibeam
-browser = browser
+browser = sx-open
 mouse_autohide = true
 audible_bell = true
 
diff --git a/homedir/.config/watchman/init.d/compton b/homedir/.config/watchman/init.d/compton
deleted file mode 100755
index cf2dc5f..0000000
--- a/homedir/.config/watchman/init.d/compton
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env watchman
-
-service_command='/bin/compton'
-service_args=( --vsync opengl -f -D 3 -e 1.0 )
diff --git a/homedir/.config/watchman/init.d/dunst b/homedir/.config/watchman/init.d/dunst
deleted file mode 100755
index a5e8102..0000000
--- a/homedir/.config/watchman/init.d/dunst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env watchman
-
-#service_respawn='true'
-service_command='/usr/bin/dunst'
diff --git a/homedir/.config/watchman/init.d/jackd b/homedir/.config/watchman/init.d/jackd
deleted file mode 100755
index 269ea9b..0000000
--- a/homedir/.config/watchman/init.d/jackd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/env watchman
-
-service_command='/usr/bin/jackd'
-service_args=( -d alsa )
diff --git a/homedir/.config/watchman/init.d/lockd b/homedir/.config/watchman/init.d/lockd
deleted file mode 100755
index 5216f9d..0000000
--- a/homedir/.config/watchman/init.d/lockd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env ssm
-# vim: ft=sh
-
-service_respawn='true'
-service_command="$HOME/bin/lockd"
-service_args=( i3lock-extra -s -o ~/pics/lock.png -g -p )
-
-function _lock {
-	kill -USR1 "$service_pid"
-}
-
-function lock {
-	status || {
-		start; sleep 1
-		"$0" "$service_name" lock
-		return "$?"
-	}
-
-	_lock
-}
-
-function toggle {
-	if status; then
-		out=$( "$0" "$service_name" stop 2>&1 )
-		notify-send "ssm" "$out"
-	else
-		out=$( "$0" "$service_name" start 2>&1 )
-		notify-send "ssm" "$out"
-	fi
-}
diff --git a/homedir/.config/watchman/init.d/moltenbar b/homedir/.config/watchman/init.d/moltenbar
deleted file mode 100755
index af1d72b..0000000
--- a/homedir/.config/watchman/init.d/moltenbar
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env watchman
-
-#service_respawn='true'
-service_command='/home/fbt/bin/moltenbar'
-
-service_depends_ready=( compton )
-
-post_start() {
-	# Die if the thing didn't start
-	timer 5 nullexec xdo id -a moltenbar || return 1
-	
-	# Set the layer on which lemonbar resides
-	xdo above -t $( xdo id -n root ) $( xdo id -a moltenbar )
-
-	# Set the top badding for bspwm
-	bspc config top_padding $(( 14 + 9 )) &>/tmp/debug.log
-}
-
-pre_stop() {
-	bspc config top_padding 0
-}
diff --git a/homedir/.config/watchman/init.d/mpc-notify b/homedir/.config/watchman/init.d/mpc-notify
deleted file mode 100755
index be7951d..0000000
--- a/homedir/.config/watchman/init.d/mpc-notify
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env watchman
-
-#service_respawn='true'
-service_command="$HOME/bin/mpc-notify"
diff --git a/homedir/.config/watchman/init.d/mpd b/homedir/.config/watchman/init.d/mpd
deleted file mode 100755
index 1b32986..0000000
--- a/homedir/.config/watchman/init.d/mpd
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ssm
-
-service_tmpfiles=( "/run/user/$UID/mpd:dir" )
-# service_respawn=false
-service_command='/usr/bin/mpd'
-service_args=( --no-daemon -v )
-
-post_start() { ready; }
diff --git a/homedir/.config/watchman/init.d/privoxy b/homedir/.config/watchman/init.d/privoxy
deleted file mode 100755
index f7d4c48..0000000
--- a/homedir/.config/watchman/init.d/privoxy
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env watchman
-
-privoxy_configfile="$HOME/.config/privoxy/config"
-
-service_respawn='true'
-service_command='/usr/bin/privoxy'
-service_args=( --no-daemon "$privoxy_configfile" )
-
-privoxy::configtest() {
-	"$service_command" --config-test "${service_args[@]}"
-}
-
-restart() {
-	privoxy::configtest || {
-		watchman.err "Config test failed, not restarting!"
-		return 1
-	}
-	
-	stop
-	start
-}
diff --git a/homedir/.config/watchman/init.d/pulseaudio b/homedir/.config/watchman/init.d/pulseaudio
deleted file mode 100755
index 5d6f041..0000000
--- a/homedir/.config/watchman/init.d/pulseaudio
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/env watchman
-
-service_depends=( jackd )
-
-service_command='/usr/bin/pulseaudio'
-service_args=( 
-	--realtime=false
-	--exit-idle-time=-1
-	-L module-jack-sink
-	-L module-jack-source
-	-L module-native-protocol-tcp
-)
-
-stop () { "$service_command" -k; }
diff --git a/homedir/.config/watchman/init.d/scron b/homedir/.config/watchman/init.d/scron
deleted file mode 100755
index db786dd..0000000
--- a/homedir/.config/watchman/init.d/scron
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ssm
-
-service_respawn='true'
-service_command='/usr/bin/crond'
-service_args=( -n -f ~/.config/crontab )
diff --git a/homedir/.config/watchman/init.d/socks b/homedir/.config/watchman/init.d/socks
deleted file mode 100755
index 29e09d6..0000000
--- a/homedir/.config/watchman/init.d/socks
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/bash
-
-[[ $PROXY_USER ]] || PROXY_USER='proxy'
-[[ $PROXY_HOST ]] || PROXY_HOST='malganis.priv'
-
-service_respawn=true
-service_command=( /usr/bin/ssh -i ~/.ssh/proxy/id_ecdsa -ND 8080 "$PROXY_USER@$PROXY_HOST" )
-
-function info {
-	printf 'Name: %s\n' "$service_name"
-	printf 'Command: %s\n' "${service_command[*]}"
-	(( service_respawn )) && printf 'Respawn: yes\n'
-}
diff --git a/homedir/.config/watchman/init.d/ssh-agent b/homedir/.config/watchman/init.d/ssh-agent
deleted file mode 100755
index 6a2851b..0000000
--- a/homedir/.config/watchman/init.d/ssh-agent
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env watchman
-
-service_command='/usr/bin/ssh-agent'
-service_args=( -d -a "/tmp/${USER}-ssh-auth.sock" )
diff --git a/homedir/.config/watchman/init.d/sxhkd b/homedir/.config/watchman/init.d/sxhkd
deleted file mode 100755
index ae65a18..0000000
--- a/homedir/.config/watchman/init.d/sxhkd
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env watchman
-
-service_respawn='true'
-service_command='/usr/bin/sxhkd'
-service_reload_signal='USR1'
diff --git a/homedir/.config/watchman/init.d/syncthing b/homedir/.config/watchman/init.d/syncthing
deleted file mode 100755
index 2e28477..0000000
--- a/homedir/.config/watchman/init.d/syncthing
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/env watchman
-
-#service_respawn='true'
-service_command='/usr/bin/syncthing'
diff --git a/homedir/.config/watchman/init.d/transmission-daemon b/homedir/.config/watchman/init.d/transmission-daemon
deleted file mode 100755
index c82abd2..0000000
--- a/homedir/.config/watchman/init.d/transmission-daemon
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/env watchman
-
-service_command='/usr/bin/transmission-daemon'
-service_args=( -f )
diff --git a/homedir/.config/watchman/init.d/ufwd b/homedir/.config/watchman/init.d/ufwd
deleted file mode 100755
index b060438..0000000
--- a/homedir/.config/watchman/init.d/ufwd
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env watchman
-
-#service_respawn='true'
-service_command='/usr/bin/ufwd'
-service_args=( -n -c -- -p )
diff --git a/homedir/.config/zxinit/common b/homedir/.config/zxinit/common
index 2be6611..0062055 100644
--- a/homedir/.config/zxinit/common
+++ b/homedir/.config/zxinit/common
@@ -44,10 +44,11 @@ if [[ -f "$HOME/wallpaper.png" ]]; then
 fi
 
 # Input settings
-setxkbmap "min(us),min(ru)" -option "lv3:rwin_switch,grp:caps_toggle,grp_led:caps,compose:ralt,terminate:ctrl_alt_bksp"
+setxkbmap -layout "ducky-mini(us),ducky-mini(ru)" \
+          -option "lv3:menu_switch,grp:caps_toggle,grp_led:caps,compose:ralt,terminate:ctrl_alt_bksp"
 xmodmap -e 'remove lock = Caps_Lock' \
-		-e 'keycode 135 = KP_Insert' \
-		-e 'keycode 49 = Escape asciitilde'
+        -e 'keycode 135 = KP_Insert' \
+        -e 'keycode 49 = Escape asciitilde'
 
 # Start a dbus session
 if ! [[ "$DBUS_SESSION_BUS_ADDRESS" ]]; then
diff --git a/homedir/.config/zxinit/sessions/bspwm b/homedir/.config/zxinit/sessions/bspwm
index c6fbf23..2bcb56e 100644
--- a/homedir/.config/zxinit/sessions/bspwm
+++ b/homedir/.config/zxinit/sessions/bspwm
@@ -1,6 +1,6 @@
 # A simple dwm session
 PATH+=":$HOME/.config/bspwm/bin"
 
-start_session() {
+session_start() {
 	exec bspwm
 }