1. totte
  2. configurations

Commits

totte  committed cf19703

Testing GPG-signing...

  • Participants
  • Parent commits bbc555b
  • Branches master

Comments (0)

Files changed (5)

File .xinitrc

View file
   unset f
 fi
 
+# Kwallet
+kwalletd &
+
+# Keychain (SSH & GPG)
+eval `keychain --eval id_rsa 1A6E3377` &
+
 # Hide mouse cursor when idle
 unclutter -idle 4 &
 
 # Background image
 hsetroot -fill $HOME/img/08.jpg &
 
+# Akonadi
+akonadictl start &
+
+# Music Player Daemon
+mpd &
+
 # Window manager
 xmonad

File .xmonad/xmonad.hs

View file
 import qualified XMonad.StackSet as W
 import qualified Data.Map as M
 
-myTerminal			=   "konsole"
-myBorderWidth			=   4
-myModMask			=   mod4Mask
-myWorkspaces			=   ["ZSH","VIM","QTC","WEB","IRC","PIM","MSC","LOG","SYS","NET"]
-myNormalBorderColor		=   "#080808"
-myFocusedBorderColor	        =   "#080808"
+myTerminal              =   "konsole"
+myBorderWidth           =   4
+myModMask               =   mod4Mask
+myWorkspaces            =   ["ZSH","VIM","QTC","WEB","IRC","PIM","MSC","LOG","SYS","NET"]
+myNormalBorderColor     =   "#080808"
+myFocusedBorderColor    =   "#080808"
 
 --------------------------------------------------------------------------------------
 -- Key bindings
 --------------------------------------------------------------------------------------
 
 myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
-	[
-                ((modm, xK_Tab), sendMessage NextLayout),
-		((modm, xK_q), spawn "slock"),
-                ((modm .|. shiftMask, xK_q), io (exitWith ExitSuccess)),
-		((modm, xK_r), spawn "xmonad --recompile; xmonad --restart"),
-		((modm, xK_Return), spawn $ XMonad.terminal conf),
-		((modm, xK_n), prevWS),
-		((modm .|. shiftMask, xK_n), shiftToPrev >> prevWS),
-                ((modm, xK_e), windows W.focusDown),            -- Move focus to the previous window
-		((modm, xK_i), windows W.focusUp),              -- Move focus to the next window
-		((modm, xK_o), nextWS),
-		((modm .|. shiftMask, xK_o), shiftToNext >> nextWS),
-                ((modm, xK_k), kill),                           -- close focused window
-		((modm, xK_m), windows W.swapMaster),           -- Make focused window master window
-		((modm, xK_comma), sendMessage Shrink),         -- Shrink the master area
-		((modm, xK_period), sendMessage Expand),        -- Expand the master area
-		((modm, xK_space), spawn "~/bin/drunner.sh")
-	]
+    [
+        ((modm, xK_Tab), sendMessage NextLayout),
+        ((modm, xK_q), spawn "slock"),
+        ((modm .|. shiftMask, xK_q), io (exitWith ExitSuccess)),
+        ((modm, xK_r), spawn "xmonad --recompile; xmonad --restart"),
+        ((modm, xK_Return), spawn $ XMonad.terminal conf),
+        ((modm, xK_n), prevWS),
+        ((modm .|. shiftMask, xK_n), shiftToPrev >> prevWS),
+        ((modm, xK_e), windows W.focusDown),            -- Move focus to the previous window
+        ((modm, xK_i), windows W.focusUp),              -- Move focus to the next window
+        ((modm, xK_o), nextWS),
+        ((modm .|. shiftMask, xK_o), shiftToNext >> nextWS),
+        ((modm, xK_k), kill),                           -- close focused window
+        ((modm, xK_m), windows W.swapMaster),           -- Make focused window master window
+        ((modm, xK_comma), sendMessage Shrink),         -- Shrink the master area
+        ((modm, xK_period), sendMessage Expand),        -- Expand the master area
+        ((modm, xK_space), spawn "~/bin/drunner.sh")
+    ]
     ++
-
     -- mod-[1..9], Switch to workspace N
     -- mod-shift-[1..9], Move client to workspace N
     [((m .|. modm, k), windows $ f i)
-        | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
-        , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
+    | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
+    , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
 
 --------------------------------------------------------------------------------------
 -- Mouse bindings
 --------------------------------------------------------------------------------------
 
 myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $
-	[
-		((modm, button1), (\w -> focus w >> mouseMoveWindow w
-										 >> windows W.shiftMaster)), -- float and move window
-		((modm, button2), (\w -> focus w >> windows W.shiftMaster)), -- raise window
-		((modm, button3), (\w -> focus w >> mouseResizeWindow w
-										 >> windows W.shiftMaster)) -- float and resize window
-	]
+    [
+        ((modm, button1), (\w -> focus w >> mouseMoveWindow w
+            >> windows W.shiftMaster)), -- float and move window
+        ((modm, button2), (\w -> focus w >> windows W.shiftMaster)), -- raise window
+        ((modm, button3), (\w -> focus w >> mouseResizeWindow w
+            >> windows W.shiftMaster)) -- float and resize window
+    ]
 
 --------------------------------------------------------------------------------------
 -- Layouts
 --------------------------------------------------------------------------------------
 
 myFocus = gaps [(L,256), (R,256)] $ spacing 4 $ limitWindows 2 $ Dishes nmaster ratio
-	where
-		-- The default number of windows in the master pane
-		nmaster = 1
-		-- Default proportion of screen occupied by other panes
-		ratio = 1/5
+    where
+        -- The default number of windows in the master pane
+        nmaster = 1
+        -- Default proportion of screen occupied by other panes
+        ratio = 1/5
 
 myFull = Full
 
 myDiscs = spacing 4 $ limitWindows 5 $ Dishes nmaster ratio
-	where
-		-- The default number of windows in the master pane
-		nmaster = 1
-		-- Default proportion of screen occupied by other panes
-		ratio = 1/5
+    where
+        -- The default number of windows in the master pane
+        nmaster = 1
+        -- Default proportion of screen occupied by other panes
+        ratio = 1/5
 
 myLayout =
-	avoidStruts $
-	noBorders (renamed [Replace "Full"] myFull) ||| renamed [Replace "Focus"] myFocus ||| renamed [Replace "Discs"] myDiscs
+    avoidStruts $
+    noBorders (renamed [Replace "Full"] myFull) ||| renamed [Replace "Focus"] myFocus ||| renamed [Replace "Discs"] myDiscs
 
 --------------------------------------------------------------------------------------
 -- Window rules
 --------------------------------------------------------------------------------------
 
 myManageHook = composeAll
-	[
-		className =? "MPlayer" --> doFloat,
-		className =? "Gimp" --> doFloat
-	]
+    [
+        className =? "MPlayer" --> doFloat,
+        className =? "Gimp" --> doFloat
+    ]
 
 --------------------------------------------------------------------------------------
 -- Statusbar
 
 myBar = "xmobar"
 myPP = xmobarPP
-		{
-			ppCurrent = wrap "<fc=#ffffff,#0055FF> " " </fc>",
-			ppVisible = xmobarColor "#ff0000" "",
-			ppHidden = xmobarColor "#646464" "",
-			ppHiddenNoWindows = xmobarColor "#646464" "",
-			ppUrgent = xmobarColor "#ff0000" "",
-			ppTitle = xmobarColor "#ffffff" "" . shorten 64,
-			ppLayout = xmobarColor "#aaaaaa" "",
-			ppSep = " » ",
-			ppWsSep = " "
-		}
+    {
+        ppCurrent = wrap "<fc=#ffffff,#0055FF> " " </fc>",
+        ppVisible = xmobarColor "#ff0000" "",
+        ppHidden = xmobarColor "#646464" "",
+        ppHiddenNoWindows = xmobarColor "#646464" "",
+        ppUrgent = xmobarColor "#ff0000" "",
+        ppTitle = xmobarColor "#ffffff" "" . shorten 64,
+        ppLayout = xmobarColor "#aaaaaa" "",
+        ppSep = " » ",
+        ppWsSep = " "
+    }
 
 --------------------------------------------------------------------------------------
 -- Run XMonad
 main = xmonad =<< statusBar myBar myPP (\c -> (modMask c, xK_b)) myConfig
 
 myConfig = defaultConfig
-	{
-		terminal = myTerminal,
-		borderWidth = myBorderWidth,
-		modMask = myModMask,
-		workspaces = myWorkspaces,
-		normalBorderColor = myNormalBorderColor,
-		focusedBorderColor = myFocusedBorderColor,
-		keys = myKeys,
-		mouseBindings = myMouseBindings,
-		layoutHook = myLayout,
-		manageHook = myManageHook
-	}
+    {
+        terminal = myTerminal,
+        borderWidth = myBorderWidth,
+        modMask = myModMask,
+        workspaces = myWorkspaces,
+        normalBorderColor = myNormalBorderColor,
+        focusedBorderColor = myFocusedBorderColor,
+        keys = myKeys,
+        mouseBindings = myMouseBindings,
+        layoutHook = myLayout,
+        manageHook = myManageHook
+    }

File .zprofile

View file
-# MacPorts (precompiled, from http://www.macports.org/)
-#  coreutils 8.19_0 (symlinks without the 'g' prefix in /opt/local/libexec/gnubin)
-#  tmux 1.6_1
-#  zsh 5.0.0_0
-PATH1="/opt/local/bin:/opt/local/libexec/gnubin"
-
-# Default OS X binaries
-PATH2="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
-
-# Git (precompiled, from http://git-scm.com/)
-PATH3="/usr/local/git/bin"
-
-# Python 3.2.3 32- and 64-bit (precompiled, from http://www.python.org/download/releases/3.2.3/)
-#  distribute (curl http://python-distribute.org/distribute_setup.py | python3)
-#  pip 1.2.1 (curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py | python3)
-#   flake8 (pipi flake8)
-#   pytest (pipi pytest)
-#   virtualenv (pipi virtualenv)
-PATH4="/Library/Frameworks/Python.framework/Versions/3.2/bin"
-
-# ~/bin
-PATH5="$HOME/bin"
-
-export PATH="$PATH1:$PATH2:$PATH3:$PATH4:$PATH5"
+export EDITOR='vim'
+export GIT_EDITOR='vim -fg'
+export GPG_TTY=$(tty)
+export GREP_COLOR='1;34'
+export GREP_OPTIONS='--color=auto'
+export LANG='en_GB.UTF-8'
+export PAGER='less'
+export PINENTRY='/usr/bin/pinentry-kwallet'
+export SSH_ASKPASS='/usr/bin/ksshaskpass'
+export VISUAL='vim'

File .zprofile.osx

View file
+# MacPorts (precompiled, from http://www.macports.org/)
+#  coreutils 8.19_0 (symlinks without the 'g' prefix in /opt/local/libexec/gnubin)
+#  tmux 1.6_1
+#  zsh 5.0.0_0
+PATH1="/opt/local/bin:/opt/local/libexec/gnubin"
+
+# Default OS X binaries
+PATH2="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
+
+# Git (precompiled, from http://git-scm.com/)
+PATH3="/usr/local/git/bin"
+
+# Python 3.2.3 32- and 64-bit (precompiled, from http://www.python.org/download/releases/3.2.3/)
+#  distribute (curl http://python-distribute.org/distribute_setup.py | python3)
+#  pip 1.2.1 (curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py | python3)
+#   flake8 (pipi flake8)
+#   pytest (pipi pytest)
+#   virtualenv (pipi virtualenv)
+PATH4="/Library/Frameworks/Python.framework/Versions/3.2/bin"
+
+# ~/bin
+PATH5="$HOME/bin"
+
+export PATH="$PATH1:$PATH2:$PATH3:$PATH4:$PATH5"
+
+# MacVim (snapshot 61 on OS X 10.6.8) seems to need the path being set in
+# ~/.zprofile, see https://github.com/b4winckler/macvim/wiki/Troubleshooting,
+# "For zsh users". There was no /etc/zshenv on my system, only /etc/zprofile.
+# I ran:
+#   sudo defaults write org.vim.MacVim MMLoginShellCommand "/usr/local/zsh"
+# but it had no visible effect. I then copied the path setting in .zshrc to
+# .zprofile and it solved the issue. Despite setting $PATH twice the paths only
+# appear once, not twice.

File .zshrc

View file
 #-------------------------------------------------------------------------------------
 # PATH
 #-------------------------------------------------------------------------------------
-if [[ ${HOST:r} == "embepe" ]]; then
-    # MacPorts (precompiled, from http://www.macports.org/)
-    #  coreutils 8.19_0 (symlinks without the 'g' prefix in /opt/local/libexec/gnubin)
-    #  tmux 1.6_1
-    #  zsh 5.0.0_0
-    PATH1="/opt/local/bin:/opt/local/libexec/gnubin"
 
-    # Default OS X binaries
-    PATH2="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
+# System binaries
+PATH0="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
 
-    # Git (precompiled, from http://git-scm.com/)
-    PATH3="/usr/local/git/bin"
+# My binaries
+PATH1="$HOME/bin"
 
-    # Python 3.2.3 32- and 64-bit (precompiled, from http://www.python.org/download/releases/3.2.3/)
-    #  distribute (curl http://python-distribute.org/distribute_setup.py | python3)
-    #  pip 1.2.1 (curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py | python3)
-    #   flake8 (pipi flake8)
-    #   pytest (pipi pytest)
-    #   virtualenv (pipi virtualenv)
-    PATH4="/Library/Frameworks/Python.framework/Versions/3.2/bin"
-
-    # ~/bin
-    PATH5="$HOME/bin"
-
-    export PATH="$PATH1:$PATH2:$PATH3:$PATH4:$PATH5"
-
-    # MacVim (snapshot 61 on OS X 10.6.8) seems to need the path being set in
-    # ~/.zprofile, see https://github.com/b4winckler/macvim/wiki/Troubleshooting,
-    # "For zsh users". There was no /etc/zshenv on my system, only /etc/zprofile.
-    # I ran:
-    #   sudo defaults write org.vim.MacVim MMLoginShellCommand "/usr/local/zsh"
-    # but it had no visible effect. I then copied the path setting in .zshrc to
-    # .zprofile and it solved the issue. Despite setting $PATH twice the paths only
-    # appear once, not twice.
-elif [[ ${HOST:r} != "embepe" ]]; then
-    # Default binaries
-    PATH1="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
-
-    # Git
-    PATH2="/usr/local/git/bin"
-
-    # ~/bin
-    PATH3="$HOME/bin"
-
-    export PATH="$PATH1:$PATH2:$PATH3"
-fi
+export PATH="$PATH0:$PATH1"
 
 #-------------------------------------------------------------------------------------
 # COLOURS
 #-------------------------------------------------------------------------------------
 # GENERAL
 #-------------------------------------------------------------------------------------
-export PAGER=less
-export EDITOR=vim
-export VISUAL=vim
-export LANG=en_GB.UTF-8
-export GPG_TTY=$(tty)
-export GREP_OPTIONS='--color=auto'
-export GREP_COLOR='1;34'
 HISTFILE=$HOME/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000
 setopt always_to_end
 setopt extendedglob
 
-if [[ ${HOST:r} == "embepe" ]]; then
-    export GIT_EDITOR='mvim -fg'
-elif [[ ${HOST:r} != "embepe" ]]; then
-    export GIT_EDITOR='vim -fg'
-fi
-
 #-------------------------------------------------------------------------------------
 # ALIASES
 #-------------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------------
 bindkey '^[[A' history-beginning-search-backward
 bindkey '^[[B' history-beginning-search-forward
-
 bindkey "^[[H" beginning-of-line
 bindkey "^[[1~" beginning-of-line
 bindkey "^[OH" beginning-of-line