diff options
Diffstat (limited to '.config')
-rw-r--r-- | .config/X11/clientrc | 5 | ||||
-rw-r--r-- | .config/bash/logout.sh | 2 | ||||
-rw-r--r-- | .config/bash/rc.sh | 5 | ||||
-rw-r--r-- | .config/cron/make-config | 2 | ||||
-rw-r--r-- | .config/irbrc | 3 | ||||
-rw-r--r-- | .config/login.sh | 20 | ||||
-rw-r--r-- | .config/systemd/user/default.target.wants/batterymon.service | 9 | ||||
-rw-r--r-- | .config/systemd/user/default.target.wants/emacs-daemon.service | 9 | ||||
-rw-r--r-- | .config/systemd/user/default.target.wants/gpg-agent.service | 9 |
9 files changed, 43 insertions, 21 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index d1e1725..26455d3 100644 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -4,11 +4,11 @@ # # Executed by startx (run your window manager from here) -if [ -d /etc/X11/xinit/xinitrc.d ]; then +if false && [ -d /etc/X11/xinit/xinitrc.d ]; then echo ' ==> Running scripts in Entering xinitrc.d/*' for f in /etc/X11/xinit/xinitrc.d/*; do echo " -> $f" - [ -x "$f" ] && "$f" & + [ -x "$f" ] && . "$f" done unset f echo ' -> done' @@ -23,5 +23,4 @@ fi # exec startkde # exec startxfce4 # ...or the Window Manager of your choice -#export WMII_CONFPATH="$XDG_CONFIG_HOME/wmii" exec wmii diff --git a/.config/bash/logout.sh b/.config/bash/logout.sh index a8b88c1..de4f5f7 100644 --- a/.config/bash/logout.sh +++ b/.config/bash/logout.sh @@ -5,5 +5,3 @@ if [ "$SHLVL" = 1 ]; then [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q fi - -make -C "$HOME" diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh index 2bf60bc..ab690cf 100644 --- a/.config/bash/rc.sh +++ b/.config/bash/rc.sh @@ -13,7 +13,8 @@ shopt -s checkhash ################################################################################ # History settings -HISTCONTROL=ignoredups +# don't overwrite GNU Midnight Commander's setting of `ignorespace'. +HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups HISTFILE=${XDG_CACHE_HOME}/bash/history HISTTIMEFORMAT='[%Y-%m-%d %H:%M] ' HISTSIZE=5000 @@ -66,7 +67,7 @@ unset make_prompt ################################################################################ -# Load my alaises +# Load my aliases if [[ -f ${XDG_CONFIG_HOME}/bash/aliases.sh ]]; then . ${XDG_CONFIG_HOME}/bash/aliases.sh fi diff --git a/.config/cron/make-config b/.config/cron/make-config index 448475b..6e0fca9 100644 --- a/.config/cron/make-config +++ b/.config/cron/make-config @@ -1,2 +1,2 @@ # m h dom mon dow command -*/5 * * * * . $HOME/.local/lib/path.sh && . $HOME/.local/lib/xdg.sh && make -C $XDG_CONFIG_HOME +*/5 * * * * cronic bash -c '. $HOME/.local/lib/path.sh && . $HOME/.local/lib/xdg.sh && make -C $XDG_CONFIG_HOME' diff --git a/.config/irbrc b/.config/irbrc index 27cce66..cda5ada 100644 --- a/.config/irbrc +++ b/.config/irbrc @@ -1,4 +1,5 @@ +# -*- mode: Ruby -*- require 'rubygems' unless defined? Gem # only needed in 1.8 require 'irb/ext/save-history' IRB.conf[:SAVE_HISTORY] = 5000 -IRB.conf[:HISTORY_FILE] = "#{ENV['XDG_CACHE_HOME']}/irb/history"
\ No newline at end of file +IRB.conf[:HISTORY_FILE] = "#{ENV['XDG_CACHE_HOME']}/irb/history" diff --git a/.config/login.sh b/.config/login.sh index 2687a8e..3c29c99 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -1,6 +1,7 @@ #!/bin/bash # ~/.profile: executed by the command interpreter for login shells. -# Should be whether logging in graphically or not. +# I like that graphical login scripts be configured to load this, so +# it always runs, graphical or not. # # This file should be executable by /bin/sh, but I'm going to assume bash(1) # @@ -27,7 +28,8 @@ export TMPDIR="$HOME/tmp" # XDG ################################################################ . "$HOME/.local/lib/xdg.sh" -ln -sf -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions +mkdir -p -- "$XDG_RUNTIME_DIR/sessions" +ln -sfT -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions # Settings ########################################################### @@ -50,15 +52,10 @@ if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then echo 'login: Setting GPGKEY' export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` fi -if [[ -z "$(pgrep -u `whoami` gpg-agent)" ]] && [[ -n $XDG_RUNTIME_DIR ]] && type gpg-agent &>/dev/null; then - echo 'login: Starting gpg-agent' - mkdir -p "${XDG_RUNTIME_DIR}/sessions" - gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" >/dev/null -fi -if [[ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]]; then +if [[ -f ~/.sessions/gpg ]]; then echo 'login: Setting gpg-agent info:' - cat "${XDG_RUNTIME_DIR}/sessions/gpg" - . "${XDG_RUNTIME_DIR}/sessions/gpg" + cat ~/.sessions/gpg + . ~/.sessions/gpg export GPG_AGENT_INFO #export SSH_AUTH_SOCK fi @@ -76,8 +73,7 @@ export _JAVA_OPTIONS # X11 if [[ -z $XAUTHORITY ]]; then #export XAUTHORITY="$HOME/.Xauthority" - mkdir -p "${XDG_RUNTIME_DIR}/sessions" - export XAUTHORITY="${XDG_RUNTIME_DIR}/sessions/Xauthority" + export XAUTHORITY=$HOME/.sessions/Xauthority fi # D-Bus diff --git a/.config/systemd/user/default.target.wants/batterymon.service b/.config/systemd/user/default.target.wants/batterymon.service new file mode 100644 index 0000000..c8abc0d --- /dev/null +++ b/.config/systemd/user/default.target.wants/batterymon.service @@ -0,0 +1,9 @@ +[Unit] +Description=Battery monitor + +[Service] +Type=simple +ExecStart=/usr/bin/batterymon 20 "amixer sset Master unmute 100%; espeak 'PLUG ME IN'; sleep 7;" + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service new file mode 100644 index 0000000..ef8f65f --- /dev/null +++ b/.config/systemd/user/default.target.wants/emacs-daemon.service @@ -0,0 +1,9 @@ +[Unit] +Description=Emacs deamon + +[Service] +Type=forking +ExecStart=/bin/bash -l -c 'emacs --daemon' + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/default.target.wants/gpg-agent.service b/.config/systemd/user/default.target.wants/gpg-agent.service new file mode 100644 index 0000000..a9de9b2 --- /dev/null +++ b/.config/systemd/user/default.target.wants/gpg-agent.service @@ -0,0 +1,9 @@ +[Unit] +Description="GnuPG agent daemon" + +[Service] +Type=forking +ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${HOME}/.sessions/gpg + +[Install] +WantedBy=default.target |