Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts: .xinitrc
This commit is contained in:
commit
69fd0e5aef
6 changed files with 35 additions and 97 deletions
|
|
@ -1,36 +1,30 @@
|
|||
#! /usr/bin/fish
|
||||
|
||||
function fish_prompt -d "Write out the prompt"
|
||||
set last_status $status
|
||||
set current_directory (prompt_pwd)
|
||||
set git_branch (git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
|
||||
set pac_cnt (cat /var/cache/pacman/updates.cnt)
|
||||
set aur_cnt (cat /var/cache/pacman/aur.cnt)
|
||||
set cnormal (set_color white)
|
||||
set last_status $status
|
||||
set current_directory (prompt_pwd)
|
||||
set git_branch (git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
|
||||
set cnormal (set_color white)
|
||||
|
||||
echo -n $cnormal
|
||||
echo -n $cnormal
|
||||
|
||||
if test $pac_cnt -gt 0 -o $aur_cnt -gt 0
|
||||
printf '%s%d%s/%s%d%s:' (set_color cyan) $pac_cnt $cnormal (set_color cyan) $aur_cnt $cnormal
|
||||
end
|
||||
printf '%s%s%s' (set_color magenta) (hostname|cut -d . -f 1) $cnormal
|
||||
|
||||
printf '%s%s%s' (set_color magenta) (hostname|cut -d . -f 1) $cnormal
|
||||
if test -n "$current_directory"
|
||||
printf ' %s%s%s' (set_color $fish_color_cwd) $current_directory $cnormal
|
||||
end
|
||||
|
||||
if test -n "$current_directory"
|
||||
printf ':%s%s%s' (set_color $fish_color_cwd) $current_directory $cnormal
|
||||
end
|
||||
if test -n "$git_branch"
|
||||
printf '@%s%s%s' (set_color yellow) $git_branch $cnormal
|
||||
end
|
||||
|
||||
if test -n "$git_branch"
|
||||
printf '@%s%s%s' (set_color yellow) $git_branch $cnormal
|
||||
end
|
||||
if test $last_status -eq 0
|
||||
printf '%s' (set_color --bold green)
|
||||
else
|
||||
printf '%s' (set_color --bold red)
|
||||
end
|
||||
|
||||
if test $last_status -eq 0
|
||||
printf '%s%s' (set_color --bold green)
|
||||
else
|
||||
printf '%s%s' (set_color --bold red)
|
||||
end
|
||||
|
||||
printf '>%s ' (set_color normal)
|
||||
printf '>%s ' (set_color normal)
|
||||
end
|
||||
|
||||
function cower
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ hc set window_border_normal_color "#15abc3"
|
|||
hc set window_border_active_color "#e0c625"
|
||||
hc set focus_stealing_prevention 0
|
||||
hc set swap_monitors_to_get_tag 0
|
||||
hc set focus_follows_mouse 1
|
||||
|
||||
# Layout
|
||||
hc set default_frame_layout 2
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ http://feeds.feedburner.com/FalloutTutorials devel
|
|||
http://www.devarticles.com/rss.xml devel
|
||||
http://www.script-tutorials.com/feed/rss/
|
||||
http://news.ycombinator.com/rss
|
||||
http://stackoverflow.com/feeds/tag?tagnames=c&sort=newest
|
||||
|
||||
#-----[ Linux and FLOSS ]---------------------------------------------
|
||||
# http://www.reddit.com/r/commandline/.rss linux
|
||||
|
|
|
|||
11
.sawfish/rc
Normal file
11
.sawfish/rc
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
;; -*- mode: sawfish; eval: (git-auto-commit-mode 1); -*-
|
||||
(setq user-apps-menu
|
||||
'(("Emacs" (system "emacsclient -c &"))
|
||||
("Terminal" (system "urxvt &"))))
|
||||
|
||||
(bind-keys global-keymap
|
||||
"C-M-l" '(run-shell-command "i3lock -c \"#000000\"")
|
||||
"Super-e" '(run-shell-command (getenv "EDITOR"))
|
||||
"Super-w" '(run-shell-command (getenv "BROWSER"))
|
||||
"Super-c" '(run-shell-command "urxvt")
|
||||
"Super-TAB" 'cycle-windows)
|
||||
12
.xinitrc
12
.xinitrc
|
|
@ -1,13 +1,13 @@
|
|||
#xmodmap ~/.Xmodmap
|
||||
xmodmap ~/.Xmodmap
|
||||
#xrandr --output VGA1 --mode 1920x1080
|
||||
|
||||
#xsetroot -solid "#002b36"
|
||||
#numlockx &
|
||||
#emacs --daemon &
|
||||
#xbindkeys &
|
||||
xsetroot -solid "#000000"
|
||||
emacs --daemon &
|
||||
|
||||
exec ck-launch-session /usr/bin/herbstluftwm 2>&1 >> ~/.xsession_errors
|
||||
wm=$1
|
||||
test -n "$wm" || wm=herbstluftwm
|
||||
|
||||
exec ck-launch-session $wm
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# eval: (git-auto-commit-mode 1)
|
||||
|
|
|
|||
65
README.org
65
README.org
|
|
@ -1,65 +0,0 @@
|
|||
# -*- eval: (git-auto-commit-mode 1) -*-
|
||||
|
||||
* .Xdefaults
|
||||
|
||||
Currently uses colors from [[http://ethanschoonover.com/solarized][solarized]] theme for everything. Sets
|
||||
other settings for [[http://software.schmorp.de/pkg/rxvt-unicode][urxvt]], [[http://invisible-island.net/xterm/][xterm]], XFT, [[http://www.gnu.org/software/emacs][GNU Emacs]] and ~xfontsel~.
|
||||
|
||||
* .Xmodmap
|
||||
|
||||
I'm a lefty, so this reverses my first 3 mouse buttons. I've also
|
||||
set it up to switch my ~Control~ and ~Caps Lock~, and my ~Shift~ and
|
||||
~Super~ keys (on the left side of my keyboard).
|
||||
|
||||
* .bash_profile
|
||||
|
||||
Sets some environment variables. Even though I use [[http://zsh.sourceforge.net/][zsh]],
|
||||
~.bash_profile~ gets sourced first of all anyway. Currently sets
|
||||
~BROWSER~ and ~EDITOR~ and adds paths to ~INFOPATH~ and ~PATH~.
|
||||
|
||||
* .beetsconfig
|
||||
|
||||
Configuration for [[http://beets.radbox.org/][beets]].
|
||||
|
||||
* .conky_box.lua
|
||||
|
||||
Some lua file to draw a semi-transparent box around [[http://conky.sourceforge.net/][conky]] to keep it
|
||||
readable on every kind of background without fully obscuring that
|
||||
background.
|
||||
|
||||
* .conkyrc
|
||||
|
||||
Configuration for [[http://conky.sourceforge.net/][conky]].
|
||||
|
||||
* .fonts.conf
|
||||
|
||||
Fontconfig file that (in my opinion) gives me some nice looking
|
||||
fonts. I don't really know if I've actually got a good config, but
|
||||
after messing around with parts of it I'm fairly happy with it.
|
||||
|
||||
* .gitconfig
|
||||
|
||||
Configuration for [[http://git-scm.com][git]]. Adds some aliases:
|
||||
|
||||
- ~st~: short status list.
|
||||
- ~unadd~: reset a file or the entire working tree.
|
||||
- ~lschanged~: list files that have changed.
|
||||
- ~history~: Show a graph of the history of a branch.
|
||||
|
||||
* .guile
|
||||
|
||||
Enables ~readline~ functionality in the [[http://www.gnu.org/software/guile/][guile]] REPL.
|
||||
|
||||
* .hgrc
|
||||
|
||||
Configuration for [[http://mercurial.selenic.com/][mercurial]]. Only sets my name/email.
|
||||
|
||||
* .offlineimap.py
|
||||
|
||||
Python function file for [[http://offlineimap.org/][offlineimap]]. Defines a function to get a
|
||||
username and another for password from ~.netrc~.
|
||||
|
||||
* .offlineimap
|
||||
|
||||
Configuration for [[http://offlineimap.org/][offlineimap]]. Calls [[http://www.djcbsoftware.nl/code/mu/][mu]] as a post sync hook to index
|
||||
new mails.
|
||||
Loading…
Reference in a new issue