Permalink
Browse files

Merge branch 'master' of https://github.com/mloskot/archlinux-config

  • Loading branch information...
2 parents e966b35 + 57a2d19 commit 077a392eb140a9c7ad3d4432757bf0746bf8cb50 @mloskot committed Jun 14, 2012
Showing with 63 additions and 9 deletions.
  1. +4 −4 home/mloskot/.bashrc
  2. +24 −0 home/mloskot/.config/gtk-3.0/settings.ini
  3. +9 −5 home/mloskot/.config/i3/config
  4. +3 −0 home/mloskot/.profile
  5. 0 home/mloskot/.vim/{.vim → }/after/ftplugin/cmake.vim
  6. 0 home/mloskot/.vim/{.vim → }/after/ftplugin/m4.vim
  7. 0 home/mloskot/.vim/{.vim → }/autoload/cmakecomplete.vim
  8. 0 home/mloskot/.vim/{.vim → }/autoload/cmakecomplete.vim.orig
  9. 0 home/mloskot/.vim/{.vim → }/autoload/vst/default.css
  10. 0 home/mloskot/.vim/{.vim → }/autoload/vst/lightblue.css
  11. 0 home/mloskot/.vim/{.vim → }/autoload/vst/myhtmlvst.vim
  12. BIN home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/blank.gif
  13. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/framing.css
  14. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/iepngfix.htc
  15. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/opera.css
  16. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/outline.css
  17. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/pretty.css
  18. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/print.css
  19. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/s5-core.css
  20. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/slides.css
  21. 0 home/mloskot/.vim/{.vim → }/autoload/vst/s5ui/slides.js
  22. 0 home/mloskot/.vim/{.vim → }/autoload/vst/vst.vim
  23. 0 home/mloskot/.vim/{.vim → }/colors/adrian.vim
  24. 0 home/mloskot/.vim/{.vim → }/colors/asu1dark.vim
  25. 0 home/mloskot/.vim/{.vim → }/colors/bensday.vim
  26. 0 home/mloskot/.vim/{.vim → }/colors/candycode.vim
  27. 0 home/mloskot/.vim/{.vim → }/colors/desert.vim
  28. 0 home/mloskot/.vim/{.vim → }/colors/herald.vim
  29. 0 home/mloskot/.vim/{.vim → }/colors/kalt.vim
  30. 0 home/mloskot/.vim/{.vim → }/colors/moria.vim
  31. 0 home/mloskot/.vim/{.vim → }/compiler/fpc.vim
  32. 0 home/mloskot/.vim/{.vim → }/doc/alternate.txt
  33. 0 home/mloskot/.vim/{.vim → }/doc/taglist.txt
  34. 0 home/mloskot/.vim/{.vim → }/doc/vst-s5.txt
  35. 0 home/mloskot/.vim/{.vim → }/doc/vst.txt
  36. 0 home/mloskot/.vim/{.vim → }/filetype.vim
  37. 0 home/mloskot/.vim/{.vim → }/indent/javascript.vim
  38. 0 home/mloskot/.vim/{.vim → }/plugin/a.vim
  39. 0 home/mloskot/.vim/{.vim → }/plugin/cmake.vim
  40. 0 home/mloskot/.vim/{.vim → }/plugin/codepad.vim
  41. 0 home/mloskot/.vim/{.vim → }/plugin/jam.vim
  42. 0 home/mloskot/.vim/{.vim → }/plugin/matchit.txt
  43. 0 home/mloskot/.vim/{.vim → }/plugin/matchit.vim
  44. 0 home/mloskot/.vim/{.vim → }/plugin/tabbar.vim
  45. 0 home/mloskot/.vim/{.vim → }/plugin/taglist.vim
  46. 0 home/mloskot/.vim/{.vim → }/plugin/vstplugin.vim
  47. 0 home/mloskot/.vim/{.vim → }/syntax/jquery.vim
  48. +9 −0 home/mloskot/bin/mlacpiinfo.sh
  49. +14 −0 home/mloskot/bin/mlfan.sh
View
@@ -90,7 +90,7 @@ if ${use_color} ; then
if [[ ${EUID} == 0 ]] ; then
PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
else
- PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+ PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \W \$\[\033[00m\] '
fi
# Add handy color-enabled aliases
@@ -105,7 +105,7 @@ else
# show root@ when we do not have colors
PS1='\u@\h \W \$ '
else
- PS1='\u@\h \w \$ '
+ PS1='\u@\h \W \$ '
fi
fi
@@ -157,9 +157,9 @@ if [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]]; then
export GIT_PS1_SHOWUNTRACKEDFILES=1
if ${use_color} ; then
- PS1='\[\e[1;92m\]\u\[\e[m\] \[\e[1;94m\]\w\[\e[m\] \[\e[1;91m\]$(__git_ps1 "(%s)")\[\e[m\]\[\e[1;92m\]\$\[\e[m\] \[\e[0;37m\]'
+ PS1='\[\e[1;92m\]\u\[\e[m\] \[\e[1;94m\]\W\[\e[m\] \[\e[1;91m\]$(__git_ps1 "(%s)")\[\e[m\]\[\e[1;92m\]\$\[\e[m\] \[\e[0;37m\]'
else
- PS1='\u \w $(__git_ps1 "(%s)")\$ '
+ PS1='\u \W $(__git_ps1 "(%s)")\$ '
fi
fi
# }}
@@ -0,0 +1,24 @@
+#
+# .config/gtk-3.0/settings.ini
+#
+# Part of https://github.com/mloskot/archlinux-config
+# Mateusz Loskot <mateusz@loskot.net>
+#
+# Source: https://github.com/iv597/dotz
+#
+[Settings]
+gtk-theme-name = Clearwaita
+gtk-icon-theme-name = oxygen
+gtk-font-name = Droid Sans 10
+gtk-cursor-theme-name = (null)
+gtk-cursor-theme-size = 0
+gtk-toolbar-style = GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size = GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images = 0
+gtk-menu-images = 1
+gtk-enable-event-sounds = 1
+gtk-enable-input-feedback-sounds = 1
+gtk-xft-antialias = 1
+gtk-xft-hinting = 1
+gtk-xft-hintstyle = hintfull
+gtk-xft-rgba = rgb
@@ -17,6 +17,8 @@ set $term urxvtcd
set $browser firefox
set $mua chromium
set $fm thunar
+set $jabber pidgin
+set $xirc xchat
# }}}
# {{{ windows and workspaces orientation, layout and style
@@ -179,15 +181,17 @@ assign [class="Firefox"] 1
assign [class="Chromium"] 1
assign [class="Pidgin"] 1
assign [class="Skype"] 1
-assign [class="thunar"] 2
+assign [class="xchat"] 1
+assign [class="Thunar"] 2
# }}}
# {{{ automatically starting applications on i3 startup
exec volumeicon -b
-exec firefox
-exec chromium
-exec pidgin
-exec thunar
+exec $browser
+exec $mua
+exec $jabber
+exec $fm
+exec $xirc
#exec dropboxd
#exec parcellite
# }}}
View
@@ -21,3 +21,6 @@ if [ -n "$BASH_VERSION" ]; then
. "$HOME/.bashrc"
fi
fi
+
+WWW_HOME=http://www.archlinux.org
+export WWW_HOME
File renamed without changes.
@@ -0,0 +1,9 @@
+#!/bin/sh
+echo "---acpi -V------------------------"
+acpi -V
+echo "---cat fan------------------------"
+cat /proc/acpi/ibm/fan
+echo "---cat thermal--------------------"
+cat /proc/acpi/ibm/thermal
+echo "---hddtemp------------------------"
+sudo hddtemp /dev/sda
View
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Part of https://github.com/mloskot/archlinux-config
+# Mateusz Loskot <mateusz@loskot.net>
+#
+# Original version by Mikito Takada
+# http://blog.mixu.net/2012/01/19/how-to-thinkpad_acpi-and-fan-control-on-arch/
+#
+function fan() {
+ # sensors
+ echo level $@ | sudo tee /proc/acpi/ibm/fan
+}
+
+fan $@

0 comments on commit 077a392

Please sign in to comment.