aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xdefaults2
-rw-r--r--Xresources3
-rw-r--r--bash_aliases11
-rwxr-xr-xconfig/bspwm/bspwmrc2
-rw-r--r--config/sxhkd/sxhkdrc3
-rw-r--r--config/uzbl/config4
-rwxr-xr-xratpoison/firesend2
-rwxr-xr-xratpoison/panel/load2
-rwxr-xr-xratpoison/panel/panel2
-rwxr-xr-xratpoison/panel/panel_bar32
-rwxr-xr-xrtorrent.rc2
-rwxr-xr-xxinitrc2
12 files changed, 38 insertions, 29 deletions
diff --git a/Xdefaults b/Xdefaults
index ee1a11d..07cea3e 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -25,7 +25,7 @@ URxvt.lineSpace: 0
! Fonts
URxvt.allow_bold: true
-URxvt.font: xft:DejaVu Sans Mono:pixelsize=12
+URxvt.font: xft:DejaVu Sans Mono:pixelsize=11
! Fix font space
URxvt*letterSpace: -1
diff --git a/Xresources b/Xresources
index 3d9ea21..0365c8f 100644
--- a/Xresources
+++ b/Xresources
@@ -1,4 +1,5 @@
Xcursor.theme: XcursorHuman
+XTerm*locale: true
*background: #1c1c1c
*foreground: #fdf6e3
@@ -12,7 +13,7 @@ urxvt.scrollBar :false
xterm.scrollBar :false
xterm*faceName: DejaVu Sans Mono Book
-xterm*faceSize: 12
+xterm*faceSize: 11
! Enable copy paste
xterm*metaSendsEscape: true
diff --git a/bash_aliases b/bash_aliases
index bf2c17a..c51ee36 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -12,10 +12,10 @@ alias remouse='sudo modprobe -r bcm5974'
alias enmouse='sudo modprobe bcm5974'
# Notes
-alias physics='vim ~/Dropbox/Notes/Physics/physics.txt'
-alias chemistry='vim ~/Dropbox/Notes/Chemistry/chemistry.txt'
-alias english='vim ~/Dropbox/Notes/English/english.txt'
-alias swedish='vim ~/Dropbox/Notes/Swedish/swedish.txt'
+alias physics='vim ~/Secure/Notes/Physics/physics.txt'
+alias chemistry='vim ~/Secure/Notes/Chemistry/chemistry.txt'
+alias english='vim ~/Secure/Notes/English/english.txt'
+alias swedish='vim ~/Secure/Notes/Swedish/swedish.txt'
#zombify
alias zombify='sudo -u dork /home/vasko/dorknet/dork zombify'
@@ -69,6 +69,9 @@ alias pi='ping google.com'
alias pl='ping 8.8.8.8'
+#msf
+alias msfconsole="msfconsole --quiet -x \"db_connect ${USER}@msf\""
+
# Screen
alias scradmin='$HOME/.ratpoison/screen_run admin'
alias scrschool='$HOME/.ratpoison/screen_run school'
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 6a2b2fe..f3c9e72 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -10,6 +10,8 @@ bspc config focused_border_color $COLOR0
bspc config active_border_color $COLOR0
bspc config normal_border_color $COLOR11
+bspc config top_padding 24
+
bspc config borderless_monocle true
bspc config gapless_monocle true
bspc config apply_floating_atom true
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index bfcfc86..7ee957a 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -2,6 +2,8 @@
# bspwm hotkeys
#
+grave ; a
+ ~/.ratpoison/menu/main
grave ; shift + c
~/.ratpoison/wp change
@@ -66,6 +68,7 @@ grave ; bracket{left,right}
grave ; s ; {h,j,k,l}
bspc window -p {left,down,up,right}
+
grave ; ctrl + {_,shift + }space
bspc {window -p cancel,desktop -c}
diff --git a/config/uzbl/config b/config/uzbl/config
index 5a5c887..0f637f1 100644
--- a/config/uzbl/config
+++ b/config/uzbl/config
@@ -431,8 +431,8 @@ set follow_hint_keys 0123456789
# Fl -> open in a new window
# fL -> take the url and navigate directly to it
# FL -> copy the url to the clipboard
-@cbind f* = spawn @config_home/scripts/follow.sh \@< uzbl.follow.followLinks("\@follow_hint_keys", "%s", 'click') >\@
-@cbind F* = spawn @config_home/scrpts/follow.sh \@< uzbl.follow.followLinks("\@follow_hint_keys", "%s", 'newwindow') >\@
+@cbind f* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followLinks("\@follow_hint_keys", "%s", 'click') >\@
+@cbind F* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followLinks("\@follow_hint_keys", "%s", 'newwindow') >\@
#@cbind fL* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followLinks("\@follow_hint_keys", "%s", 'returnuri') >\@ set
#@cbind FL* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followLinks("\@follow_hint_keys", "%s", 'returnuri') >\@ clipboard
@cbind gi = spawn @scripts_dir/go_input.sh
diff --git a/ratpoison/firesend b/ratpoison/firesend
index ddde2ef..d0df600 100755
--- a/ratpoison/firesend
+++ b/ratpoison/firesend
@@ -1,2 +1,2 @@
#!/bin/bash
-$HOME/.ratpoison/exec_to_workspace 2 firefox --new-tab $@
+$HOME/.ratpoison/exec_to_workspace 2 uzbl-browser $@
diff --git a/ratpoison/panel/load b/ratpoison/panel/load
index 3977bee..a1dbcdb 100755
--- a/ratpoison/panel/load
+++ b/ratpoison/panel/load
@@ -1,6 +1,6 @@
#!/bin/bash
while true; do
-cpu=`mpstat -P ALL 2 1 | grep "Average.*all" | awk '{print $3+$5}'`
+cpu=`mpstat -P ALL 10 1 | grep "Average.*all" | awk '{print $3+$5}'`
mem=`free | grep Mem | awk '{print $3/$2 * 100.0}'`
printf "C%.*f\n" 1 $cpu
printf "R%.*f\n" 0 $mem
diff --git a/ratpoison/panel/panel b/ratpoison/panel/panel
index b998d0b..377bc66 100755
--- a/ratpoison/panel/panel
+++ b/ratpoison/panel/panel
@@ -13,8 +13,8 @@ volume -f 'V%i' > "$PANEL_FIFO" &
battery -i 60 -sf 'B%i' > "$PANEL_FIFO" &
clock -i 60 -sf 'Z%d %a %H:%M' > "$PANEL_FIFO" &
./music > "$PANEL_FIFO" &
+./load > "$PANEL_FIFO" &
#essid -sf 'E%s' -i 30 -w wlp2s0 > "$PANEL_FIFO" &
-# ./load > "$PANEL_FIFO" &
# ./signal > "$PANEL_FIFO" &
diff --git a/ratpoison/panel/panel_bar b/ratpoison/panel/panel_bar
index 24ec723..55f2403 100755
--- a/ratpoison/panel/panel_bar
+++ b/ratpoison/panel/panel_bar
@@ -8,13 +8,13 @@ num_mon=$(bspc query -M | wc -l)
while read -r line ; do
source ./panel_colors
case $line in
-# C*)
-# cpu="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} C:${line#?} %{B-}%{F-}"
-# ;;
-# R*)
-# ram="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} R:${line#?} %{B-}%{F-}"
-# ;;
-#
+ C*)
+ cpu="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} C:${line#?} %{B-}%{F-}"
+ ;;
+ R*)
+ ram="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} R:${line#?} %{B-}%{F-}"
+ ;;
+
# S*)
# signal="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} S:${line#?} %{B-}%{F-}"
# ;;
@@ -47,14 +47,14 @@ source ./panel_colors
volume="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} V:${line#?} %{B-}%{F-}"
;;
-# E*)
-# # essid output
-# if [ -z ${line#?} ];then
-# essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:No WiFi %{B-}%{F-}"
-# else
-# essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:${line#?} %{B-}%{F-}"
-# fi
-# ;;
+ E*)
+ # essid output
+ if [ -z ${line#?} ];then
+ essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:No WiFi %{B-}%{F-}"
+ else
+ essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:${line#?} %{B-}%{F-}"
+ fi
+ ;;
Z*)
# clock output
@@ -119,5 +119,5 @@ source ./panel_colors
;;
esac
# printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos} "
- printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${volume}${musicvol}${battery}${time_infos} "
+ printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos} "
done
diff --git a/rtorrent.rc b/rtorrent.rc
index 831e92d..9efd38f 100755
--- a/rtorrent.rc
+++ b/rtorrent.rc
@@ -90,4 +90,4 @@ dht = off
# Enable peer exchange (for torrents not marked private)
#
- peer_exchange = yes
+ peer_exchange = no
diff --git a/xinitrc b/xinitrc
index e71ae25..d415471 100755
--- a/xinitrc
+++ b/xinitrc
@@ -44,7 +44,7 @@ dropboxd &
setxkbmap us -variant colemak
xcape -t 300 -e 'Shift_L=parenleft;Shift_R=parenright;Hyper_L=Shift_L|exclam;Hyper_R=Shift_L|question' &
xset r 64
-xset r rate 180 40
+xset r rate 150 100
xset m 0 0
xset -b