diff options
-rw-r--r-- | .Xdefaults | 4 | ||||
-rw-r--r-- | .bash_completion | 11 | ||||
-rw-r--r-- | .bash_completion.d/dmount.bashcomp | 7 | ||||
-rw-r--r-- | .bash_completion.d/mupdf.bashcomp | 25 | ||||
-rw-r--r-- | .bash_completion.d/pd.bashcomp | 2 | ||||
l--------- | .bash_completion.d/website.bashcomp | 1 | ||||
-rw-r--r-- | .bash_profile | 10 | ||||
-rw-r--r-- | .gitconfig | 1 | ||||
-rwxr-xr-x | .xinitrc | 13 |
9 files changed, 66 insertions, 8 deletions
@@ -12,8 +12,8 @@ emacs*Foreground: Wheat emacs*pointerColor: White emacs*cursorColor: White emacs*bitmapIcon: on -Emacs.FontBackend: x,xft -emacs*font: inconsolata-9 +!Emacs.FontBackend: x,xft +!emacs*font: inconsolata-9 !emacs*font: -misc-fixed-medium-r-semicondensed-*-*-120-*-*-c-*-iso10646-1 emacs.geometry: 80x25 diff --git a/.bash_completion b/.bash_completion index 4eb8044..0dd54ff 100644 --- a/.bash_completion +++ b/.bash_completion @@ -1,2 +1,9 @@ -_xfunc perl _perldoc -complete -F _perldoc -o bashdefault pm pd +# -*- mode: sh -*- + +bcdir="$HOME/.bash_completion.d" +if [[ -d "$bcdir" && -r "$bcdir" && -x "$bcdir" ]]; then + for i in "$bcdir"/*.bashcomp; do + [[ -f $i && -r $i ]] && . "$i" + done +fi + diff --git a/.bash_completion.d/dmount.bashcomp b/.bash_completion.d/dmount.bashcomp new file mode 100644 index 0000000..7299a9b --- /dev/null +++ b/.bash_completion.d/dmount.bashcomp @@ -0,0 +1,7 @@ +# -*- mode: sh -*- + +_dmount_list() { + COMPREPLY=( $( compgen -W '$(dmount --list)' -- "$2" ) ) +} + +complete -F _dmount_list dmount diff --git a/.bash_completion.d/mupdf.bashcomp b/.bash_completion.d/mupdf.bashcomp new file mode 100644 index 0000000..dd02b65 --- /dev/null +++ b/.bash_completion.d/mupdf.bashcomp @@ -0,0 +1,25 @@ +# mupdf(1) completion -*- shell-script -*- + +_mupdf() +{ + local cur prev words cword split + _init_completion -s || return + + case $prev in + --help*|-h|-p|-r|-W|-H|-S|-U|-x) + return + ;; + esac + + $split && return + + if [[ $cur == -* ]]; then + COMPREPLY=( $( compgen -W '$( _parse_help "$1" --help )' \ + -- "$cur" ) ) + [[ $COMPREPLY == *= ]] && compopt -o nospace + return + fi + + _filedir '@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2|.xz|.XZ)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|epub)' +} && +complete -F _mupdf mupdf diff --git a/.bash_completion.d/pd.bashcomp b/.bash_completion.d/pd.bashcomp new file mode 100644 index 0000000..4eb8044 --- /dev/null +++ b/.bash_completion.d/pd.bashcomp @@ -0,0 +1,2 @@ +_xfunc perl _perldoc +complete -F _perldoc -o bashdefault pm pd diff --git a/.bash_completion.d/website.bashcomp b/.bash_completion.d/website.bashcomp new file mode 120000 index 0000000..cd8d05a --- /dev/null +++ b/.bash_completion.d/website.bashcomp @@ -0,0 +1 @@ +/home/dakkar/website/thenautilus/website.bashcomp
\ No newline at end of file diff --git a/.bash_profile b/.bash_profile index 7cd8fe4..e82048f 100644 --- a/.bash_profile +++ b/.bash_profile @@ -8,7 +8,7 @@ EDITOR=vi export EDITOR source ~/perl5/perlbrew/etc/bashrc -export PATH="${HOME}/bin:${PATH}" +export PATH="${HOME}/bin:${HOME}/.raku/bin:${PATH}" export GPG_TTY="$(tty)" eval "$(keychain --eval --inherit any-once --agents ssh id_rsa id_ed25519)" @@ -44,6 +44,14 @@ function pm() { emacsclient -c -n "$fn" } +function killmerged() { + for b in $(git branch --merged HEAD --no-contains HEAD|grep -vE 'stage|master|svn|develop|uat'); do + b="${b##+( )}" + b="${b%%+( )}" + git branch -d $b && git push origin :$b + done +} + export PERLDOC='-MPod::Text::Color::Delight' fortune @@ -54,3 +54,4 @@ refl = log -g --oneline 'HEAD@{now}' --date=relative st = status -bs tracked = ls-tree -r --name-only --full-name HEAD + stashed = stash list --pretty=format:'%gd: %Cred%h%Creset %Cgreen[%ar]%Creset %gs' @@ -1,7 +1,14 @@ #!/bin/sh + +if [[ -z "$DBUS_SESSION_BUS_ADDRESS" ]]; then + eval $(dbus-launch --exit-with-x11 --sh-syntax) +fi + cd export LC_ALL=en_US.UTF-8 -sudo ./src/hal-automounter/hal-automounter.pl > automount.log 2>&1 & +xset s off +#sudo ./src/hal-automounter/hal-automounter.pl > automount.log 2>&1 & +( . ~/.perlbrew/init && xscreensaver-dbus > xscreensaver-dbus.log 2>&1 & ) gamma 1 xsetroot -solid black #export XMODIFIERS=@im=uim @@ -9,6 +16,7 @@ export GTK_IM_MODULE="xim" xrdb -load .Xdefaults #xset dpms 1800 3600 3600 #uim-xim --engine=anthy & +emacs --bg-daemon --font Monospace </dev/null &>emacs.log & gkrellm & (sleep 3;wpa_gui -t)& ~/bin/mwatch & @@ -16,5 +24,4 @@ xpad & start-pulseaudio-x11 gtk-redshift & -exec dbus-launch --exit-with-session fvwm-crystal - +exec fvwm-crystal |