summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@server-speed.net>2011-03-18 15:25:53 +0100
committerFlorian Pritz <bluewind@server-speed.net>2011-03-18 15:25:53 +0100
commit2176a208358a430e7ee241dcc9fba6e04fea679e (patch)
tree66822ba8c99b601a99e9253c41ee01213337191c
parent55c346d932d714573764acd7e388d0c864492798 (diff)
downloaddotfiles-2176a208358a430e7ee241dcc9fba6e04fea679e.tar.gz
dotfiles-2176a208358a430e7ee241dcc9fba6e04fea679e.tar.xz
misc changes
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
-rw-r--r--.Xdefaults14
-rw-r--r--.gitignore1
-rw-r--r--.vimrc4
-rw-r--r--.xinitrc16
-rw-r--r--.zshrc4
5 files changed, 25 insertions, 14 deletions
diff --git a/.Xdefaults b/.Xdefaults
index 2dfa5ee..1898576 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -20,8 +20,8 @@ xterm*font: -*-proggytiny-*-*-*-*-*-*-*-*-*-*-*-*
!--------------------
URxvt*reverseVideo: false
URxvt*title: Terminal
-!URxvt*fading: 0
-!URxvt*shading: 10
+URxvt*fading: 0
+URxvt*shading: 10
URxvt*perl-ext-common: default,matcher
URxvt.underlineURLs: true
URxvt.keysym.M-u: perl:mark-yank-urls:activate_mark_mode
@@ -29,14 +29,16 @@ URxvt.perl-lib:/home/flo/.urxvt
URxvt.perl-ext:selection,mark-yank-urls
URxvt*urlLauncher: urxvt-link.sh
URxvt*matcher.button: 1
+URxvt.matcher.rend.0: Uline fg6
URxvt*matcher.pattern.1: \\bwww\\.[\\w-]\\.[\\w./?&@!-]*[\\w/-]
URxvt*scrollWithBuffer: true
URxvt*scrollTtyKeypress: true
-!URxvt*depth: 32
-!URxvt*background: rgba:0000/0000/0000/dddd
+URxvt*depth: 32
+URxvt*background: rgba:0000/0000/0000/eeee
!URxvt*dpi:88
!URxvt*transparent:true
-!URxvt*tintColor: #000000
+URxvt*tintColor: #141414
+URxvt.termName: rxvt-256color
!--------------------
! Overall Settings
@@ -58,7 +60,7 @@ URxvt*scrollTtyKeypress: true
!--------------------
! Colors
!--------------------
-URxvt*background: #000000
+!URxvt*background: #000000
URxvt*foreground: #CCCCCC
xterm*background: #000000
xterm*foreground: #CCCCCC
diff --git a/.gitignore b/.gitignore
index b189724..fc7b94a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
.zsh/histfile
.vim/.VimballRecord
.zsh/.zcompdump
+*.un~
diff --git a/.vimrc b/.vimrc
index f6374d7..67bba75 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,7 +13,7 @@ set softtabstop=2
set ruler " show me where the cursor is
set rulerformat=%l/%L(%p%%),%c " a better ruler
set showmatch " show matching brackets
-set cindent
+"set cindent
set number " show line numbers
set showmode " show mode at bottom of screen
set hlsearch " highlight all search results
@@ -24,7 +24,7 @@ set laststatus=2
set mouse=a
set nopaste
set foldmethod=marker
-set smartindent
+"set smartindent
set scrolloff=3
set showcmd
set display=uhex
diff --git a/.xinitrc b/.xinitrc
index 99b4aa7..7f132d2 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -4,11 +4,12 @@ cd $HOME
# I don't like no background ;)
dash $HOME/.fehbg &
-numlockx &
+numlockx
xset r rate 250 50 & # also in ~/bin/suspend-resume.sh
source $HOME/bin/gpg-agent.sh
# autostart entries
+setxkbmap de nodeadkeys
xbindkeys &
xmodmap ~/.xmodmaprc &
urxvtd -o -f -q
@@ -16,13 +17,16 @@ xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.
autostart () {
sh $HOME/bin/irssi_notify.sh < /dev/null & # also in ~/bin/suspend-resume.sh
- urxvtc -g 125x+45+1166+0 -e ssh mistral &
- urxvtc -g 125x+45+1920+0 -e ssh karif &
+ urxvt -g 125x+45+1166+0 -e ssh mistral &
+ urxvt -g 125x+45+1920+0 -e ssh karif &
stalonetray --dockapp-mode -p --kludges force_icons_size &
- lxpanel &
+# lxpanel &
for f in $XDG_CONFIG_HOME/conky/*; do
conky -c "$f" &
done
+ keepassx&
+ transmission-qt &
+# psi &
gajim &
# /opt/Samsung/SmartPanel/bin/smartpanel &
# ossxmix -b & # also in ~/bin/suspend-resume.sh
@@ -38,7 +42,7 @@ autostart () {
# WM
case "$1" in
awesome|i3)
- ck-launch-session i3 &
+ ck-launch-session i3 --force-xinerama &
sleep 1
autostart &
;;
@@ -50,7 +54,7 @@ case "$1" in
console)
ck-launch-session openbox &
sleep 1
- urxvtc &
+ urxvt &
;;
*|openbox)
ck-launch-session openbox &
diff --git a/.zshrc b/.zshrc
index 31957de..5428977 100644
--- a/.zshrc
+++ b/.zshrc
@@ -237,6 +237,10 @@ SPROMPT='zsh: correct '%R' to '%r' ? ([Y]es/[N]o/[E]dit/[A]bort) '
# }}}
# Functions {{{
+starttls() {
+ gnutls-cli --starttls --crlf "$@"
+}
+
# always /etc/rc.d/blub is a bit too much work ;)
rc() {
sudo /etc/rc.d/$1 $2