summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.Xresources/base6
-rw-r--r--.bashrc1
-rw-r--r--.grmrc2
-rw-r--r--.i3/config2
-rw-r--r--.misc/.gtkrc-2.0.mine5
-rw-r--r--.misc/20-keyboard.conf6
-rw-r--r--.mutt/muttrc2
-rwxr-xr-x.xinitrc2
-rw-r--r--.zsh/functions2
-rw-r--r--.zsh/tmp2
-rw-r--r--.zsh/zshrc1
11 files changed, 24 insertions, 7 deletions
diff --git a/.Xresources/base b/.Xresources/base
index 96582a7..8ed074f 100644
--- a/.Xresources/base
+++ b/.Xresources/base
@@ -1,7 +1,7 @@
! XTERM !
! Appearance xterm
-*xterm*faceName: Monaco
+! *xterm*faceName: Monaco
*xterm*faceSize: 11
*xterm*background: Black
*xterm*foreground: White
@@ -37,8 +37,8 @@ URxvt.keysym.M-p: perl:clipboard:paste
URxvt.keysym.F11: perl:fullscreen:switch
! Appearance
-! URxvt*font: xft:DejaVu Sans Mono:size=12
-URxvt*font: xft:monaco:size=11:antialias=false
+URxvt*font: xft:DejaVu Sans Mono:size=12
+! URxvt*font: xft:monaco:size=11:antialias=false
URxvt*scrollBar: false
URxvt*internalBorder: 0
diff --git a/.bashrc b/.bashrc
index 0519eef..e4cd4ff 100644
--- a/.bashrc
+++ b/.bashrc
@@ -114,4 +114,5 @@ if ! shopt -oq posix; then
fi
source ~/github/fzf-marks/fzf-marks.plugin.bash
+
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/.grmrc b/.grmrc
index 0273f5e..76a648d 100644
--- a/.grmrc
+++ b/.grmrc
@@ -19,7 +19,7 @@ repodirs[atweiden/fzf-extras]=/home/urbain/github/fzf-extras
# Plugin managers
repodirs[junegunn/vim-plug]=/home/urbain/.vim/vim-plug
repodirs[tmux-plugins/tpm]=/home/urbain/.tmux/plugins/tpm
-# repodirs[tarjoilija/zgen]=/home/urbain/.zgen
+repodirs[tarjoilija/zgen]=/home/urbain/.zgen
# Experimental
repodirs[adbrebs/taxi]=/home/urbain/github/adbrebs/taxi
diff --git a/.i3/config b/.i3/config
index 0521439..b311fba 100644
--- a/.i3/config
+++ b/.i3/config
@@ -199,3 +199,5 @@ bindsym XF86AudioMute exec amixer -D pulse sset Master 0%
# Sreen brightness controls
bindsym XF86MonBrightnessUp exec xbacklight -inc 10
bindsym XF86MonBrightnessDown exec xbacklight -dec 10
+
+# font pango:DejaVu Sans Mono 10
diff --git a/.misc/.gtkrc-2.0.mine b/.misc/.gtkrc-2.0.mine
new file mode 100644
index 0000000..4e2ec82
--- /dev/null
+++ b/.misc/.gtkrc-2.0.mine
@@ -0,0 +1,5 @@
+style "uzbl" {
+ GtkRange::slider-width = 0
+ GtkRange::trough-border = 0
+}
+widget "Uzbl*" style "uzbl"
diff --git a/.misc/20-keyboard.conf b/.misc/20-keyboard.conf
new file mode 100644
index 0000000..33cf6ed
--- /dev/null
+++ b/.misc/20-keyboard.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+ Identifier "keyboard"
+ MatchIsKeyboard "yes"
+ Option "XkbLayout" "us"
+ Option "XkbVariant" "dvp"
+EndSection
diff --git a/.mutt/muttrc b/.mutt/muttrc
index fb57f0a..96c716e 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -49,7 +49,7 @@ set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
alternative_order text/plain text/enriched text/html
# Editor
-set editor="nvim --noplugin"
+set editor="vim --noplugin"
set include=yes
# Program to send mails
diff --git a/.xinitrc b/.xinitrc
index f280da9..73da0a5 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -14,3 +14,5 @@ killall -9 gpg-agent
gpg-agent --daemon --enable-ssh-support \
--write-env-file "${HOME}/.gpg-agent-info"
+
+exec i3
diff --git a/.zsh/functions b/.zsh/functions
index 557d1af..fcc1e9c 100644
--- a/.zsh/functions
+++ b/.zsh/functions
@@ -3,7 +3,7 @@
function colo {
# Change colors for current session
- $HOME/.bin/recolor.sh < ~/.Xresources/$1
+ $HOME/bin/recolor.sh < ~/.Xresources/$1
# Load Xresources file for future sessions
xrdb ~/.Xresources/$1
diff --git a/.zsh/tmp b/.zsh/tmp
index aab86c2..1282040 100644
--- a/.zsh/tmp
+++ b/.zsh/tmp
@@ -1,3 +1,3 @@
#!/bin/zsh
-export COLORSCHEME=light
+export COLORSCHEME=dark
diff --git a/.zsh/zshrc b/.zsh/zshrc
index f08eee4..b7a6c33 100644
--- a/.zsh/zshrc
+++ b/.zsh/zshrc
@@ -46,4 +46,5 @@ if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
esac
fi
+
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh