summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--Xmodmap11
-rw-r--r--i3/config24
-rw-r--r--pentadactylrc6
-rwxr-xr-xservices/xcape/log/run3
-rwxr-xr-xservices/xcape/run3
-rw-r--r--tmux.conf12
-rw-r--r--xinitrc4
8 files changed, 40 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index fe7e800..984b1e3 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ INSTALL = abcde.conf \
tmux.conf \
vimrc \
Xdefaults \
+ Xmodmap \
xinitrc \
zlogout \
zshcomplete \
diff --git a/Xmodmap b/Xmodmap
new file mode 100644
index 0000000..842ed2d
--- /dev/null
+++ b/Xmodmap
@@ -0,0 +1,11 @@
+clear control
+clear mod1
+clear mod4
+keycode 37 = Alt_L Meta_L
+keycode 64 = Control_L
+keycode 105 = Alt_R Meta_R
+keycode 108 = Control_R
+keycode 135 = Super_R
+add control = Control_L Control_R
+add mod1 = Alt_L Alt_R Meta_L Meta_R
+add mod4 = Super_L Super_R
diff --git a/i3/config b/i3/config
index fce7a84..27c03c7 100644
--- a/i3/config
+++ b/i3/config
@@ -2,15 +2,14 @@
#
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-set $mod Mod1+Ctrl
-set $layout_mod Mod4
+set $mod Mod4
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
font 6x10
# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $layout_mod
+floating_modifier $mod
# window decorations
new_window 1pixel
@@ -77,19 +76,17 @@ bindsym $mod+Shift+j move down
bindsym $mod+Shift+k move up
bindsym $mod+Shift+l move right
-bindsym $layout_mod+h split h
-bindsym $layout_mod+v split v
+bindsym $mod+Mod1+h split h
+bindsym $mod+Mod1+v split v
-bindsym $layout_mod+f fullscreen
+bindsym $mod+f fullscreen
-bindsym $layout_mod+l exec xscreensaver-command -lock
-
-bindsym $layout_mod+Shift+space floating toggle
-bindsym $layout_mod+space focus mode_toggle
+bindsym $mod+Shift+space floating toggle
+bindsym $mod+space focus mode_toggle
# workspace manipulation
-bindsym $mod+Left exec i3-switch-workspace prev
-bindsym $mod+Right exec i3-switch-workspace next
+bindsym $mod+bracketleft exec i3-switch-workspace prev
+bindsym $mod+bracketright exec i3-switch-workspace next
bindsym $mod+1 workspace 1
bindsym $mod+2 workspace 2
@@ -101,9 +98,6 @@ bindsym $mod+7 workspace 7
bindsym $mod+8 workspace 8
bindsym $mod+9 workspace 9
-bindsym $mod+Shift+Left move window to workspace prev
-bindsym $mod+Shift+Right move window to workspace next
-
bindsym $mod+Shift+1 move container to workspace 1
bindsym $mod+Shift+2 move container to workspace 2
bindsym $mod+Shift+3 move container to workspace 3
diff --git a/pentadactylrc b/pentadactylrc
index 2454605..699834d 100644
--- a/pentadactylrc
+++ b/pentadactylrc
@@ -11,6 +11,10 @@ map L :bn<CR>
map J 20j
map K 20k
+" navigation
+map <C-h> :back<CR>
+map <C-L> :forward<CR>
+
" disable autocompletion entirely
set au=
" when completing, only show 5 at a time
@@ -21,7 +25,7 @@ highlight Hint -append font-size:11px;font-weight:bold;background:#fff;border:1p
" backspace to open panorama
map <BS> <C-v><C-S-e>
-map <C-a><C-a> <C-v><C-S-e>
+map <C-f><C-f> <C-v><C-S-e>
" default to using the 'g' search keyword
set defsearch=g
diff --git a/services/xcape/log/run b/services/xcape/log/run
new file mode 100755
index 0000000..ef9a4a9
--- /dev/null
+++ b/services/xcape/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+multilog t * $HOME/.log/xcape
diff --git a/services/xcape/run b/services/xcape/run
new file mode 100755
index 0000000..d72ab47
--- /dev/null
+++ b/services/xcape/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec xcape -d
diff --git a/tmux.conf b/tmux.conf
index 58320f0..425eb76 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -4,8 +4,8 @@ set -g bell-action any
# lots of scrollback
set -g history-limit 4096
-# use ^A rather than ^B for the prefix key
-set -g prefix ^A
+# use ^F rather than ^B for the prefix key
+set -g prefix ^F
# hide the statusbar by default
set -g status off
@@ -34,12 +34,10 @@ set -g message-bg green
set -g escape-time 50
# keybindings
-bind a send-prefix
-bind A command-prompt "rename-window %%"
-bind ^A choose-window
-bind ^C new-window
+bind f send-prefix
+bind ^F choose-window
+bind ^N new-window
bind ^D detach-client
-bind h command-prompt "new-window 'exec man %%'"
bind ^S set status
unbind ^B
diff --git a/xinitrc b/xinitrc
index d17e785..f00f528 100644
--- a/xinitrc
+++ b/xinitrc
@@ -2,7 +2,9 @@
pidof svscan || (svscan $HOME/.services 2>&1 | readproctitle $USER ........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................) &
-setxkbmap -option compose:menu
+setxkbmap -option ctrl:nocaps # disables caps lock
+setxkbmap -option compose:caps # sets caps key to compose
+xmodmap $HOME/.Xmodmap
synclient HorizEdgeScroll=1
upower -e