From de57a54e54230179017cdea80b8bed47c6042ce6 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 9 Oct 2011 21:17:38 +0200 Subject: [PATCH 01/16] xinitrc: Start ssh-agent if a private SSH key is available. --- xinitrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xinitrc b/xinitrc index 4b578b3..475da6e 100755 --- a/xinitrc +++ b/xinitrc @@ -3,6 +3,12 @@ # startx configuration file. +# Start ssh-agent if we have private keys, thanks to +# http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). +if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then + eval `ssh-agent` +fi + # Use a black background for the root window. xsetroot -solid black -- 2.44.2 From 8971324ee1a41de35f03dc098e10d0a09a12c520 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sat, 14 Jan 2012 15:57:30 +0100 Subject: [PATCH 02/16] .gitignore: Use absolute paths. --- .gitignore | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1504063..a2c06f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Generated with m4 or awk. -Xdefaults +/Xdefaults # Generated by Xmonad. -xmonad.errors -xmonad.hi -xmonad.o -xmonad-* +/xmonad.errors +/xmonad.hi +/xmonad.o +/xmonad-* -- 2.44.2 From 6b98f2955ff87d71a8f2a095bc48481650484746 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sat, 14 Jan 2012 15:59:08 +0100 Subject: [PATCH 03/16] xmonad.hs: Move to new xmonad/ directory. --- .gitignore | 8 ++++---- setup.sh | 2 +- xmonad.hs => xmonad/xmonad.hs | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename xmonad.hs => xmonad/xmonad.hs (100%) diff --git a/.gitignore b/.gitignore index a2c06f3..e7794fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Generated with m4 or awk. /Xdefaults # Generated by Xmonad. -/xmonad.errors -/xmonad.hi -/xmonad.o -/xmonad-* +/xmonad/xmonad.errors +/xmonad/xmonad.hi +/xmonad/xmonad.o +/xmonad/xmonad-* diff --git a/setup.sh b/setup.sh index cce1d19..961e465 100755 --- a/setup.sh +++ b/setup.sh @@ -9,7 +9,7 @@ if installed stumpwm; then link stumpwmrc ~/.stumpwmrc fi if installed xmonad; then - link . ~/.xmonad + link xmonad ~/.xmonad fi if installed X; then diff --git a/xmonad.hs b/xmonad/xmonad.hs similarity index 100% rename from xmonad.hs rename to xmonad/xmonad.hs -- 2.44.2 From bd74707b46ada50095b544c02ad313efeb80b922 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 24 Jan 2012 18:11:02 +0100 Subject: [PATCH 04/16] zathurarc: Add, basic configuration file. --- setup.sh | 4 ++++ zathurarc | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 zathurarc diff --git a/setup.sh b/setup.sh index 961e465..efd7255 100755 --- a/setup.sh +++ b/setup.sh @@ -45,3 +45,7 @@ fi if installed xpdf; then link xpdfrc ~/.xpdfrc fi +if installed zathura; then + mkdir -p ~/.config/zathura + link zathurarc ~/.config/zathura/zathurarc +fi diff --git a/zathurarc b/zathurarc new file mode 100644 index 0000000..4fa53df --- /dev/null +++ b/zathurarc @@ -0,0 +1,25 @@ +# zathura (pdf viewer) configuration file. + + +# SETTINGS + +# Save position and zoom level of opened files. +set save_position true +set save_zoom_level true + +# Don't display status and inputbar for maximum space efficiency. +set show_statusbar false +set show_inputbar false + + +# MAPPINGS + +# Quit zathura. +map q quit + +# Zoom in and out. +map + zoom in +map - zoom out + +# Reload current PDF (in case autoreload doesn't work). +map r reload -- 2.44.2 From 12d6b4f58de78a9874e4632a8e96f0a397fd458d Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 24 Jan 2012 18:17:32 +0100 Subject: [PATCH 05/16] xinitrc: Use absolute path for ssh-agent. --- xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinitrc b/xinitrc index 475da6e..002c4c1 100755 --- a/xinitrc +++ b/xinitrc @@ -6,7 +6,7 @@ # Start ssh-agent if we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then - eval `ssh-agent` + eval `/usr/bin/ssh-agent` fi # Use a black background for the root window. -- 2.44.2 From dafc5b646c2cfd179215e6581d4797354ccc17cb Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 24 Jan 2012 18:18:17 +0100 Subject: [PATCH 06/16] xinitrc: Start ssh-agent with -s. --- xinitrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xinitrc b/xinitrc index 002c4c1..5c4c007 100755 --- a/xinitrc +++ b/xinitrc @@ -6,7 +6,9 @@ # Start ssh-agent if we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then - eval `/usr/bin/ssh-agent` + # -s to force bourne shell output. This file is a bourne shell script even + # if the environment might suggest otherwise. + eval `/usr/bin/ssh-agent -s` fi # Use a black background for the root window. -- 2.44.2 From 80ec2902478cf11da5737951f104f55918837dd7 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 25 Jan 2012 23:51:46 +0100 Subject: [PATCH 07/16] *: License under GPL v3+. --- XCompose | 15 +++++++++++++++ Xdefaults.in | 15 +++++++++++++++ setup.sh | 15 +++++++++++++++ stumpwmrc | 15 +++++++++++++++ xinitrc | 15 +++++++++++++++ xmodmaprc | 15 +++++++++++++++ xmonad/xmonad.hs | 15 +++++++++++++++ xpdfrc | 15 +++++++++++++++ zathurarc | 15 +++++++++++++++ 9 files changed, 135 insertions(+) diff --git a/XCompose b/XCompose index 03c1563..6cfe0e0 100644 --- a/XCompose +++ b/XCompose @@ -2,6 +2,21 @@ # # `man XCompose` for more information. +# Copyright (C) 2011-2012 Simon Ruderich +# +# This file is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . + # Load default compose file. include "%L" diff --git a/Xdefaults.in b/Xdefaults.in index 1713fc3..254b554 100644 --- a/Xdefaults.in +++ b/Xdefaults.in @@ -5,6 +5,21 @@ ! "Term" is an alias for all supported terminal emulators; it is automatically ! replaced by setup.sh. +! Copyright (C) 2011-2012 Simon Ruderich +! +! This file is free software: you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation, either version 3 of the License, or +! (at your option) any later version. +! +! This file is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with this file. If not, see . + ! Use gray on black with a light yellow cursor in terminals. Term*foreground: #cccccc diff --git a/setup.sh b/setup.sh index efd7255..6c500a8 100755 --- a/setup.sh +++ b/setup.sh @@ -2,6 +2,21 @@ # Setup script for X11 configuration files. +# Copyright (C) 2011-2012 Simon Ruderich +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + . ../lib.sh diff --git a/stumpwmrc b/stumpwmrc index 1545d33..a8ac453 100644 --- a/stumpwmrc +++ b/stumpwmrc @@ -1,5 +1,20 @@ ;; Configuration file for Stumpwm. +;; Copyright (C) 2011-2012 Simon Ruderich +;; +;; This file is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; This file is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this file. If not, see . + (in-package :stumpwm) diff --git a/xinitrc b/xinitrc index 5c4c007..7d3fdc6 100755 --- a/xinitrc +++ b/xinitrc @@ -2,6 +2,21 @@ # startx configuration file. +# Copyright (C) 2011-2012 Simon Ruderich +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + # Start ssh-agent if we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). diff --git a/xmodmaprc b/xmodmaprc index 77685ab..7fdda43 100644 --- a/xmodmaprc +++ b/xmodmaprc @@ -1,5 +1,20 @@ ! Keymap configuration file for xmodmap. +! Copyright (C) 2011-2012 Simon Ruderich +! +! This file is free software: you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation, either version 3 of the License, or +! (at your option) any later version. +! +! This file is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with this file. If not, see . + ! Use the caps lock as ctrl as it easier to reach and very useful for all ! programs. Caps lock is removed completely. Thanks to diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index 758a356..73af0bf 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -2,6 +2,21 @@ -- -- Tested with xmonad 0.9, most settings should work fine with xmonad 0.7. +-- Copyright (C) 2011-2012 Simon Ruderich +-- +-- This file is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This file is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this file. If not, see . + -- "hiding" necessary for LayoutCombinators. import XMonad hiding ( (|||) ) diff --git a/xpdfrc b/xpdfrc index 337bf1c..1e069e6 100644 --- a/xpdfrc +++ b/xpdfrc @@ -1,5 +1,20 @@ # xpdf configuration file. +# Copyright (C) 2011-2012 Simon Ruderich +# +# This file is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . + # Include the system wide configuration file as xpdf doesn't load it # automatically if ~/.xpdfrc is present. diff --git a/zathurarc b/zathurarc index 4fa53df..e295150 100644 --- a/zathurarc +++ b/zathurarc @@ -1,5 +1,20 @@ # zathura (pdf viewer) configuration file. +# Copyright (C) 2011-2012 Simon Ruderich +# +# This file is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . + # SETTINGS -- 2.44.2 From 8f330d714255c0bd075fa47f869ab2c1a387aef3 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Fri, 15 Jun 2012 14:41:35 +0200 Subject: [PATCH 08/16] Minor documentation updates. --- Xdefaults.in | 2 +- xinitrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Xdefaults.in b/Xdefaults.in index 254b554..6ab9466 100644 --- a/Xdefaults.in +++ b/Xdefaults.in @@ -26,7 +26,7 @@ Term*foreground: #cccccc Term*background: black Term*cursorColor: #ffff66 -! Disable the scrollback buffer. I use screen so it is not necessary. +! Disable the scrollback buffer. I use screen/tmux so it is not necessary. XTerm*saveLines: 0 Rxvt*saveLines: 0 diff --git a/xinitrc b/xinitrc index 7d3fdc6..3688145 100755 --- a/xinitrc +++ b/xinitrc @@ -50,7 +50,7 @@ if [ -f ~/.background ]; then fi fi -# Display reminders. +# Display timed reminders and recheck the file for changes every minute (-z1). if [ -x /usr/bin/remind -a -f ~/.reminders ]; then remind -z1 -k'.shell/bin/notify.py %s &' ~/.reminders & fi -- 2.44.2 From f08deb1fc626e530287bc140cc6ee9e5c2882d75 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Mon, 15 Oct 2012 21:53:11 +0200 Subject: [PATCH 09/16] xinitrc: Use test instead of [ and $HOME instead of ~. Is a bit more portable and more consistent. --- xinitrc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xinitrc b/xinitrc index 3688145..201e636 100755 --- a/xinitrc +++ b/xinitrc @@ -20,7 +20,7 @@ # Start ssh-agent if we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). -if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then +if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then # -s to force bourne shell output. This file is a bourne shell script even # if the environment might suggest otherwise. eval `/usr/bin/ssh-agent -s` @@ -30,29 +30,29 @@ fi xsetroot -solid black # Force English keyboard layout. -if [ -x /usr/bin/setxkbmap ]; then +if test -x /usr/bin/setxkbmap; then setxkbmap us fi # Use my X11 key bindings. -xmodmap ~/.xmodmaprc +xmodmap "$HOME/.xmodmaprc" # Change the background if available. -if [ -f ~/.background ]; then +if test -f "$HOME/.background"; then # But not on slow machines in the university. HOSTNAME=`hostname` - if [ "x`echo $HOSTNAME | grep faui0sr`" = x ]; then - if [ -x /usr/bin/hsetroot ]; then - hsetroot -full ~/.background - elif [ -x /usr/bin/feh ]; then - feh --bg-scale ~/.background + if test "x`echo $HOSTNAME | grep faui0sr`" = x; then + if test -x /usr/bin/hsetroot; then + hsetroot -full "$HOME/.background" + elif test -x /usr/bin/feh; then + feh --bg-scale "$HOME/.background" fi fi fi # Display timed reminders and recheck the file for changes every minute (-z1). -if [ -x /usr/bin/remind -a -f ~/.reminders ]; then - remind -z1 -k'.shell/bin/notify.py %s &' ~/.reminders & +if test -x /usr/bin/remind && test -f "$HOME/.reminders"; then + remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" & fi # Start XMonad. -- 2.44.2 From 73ff664c0b33699029cab0f6c40c10cc78e90a04 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Mon, 15 Oct 2012 21:56:30 +0200 Subject: [PATCH 10/16] xinitrc: Use ~/.xinitrc.local to disable background images. --- setup.sh | 3 +++ xinitrc | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/setup.sh b/setup.sh index 6c500a8..aa010ff 100755 --- a/setup.sh +++ b/setup.sh @@ -52,6 +52,9 @@ if installed X; then if [ x`os` != xdarwin ]; then link xinitrc ~/.xinitrc fi + if [ -f xinitrc.local ]; then + link xinitrc.local ~/.xinitrc.local + fi link xmodmaprc ~/.xmodmaprc link Xdefaults ~/.Xdefaults link XCompose ~/.XCompose diff --git a/xinitrc b/xinitrc index 201e636..4e5f7bb 100755 --- a/xinitrc +++ b/xinitrc @@ -37,16 +37,20 @@ fi # Use my X11 key bindings. xmodmap "$HOME/.xmodmaprc" +# Default to use a background image. Can be disabled in .xinitrc.local. +set_background=yes + +# Load settings for the local system. +if test -f "$HOME/.xinitrc.local"; then + . "$HOME/.xinitrc.local" +fi + # Change the background if available. -if test -f "$HOME/.background"; then - # But not on slow machines in the university. - HOSTNAME=`hostname` - if test "x`echo $HOSTNAME | grep faui0sr`" = x; then - if test -x /usr/bin/hsetroot; then - hsetroot -full "$HOME/.background" - elif test -x /usr/bin/feh; then - feh --bg-scale "$HOME/.background" - fi +if test -f "$HOME/.background" && test -n $set_background; then + if test -x /usr/bin/hsetroot; then + hsetroot -full "$HOME/.background" + elif test -x /usr/bin/feh; then + feh --bg-scale "$HOME/.background" fi fi -- 2.44.2 From 1a37848cb4f05f30f45c2fea47856f06b9b3f9db Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Mon, 15 Oct 2012 21:57:34 +0200 Subject: [PATCH 11/16] xpdfrc: Zoom to full page on startup. --- xpdfrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xpdfrc b/xpdfrc index 1e069e6..ded779c 100644 --- a/xpdfrc +++ b/xpdfrc @@ -30,5 +30,8 @@ bind j any pageDown bind h any scrollLeft(16) bind l any scrollRight(16) +# Zoom to full page on startup, change to "normal" zoom mode by pressing 0. +initialZoom page + # Use Elinks to open URLs. urlCommand "elinks -remote '%s'" -- 2.44.2 From 389d5f90883aaf3e1cf72709a79e7d5d14ceb4e1 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 16 Oct 2012 07:15:37 +0200 Subject: [PATCH 12/16] Xdefaults: Replace black with #000000 for consistency. --- Xdefaults.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xdefaults.in b/Xdefaults.in index 6ab9466..a554101 100644 --- a/Xdefaults.in +++ b/Xdefaults.in @@ -23,7 +23,7 @@ ! Use gray on black with a light yellow cursor in terminals. Term*foreground: #cccccc -Term*background: black +Term*background: #000000 Term*cursorColor: #ffff66 ! Disable the scrollback buffer. I use screen/tmux so it is not necessary. -- 2.44.2 From 04aaaad802be7ae83a69f3c583b391a9990af33c Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 16 Oct 2012 07:19:56 +0200 Subject: [PATCH 13/16] Xdefaults: Fix alignment in a few places. --- Xdefaults.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Xdefaults.in b/Xdefaults.in index a554101..9ecdaae 100644 --- a/Xdefaults.in +++ b/Xdefaults.in @@ -22,13 +22,13 @@ ! Use gray on black with a light yellow cursor in terminals. -Term*foreground: #cccccc -Term*background: #000000 +Term*foreground: #cccccc +Term*background: #000000 Term*cursorColor: #ffff66 ! Disable the scrollback buffer. I use screen/tmux so it is not necessary. XTerm*saveLines: 0 -Rxvt*saveLines: 0 +Rxvt*saveLines: 0 ! Use the meta-key as expected by emacs/irssi. XTerm*metaSendsEscape: true @@ -43,7 +43,7 @@ XTerm.termName: xterm-256color ! Enable transparency. Rxvt*transparent: true -Rxvt*shading: 10 +Rxvt*shading: 10 ! Do not use any perl extension scripts. Rxvt*perl-ext-common: -- 2.44.2 From b69168d78941ffb5e5a16504a72cb1fa0a2d69ab Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 17 Oct 2012 21:24:07 +0200 Subject: [PATCH 14/16] xinitrc: Set LANG in xinitrc to prevent problems on some systems. --- xinitrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xinitrc b/xinitrc index 4e5f7bb..e434cba 100755 --- a/xinitrc +++ b/xinitrc @@ -18,6 +18,15 @@ # along with this program. If not, see . +# Some systems don't set the LANG environment variable when starting xinitrc, +# this causes problems for rxvt-unicode-256color which fails to display UTF-8 +# characters correctly when LANG is missing and for notify.py which also needs +# LANG set (for Python's decode() function). Therefore set it here, might be +# overwritten by shell setup scripts. +LANG=en_US.UTF-8 +export LANG + + # Start ssh-agent if we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then -- 2.44.2 From 272053303a40c6fc2397452eb4e1bd3d89d627c0 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 4 Nov 2012 16:20:54 +0100 Subject: [PATCH 15/16] xinitrc: Fix background check. The quotes are necessary or test -n always assumes the result is not empty because it gets no parameters (the shell expands $set_background which is empty and then doesn't pass anything to test -n). --- xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinitrc b/xinitrc index e434cba..127683d 100755 --- a/xinitrc +++ b/xinitrc @@ -55,7 +55,7 @@ if test -f "$HOME/.xinitrc.local"; then fi # Change the background if available. -if test -f "$HOME/.background" && test -n $set_background; then +if test -f "$HOME/.background" && test -n "$set_background"; then if test -x /usr/bin/hsetroot; then hsetroot -full "$HOME/.background" elif test -x /usr/bin/feh; then -- 2.44.2 From 1f035fb8c343f1206bdedb2c282536ca6e9aa263 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 4 Nov 2012 16:21:47 +0100 Subject: [PATCH 16/16] xinitrc: Don't create ~/.fehbg when using feh to set the background. --- xinitrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xinitrc b/xinitrc index 127683d..35bbe22 100755 --- a/xinitrc +++ b/xinitrc @@ -60,6 +60,8 @@ if test -f "$HOME/.background" && test -n "$set_background"; then hsetroot -full "$HOME/.background" elif test -x /usr/bin/feh; then feh --bg-scale "$HOME/.background" + # --no-fehbg is only available in recent feh releases. + rm -f "$HOME/.fehbg" fi fi -- 2.44.2