From: Mart Lubbers <mart@martlubbers.net>
Date: Sun, 15 Apr 2018 05:52:50 +0000 (+0200)
Subject: started with tmux and st
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=4309b3dadf581b3dcd51b91a8373262990fb4175;hp=-c;p=dotfiles.git

started with tmux and st
---

4309b3dadf581b3dcd51b91a8373262990fb4175
diff --git a/20-keyboard.conf b/20-keyboard.conf
index 835dcb0..687d125 100644
--- a/20-keyboard.conf
+++ b/20-keyboard.conf
@@ -5,5 +5,5 @@ Section "InputClass"
 	Option "XkbModel" "pc104"
 	Option "XkbLayout" "dvorak,ru,us"
 	Option "XkbVariant" ",phonetic_dvorak,"
-	Option "XKbOptions" "compose:ralt,grp:menu_toggle,caps:super"
+	Option "XKbOptions" "compose:ralt,grp:menu_toggle,ctrl:swapcaps"
 EndSection
diff --git a/shell/.bashrc b/shell/.bashrc
index 29d1747..bce6795 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -30,6 +30,7 @@ export COLORFGBG="default;default"
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias vi=vim
+alias tmux='tmux -f ~/.config/tmux/config'
 
 set_prompt(){
 	last_c=$?
diff --git a/shell/.config/tmux/config b/shell/.config/tmux/config
new file mode 100644
index 0000000..f02f3a2
--- /dev/null
+++ b/shell/.config/tmux/config
@@ -0,0 +1,16 @@
+# prefix
+unbind C-b
+set-option -g prefix C-a
+bind C-a send-prefix
+
+# hjkl pane traversal
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# i3 window splitting
+unbind %
+unbind "
+bind v split-window -v
+bind h split-window -h
diff --git a/x/.config/i3/config b/x/.config/i3/config
index 0277172..c6b06bb 100644
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -30,7 +30,7 @@ floating_modifier $mod
 hide_edge_borders none
 
 # start a terminal
-bindsym $mod+Return exec urxvtc
+bindsym $mod+Return exec st
 
 # lock
 bindsym $mod+l exec xautolock -locknow
diff --git a/x/.xinitrc b/x/.xinitrc
index bbd42d8..dfabfa3 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,9 +1,6 @@
 #!/bin/bash
-urxvtd -q -o -f &
 xautolock -locker ~/.local/bin/lock.sh &
 dunst &
-compton -b
-~/.fehbg
 
 eval "$(gpg-agent --daemon)"
 xrdb -merge ~/.Xresources