changed theme

10 files changed, 67 insertions, 27 deletions

diff --git a/.Xresources b/.Xresources
index 91721b8..e81fc18 100644
--- a/.Xresources
+++ b/.Xresources
@@ -10,7 +10,7 @@ URxvt*buffered: on
 ! URxvt*geometry: geom
 
 ! Use the specified colour as the windows background colour [default White]; option -bg.
-URxvt*background: #080808
+URxvt*background: #171717
 
 ! Use the specified colour as the windows foreground colour [default Black]; option -fg.
 URxvt*foreground: #FEFEFE
@@ -226,10 +226,10 @@ URxvt*cursorBlink: true
 ! URxvt*{|}
 
 ! OverTheSpot, OffTheSpot, Root; option -pt.
-URxvt*preeditType: OverTheSpot
+!URxvt*preeditType: OverTheSpot
 
 ! name of inputMethod to use; option -im.
-URxvt*inputMethod: ibus
+!URxvt*inputMethod: ibus
 
 ! The locale to use for opening the IM. You can use an "LC_CTYPE" of e.g.  "de_DE.UTF-8" for normal text processing but "ja_JP.EUC-JP" for the input extension
 ! URxvt*imLocale: name
diff --git a/.bashrc b/.bashrc
index 6569a3e..f5d894d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -14,14 +14,6 @@
 
 shopt -s checkwinsize
 
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-alias diff='colordiff'
-alias less='less -R'
-alias vmount='udevil mount'
-alias vumount='udevil umount'
-alias def='sdcv'
-
 PS1='[\u@\h \W]\$ '
 PS2='> '
 PS3='> '
@@ -40,6 +32,29 @@ esac
 
 export EDITOR="vim"
 export PAGER="less -R"
-export GTK_IM_MODULE="ibus"
-export XMODIFIERS="@im=ibus"
-export QT_IM_MODULE="ibus"
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+alias diff='colordiff'
+alias less='less -R'
+
+alias vmount='udevil mount'
+alias vumount='udevil umount'
+alias def='sdcv'
+
+send() {
+	scp $@ shmibbles.me:/srv/http/tmp/
+	for name in "$@"
+	do
+		echo "http://shmibbles.me/tmp/$(basename $name)" | xclip -i -selection clipboard
+	done
+}
+
+sendi() {
+	scp $@ shmibbles.me:/srv/http/img/
+	for name in "$@"
+	do
+		echo "http://shmibbles.me/img/$(basename $name)" | xclip -i -selection clipboard
+	done
+}
+
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 8c8cab2..f445550 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -125,7 +125,7 @@
 
 [frame]
     width = 1
-    color = "#d64937"
+    color = "#a6754c"
 
 [shortcuts]
     # shortcuts are specified as [modifier+][modifier+]...key
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index ee2994c..e543bb9 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -1,9 +1,13 @@
 #!/bin/bash
 
 # define colours
-bg_normal='#2d2d2d'
+#bg_normal='#2d2d2d'
+#fg_normal='#dcdcdc'
+#bg_focus='#d64937'
+#fg_focus='#fcfcfc'
+bg_normal='#2b2b2b'
 fg_normal='#dcdcdc'
-bg_focus='#d64937'
+bg_focus='#a6754c'
 fg_focus='#fcfcfc'
 
 hc() {
@@ -99,6 +103,8 @@ hc keybind Mod4-i jumpto urgent
 
 ################ launchers ################
 
+# tegaki
+hc keybind Mod4-r spawn tegaki-recognize
 # mate
 hc keybind XF86PowerOff spawn mate-session-save --shutdown-dialog
 hc keybind Mod1-XF86PowerOff spawn mate-session-save --shutdown-dialog
@@ -175,7 +181,7 @@ hc rule focus=on
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK)' manage=off
 # set apppropriate things to pseudotile
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on focus=on
-hc rule class~'(Gcalctool|Pcsx2|Tilem2)' pseudotile=on focus=on
+hc rule class~'(milkytracker|goattrk2|FTL|Tegaki-recognize|Gcalctool|Pcsx2|Tilem2)' pseudotile=on focus=on
 
 # unlock, just to be sure
 hc unlock
diff --git a/.config/nitrogen/bg-saved.cfg b/.config/nitrogen/bg-saved.cfg
index fc0c8b6..5771f74 100644
--- a/.config/nitrogen/bg-saved.cfg
+++ b/.config/nitrogen/bg-saved.cfg
@@ -1,4 +1,4 @@
 [:0.0]
-file=/home/shmibs/backdrops/hachimaka.jpg
+file=/home/shmibs/backdrops/haibane_renmei_rakka_looking_back_yoshitoshi_desktop_2884x1622_hd-wallpaper-696403-shifted.jpg
 mode=5
 bgcolor=#000000
diff --git a/.config/nitrogen/nitrogen.cfg b/.config/nitrogen/nitrogen.cfg
index 33f9902..9a87a10 100644
--- a/.config/nitrogen/nitrogen.cfg
+++ b/.config/nitrogen/nitrogen.cfg
@@ -1,8 +1,8 @@
 [geometry]
 posx=0
 posy=18
-sizex=1916
-sizey=1058
+sizex=1920
+sizey=1062
 
 [nitrogen]
 view=icon
diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf
index 4f4fa98..16386da 100644
--- a/.config/ranger/rifle.conf
+++ b/.config/ranger/rifle.conf
@@ -120,7 +120,7 @@ ext xcf,                 X, flag f = gimp -- "$@"
 #-------------------------------------------
 # Documents
 #-------------------------------------------
-ext pdf, has zathura,  X, flag f = zathura -- "$@"
+ext pdf|ps, has zathura,  X, flag f = zathura -- "$@"
 
 ext docx?, has catdoc,       terminal = catdoc -- "$@" | "$PAGER"
 
diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler
index 50dcfc7..6dbf6b6 100755
--- a/.config/sxiv/exec/key-handler
+++ b/.config/sxiv/exec/key-handler
@@ -11,4 +11,18 @@ case "$1" in
         rm "$2" ;;
 "g")
         gimp "$2" & ;;
+"s")
+
+	scp "$2" shmibbles.me:/srv/http/tmp/
+	echo "http://shmibbles.me/tmp/$(basename $2)" | xclip -i -selection clipboard
+	echo "http://shmibbles.me/tmp/$(basename $2)" | xclip -i -selection primary
+	notify-send "uploaded $(basename $2) to /tmp/"
+	;;
+"i")
+	scp "$2" shmibbles.me:/srv/http/img/
+	echo "http://shmibbles.me/img/$(basename $2)" | xclip -i -selection clipboard
+	echo "http://shmibbles.me/img/$(basename $2)" | xclip -i -selection primary
+	notify-send "uploaded $(basename $2) to /img/"
+	;;
+
 esac
diff --git a/.vimrc b/.vimrc
index e6ef45f..d1b1a63 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,7 +3,7 @@ filetype plugin on
 set autoindent
 
 "colours!
-colorscheme calmar256-dark
+colorscheme anotherdark
 set background=dark
 
 "tab controls to match pentadactyl
@@ -57,7 +57,7 @@ let g:c_no_if0_fold = 1
 "other filetype-specific settings. i can't figure out how to stick all
 "the FileTypes in one list (mostly because i have no idea what i'm
 "doing with viml), so separate lines it is.
-autocmd FileType c   call Settings_c()
+autocmd FileType c call Settings_c()
 autocmd FileType cpp call Settings_c()
 autocmd FileType perl call Settings_perl()
 
@@ -69,4 +69,3 @@ endfunction
 function! Settings_perl()
 	setlocal smartindent
 endfunction
-
diff --git a/.xinitrc b/.xinitrc
index 7197b19..0119fc7 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,6 +10,12 @@ then
 	xmodmap ~/.Xmodmap
 fi
 
+#input!
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export XMODIFIERS="@im=fcitx"
+fcitx &
+
 #urxvt daemon
 urxvtd &
 
@@ -20,8 +26,8 @@ then
 fi
 
 xsetroot -cursor_name left_ptr
-compton -b -o 0.8 -r 10 -l -10 -t -10 --backend glx --paint-on-overlay &
-ibus-daemon -x &
+compton -b --backend glx --vsync opengl &
+#ibus-daemon -x &
 nitrogen --restore &
 
 exec mate-session