summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-05-31 13:25:46 +0200
committerFlorian Pritz <bluewind@xinu.at>2016-05-31 13:25:46 +0200
commit9612b1115ce9be268eb643f5675b8a13feec82c6 (patch)
tree39466de0788e531f64b14f721aeac1c59ac11fee
parent647c46d8bc10c642e9137a6dcfb876bfada77514 (diff)
downloaddotfiles-9612b1115ce9be268eb643f5675b8a13feec82c6.tar.gz
dotfiles-9612b1115ce9be268eb643f5675b8a13feec82c6.tar.xz
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--.config/conky/main12
-rw-r--r--.tmux.conf2
-rw-r--r--.xinitrc26
-rw-r--r--.zshrc2
4 files changed, 22 insertions, 20 deletions
diff --git a/.config/conky/main b/.config/conky/main
index 936a64a..934d817 100644
--- a/.config/conky/main
+++ b/.config/conky/main
@@ -38,12 +38,12 @@ ${color #92BCF3}Load: ${color0}${head /proc/loadavg 1 2}${color #92BCF3}Uptime:$
${color #92BCF3}RAM${alignc}RAM${alignr}CPU${color0}
${mem} ${alignc}${memperc}%${alignr}${cpu cpu0}%
-eno1:
-${color #92BCF3}Downstream:${color0} ${alignc} ${totaldown eno1}${alignr}${downspeed eno1}
-${color #92BCF3}Upstream:${color0} ${alignc} ${totalup eno1}${alignr}${upspeed eno1}
+intern0:
+${color #92BCF3}Downstream:${color0} ${alignc} ${totaldown intern0}${alignr}${downspeed intern0}
+${color #92BCF3}Upstream:${color0} ${alignc} ${totalup intern0}${alignr}${upspeed intern0}
-enp3s0:
-${color #92BCF3}Downstream:${color0} ${alignc} ${totaldown enp3s0}${alignr}${downspeed enp3s0}
-${color #92BCF3}Upstream:${color0} ${alignc} ${totalup enp3s0}${alignr}${upspeed enp3s0}
+guest0:
+${color #92BCF3}Downstream:${color0} ${alignc} ${totaldown guest0}${alignr}${downspeed guest0}
+${color #92BCF3}Upstream:${color0} ${alignc} ${totalup guest0}${alignr}${upspeed guest0}
${time %a %F %H:%M:%S}
diff --git a/.tmux.conf b/.tmux.conf
index 146cf9d..48fd283 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -29,7 +29,6 @@ set -g bell-action any
set -g history-limit 50000
set -g status on
set -g status-keys vi
-set -g status-utf8 on
set -g set-titles on
set -g default-terminal "screen-256color"
@@ -43,7 +42,6 @@ set -g status-right '#[fg=black,bright]• #[fg=magenta]#(cat /proc/loadavg)'
set -g status-left-length 40
set -g status-right-length 40
-setw -g utf8 on
setw -g automatic-rename on
setw -g clock-mode-style 24
setw -g mode-keys vi
diff --git a/.xinitrc b/.xinitrc
index bdd798f..6ec4653 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -5,6 +5,7 @@ export VDPAU_NVIDIA_NO_OVERLAY=1
#export SDL_AUDIODRIVER=alsa
export SDL_AUDIODRIVER=pulse
export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh
+export QT_QPA_PLATFORMTHEME="qt5ct"
[[ -f ~/.nvidia-settings-rc ]] && nvidia-settings -l
xrandr --output DP-4 --left-of DP-2
@@ -18,8 +19,8 @@ xset r rate 250 50 &
source $HOME/bin/gpg-agent.sh
# autostart entries
-setxkbmap de nodeadkeys
-sup --delay-after 3 --delay 1 --reset-after 0 xbindkeys -n &
+setxkbmap us altgr-intl
+#sup --delay-after 3 --delay 1 --reset-after 0 xbindkeys -n &
xkbcomp ~/.xkbmap $DISPLAY &
xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 10 &
pulseaudio --start &
@@ -28,18 +29,22 @@ remote-notify-client.sh </dev/null &
#compton -bfzCG --backend glx --vsync opengl-swc --paint-on-overlay -D2 #--glx-no-rebind-pixmap --glx-no-stencil --unredir-if-possible
redshift -l 48.190:15.62 -t 5700:3400 -m randr &
mount-ssh &
+dunst &
autostart () {
#urxvt -g 125x+45+1041+0 -e ssh mistral &
#urxvt -g 125x+45+1920+0 -e ssh karif &
- stalonetray --dockapp-mode -p --kludges force_icons_size &
- for f in $XDG_CONFIG_HOME/conky/*; do
- conky -c "$f" &
- done
+ #stalonetray --dockapp-mode -p --kludges force_icons_size &
+ #for f in $XDG_CONFIG_HOME/conky/*; do
+ #conky -c "$f" &
+ #done
rm -f $HOME/passwords.kdb.lock
keepassx &
transmission-remote-gtk &
- claws-mail &
+ #claws-mail &
+ thunderbird &
+ firefox &
+ steam &
copyq &
#$HOME/git/thetime/src/thetime -t "%F %H:%M:%S" -p 1921,1160 -f "xft:DejaVu Sans:size=10"
}
@@ -47,14 +52,13 @@ autostart () {
# WM
case "$1" in
console)
- openbox &
+ i3 &
sleep 1
urxvt &
;;
- *|openbox)
- openbox &
- sleep 1
+ *)
autostart &
+ exec i3
;;
esac
diff --git a/.zshrc b/.zshrc
index 783c35e..074a54e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -454,7 +454,7 @@ alias aurball='mkaurball -f'
#alias sudo="sudo " #Sudo wont recognize aliases without this
alias s='sudo '
-alias mtr='mtr -t --aslookup'
+alias mtr='mtr -t'
alias wcl='wc -l'
alias mdstat='cat /proc/mdstat'
alias keymap='setxkbmap de -variant nodeadkeys'