aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xresources1
-rw-r--r--config/i3/config2
-rw-r--r--conkerorrc2
-rw-r--r--gitconfig4
-rw-r--r--xinitrc3
-rw-r--r--xmod_swapper_not_used_any_more5
6 files changed, 9 insertions, 8 deletions
diff --git a/Xresources b/Xresources
index ea9c066..708dce4 100644
--- a/Xresources
+++ b/Xresources
@@ -1,3 +1,4 @@
+Xcursor.size: 9
! XTerm ##
XTerm*metaSendsEscape: true
XTerm*locale: true
diff --git a/config/i3/config b/config/i3/config
index c0d71d7..11aab41 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -30,7 +30,7 @@ floating_modifier $mod
# start a terminal
bindsym $mod+Return exec urxvt
-bindsym $mod+Shift+Return exec firefox & pidgin
+bindsym $mod+Shift+Return exec pidgin & conkeror
# kill focused window
bindsym $mod+q kill
diff --git a/conkerorrc b/conkerorrc
index 314e98a..1cd2e0e 100644
--- a/conkerorrc
+++ b/conkerorrc
@@ -22,7 +22,7 @@ define_opensearch_webjump("?e", "eBay.xml");
external_content_handlers.set("application/pdf", "okular");
external_content_handlers.set("video/*", "vlc");
-editor_shell_command = "urxvt -e vi";
+editor_shell_command = "urxvt -e vim";
url_completion_use_history = true;
url_remoting_fn = load_url_in_new_buffer;
diff --git a/gitconfig b/gitconfig
index 59fe735..69d3b0c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,3 +5,7 @@
default = simple
[core]
editor = vim
+[commit]
+ gpgsign = true
+[merge]
+ tool = vimdiff
diff --git a/xinitrc b/xinitrc
index 598e4e5..29006b7 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,7 +1,8 @@
xrdb -merge -I$HOME ~/.Xresources
-#xmodmap ~/.speedswapper
setxkbmap -option caps:escape
+export QT_STYLE_OVERRIDE='gtk2'
+
#srandrd ~/.bin/mxrandr
mxrandr
diff --git a/xmod_swapper_not_used_any_more b/xmod_swapper_not_used_any_more
deleted file mode 100644
index 72c4957..0000000
--- a/xmod_swapper_not_used_any_more
+++ /dev/null
@@ -1,5 +0,0 @@
-! Swap caps lock and escape
-remove Lock = Caps_Lock
-keysym Escape = Caps_Lock
-keysym Caps_Lock = Escape
-add Lock = Caps_Lock