diff options
| -rw-r--r-- | .config/X11/clientrc | 4 | ||||
| -rw-r--r-- | .config/bash/rc.sh | 1 | ||||
| -rw-r--r-- | .config/irbrc | 1 | ||||
| -rw-r--r-- | .config/login.local.sh | 4 | ||||
| -rw-r--r-- | .config/login.sh | 21 | ||||
| -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 |
8 files changed, 42 insertions, 16 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index c261324..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' diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh index 1661b35..15a9865 100644 --- a/.config/bash/rc.sh +++ b/.config/bash/rc.sh @@ -16,7 +16,6 @@ shopt -s checkhash ################################################################################ # History settings -# don't put duplicate lines in the history. See bash(1) for more options # don't overwrite GNU Midnight Commander's setting of `ignorespace'. HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups HISTFILE=${XDG_CACHE_HOME}/bash/history diff --git a/.config/irbrc b/.config/irbrc index b1029a6..cda5ada 100644 --- a/.config/irbrc +++ b/.config/irbrc @@ -1,3 +1,4 @@ +# -*- mode: Ruby -*- require 'rubygems' unless defined? Gem # only needed in 1.8 require 'irb/ext/save-history' IRB.conf[:SAVE_HISTORY] = 5000 diff --git a/.config/login.local.sh b/.config/login.local.sh new file mode 100644 index 0000000..a01f227 --- /dev/null +++ b/.config/login.local.sh @@ -0,0 +1,4 @@ +# PAM seems to be setting EDITOR... +if [[ $EDITOR = /usr/bin/vi ]]; then + unset EDITOR +fi diff --git a/.config/login.sh b/.config/login.sh index a86f558..4634685 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -44,9 +44,16 @@ fi # XDG ################################################################ . "$HOME/.local/lib/xdg.sh" -mkdir -p "$XDG_RUNTIME_DIR/sessions" +mkdir -p -- "$XDG_RUNTIME_DIR/sessions" ln -sfT -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions + +# Box-specific stuff ################################################# + +if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then + . "$XDG_CONFIG_HOME/login.local.sh" +fi + # Settings ########################################################### # Spell check @@ -55,9 +62,6 @@ if [[ -z "$DICTIONARY" ]] && [[ -n "$LANG" ]]; then fi # Text editor -if [[ $EDITOR = /usr/bin/vi ]]; then - unset EDITOR -fi if [[ -f "$HOME/.selected_editor" ]]; then . "$HOME/.selected_editor" export SELECTED_EDITOR @@ -71,10 +75,6 @@ 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)" ]] && type gpg-agent &>/dev/null; then - echo 'login: Starting gpg-agent' - gpg-agent --daemon --write-env-file ~/.sessions/gpg >/dev/null -fi if [[ -f ~/.sessions/gpg ]]; then echo 'login: Setting gpg-agent info:' cat ~/.sessions/gpg @@ -110,11 +110,6 @@ fi # export DBUS_SESSION_BUS_PID # fi -# Load any box-specific stuff -if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then - . "$XDG_CONFIG_HOME/login.local.sh" -fi - export GOROOT=/homes/shumakl/.prefix.x86_64/go export PATH="/home/luke/perl5/bin:$PATH"; export PERL5LIB="/home/luke/perl5/lib/perl5/i686-linux-thread-multi:/home/luke/perl5/lib/perl5"; 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 |