aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2014-02-26 20:16:24 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2014-02-26 20:16:24 +0100
commit3bdd71d25d67e69bc4e510ac26e262a77f9578ff (patch)
treef8baf06e3f524f53255b95928fe9e03d671989b3
parent9c9e27b7bfc9c00acc02b91fdb8cb29c60fe546e (diff)
downloaddotfiles-3bdd71d25d67e69bc4e510ac26e262a77f9578ff.tar.xz
I should learn to actually use a vcs properly :p
-rw-r--r--X11/XCompose2
-rw-r--r--i3/config2
-rw-r--r--termite/config2
-rw-r--r--zsh/.zkbd/xterm-termite-:04
-rw-r--r--zsh/.zprofile6
-rw-r--r--zsh/.zshrc1
6 files changed, 11 insertions, 6 deletions
diff --git a/X11/XCompose b/X11/XCompose
index 2a526c2..bf3be30 100644
--- a/X11/XCompose
+++ b/X11/XCompose
@@ -20,7 +20,7 @@
<Multi_key> <apostrophe> <bracketleft> : "‘" U2018
<Multi_key> <apostrophe> <bracketright> : "’" U2019
<Multi_key> <less> <bracketleft> : "「" UFF62
-<Multi_key> <more> <bracketright> : "」" UFF63
+<Multi_key> <greater> <bracketright> : "」" UFF63
<Multi_key> <e> <m> <minus> : "—" U2014
diff --git a/i3/config b/i3/config
index 451c517..ba39cd1 100644
--- a/i3/config
+++ b/i3/config
@@ -162,4 +162,4 @@ for_window [class="Gifview"] floating enable
#exec --no-startup-id /usr/bin/dropbox start
exec --no-startup-id feh --bg-tile /media/pictures/wallpapers/1366x768/wallpaper.png
-exec dex -ae i3
+exec --no-startup-id dex -ae i3
diff --git a/termite/config b/termite/config
index c3cd354..1be6c0c 100644
--- a/termite/config
+++ b/termite/config
@@ -8,7 +8,7 @@ mouse_autohide = false
allow_bold = true
dynamic_title = true
urgent_on_bell = true
-clickable_url = false
+clickable_url = true
font = Source Code Pro Earnest 9
scrollback_lines = 1000
search_wrap = true
diff --git a/zsh/.zkbd/xterm-termite-:0 b/zsh/.zkbd/xterm-termite-:0
index 01f4e31..6625a8f 100644
--- a/zsh/.zkbd/xterm-termite-:0
+++ b/zsh/.zkbd/xterm-termite-:0
@@ -14,10 +14,10 @@ key[F11]='^[[23~'
key[F12]='^[[24~'
key[Backspace]='^?'
key[Insert]='^[[2~'
-key[Home]='^[OH'
+key[Home]='^[[H'
key[PageUp]='^[[5~'
key[Delete]='^[[3~'
-key[End]='^[OF'
+key[End]='^[[F'
key[PageDown]='^[[6~'
key[Up]='^[[A'
key[Left]='^[[D'
diff --git a/zsh/.zprofile b/zsh/.zprofile
index 3cc0aee..6d2e1df 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -29,9 +29,13 @@ export TERMINAL=termite
export SDL_AUDIODRIVER=pulse
-#export GTK_IM_MODULE=xim
+export GTK_IM_MODULE=xim
export SUDO_PROMPT=$'\e[31mSUDO\e[m password for \e[34m%p\e[m: '
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+
+
[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx "$HOME"/.config/X11/xinitrc
#envoy -t gpg-agent
#source <(envoy -p)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ad5c01a..b1cb00c 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -3,6 +3,7 @@ HISTSIZE=500
SAVEHIST=500
setopt notify
+fpath=(~/.local/share/zsh/completion $fpath)
zstyle :compinstall filename "$HOME/.config/zsh/.zshrc"
al=(colors