From 921bfd4d76fb9504ade14775744241e113511389 Mon Sep 17 00:00:00 2001 From: Lars Vierbergen Date: Sat, 9 Sep 2017 16:12:33 +0200 Subject: [PATCH] Change location of password db; Remove config for old touchpad; ssh-agent is started with session automatically --- xmonad-session-rc | 7 +------ xmonad.hs | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/xmonad-session-rc b/xmonad-session-rc index 955b6b2..57abeb9 100644 --- a/xmonad-session-rc +++ b/xmonad-session-rc @@ -1,11 +1,6 @@ #!/bin/bash xrdb -merge .Xresources -# Touchpad -$(syndaemon -d -K -i 0.5s && synclient HorizTwoFingerScroll=1 && synclient TapButton1=1 && synclient TapButton2=3)& - -eval $(ssh-agent) - # Tray applets trayer --edge bottom --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x000000 --alpha 0 --height 17 --monitor primary& xscreensaver -no-splash& @@ -21,7 +16,7 @@ export OOO_FORCE_DESKTOP=gnome # Auto-start applications bash ~/.xmonad/battery-monitor.sh& gajim& -keepass2 ~/Documents/passwords.kdbx& +keepass2 ~/Nextcloud/passwords.kdbx& thunderbird& mate-terminal -e ssh-add ~/.ssh/id_rsa& dropbox start& diff --git a/xmonad.hs b/xmonad.hs index f2ac617..c93eb80 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -85,7 +85,7 @@ main = do } `additionalKeys` [ ((modMask baseConfig .|. controlMask, xK_l), spawn "xscreensaver-command -lock") - , ((mod1Mask .|. controlMask, xK_l), spawn "xscreensaver-command -lock") + , ((mod1Mask .|. controlMask, xK_l), spawn "xscreensaver-command -lock") , ((modMask baseConfig .|. controlMask, xK_s), spawn "systemctl hibernate") -- , ((modMask baseConfig, xK_r), spawn "~/.xmonad/action-manager/command.sh redshift ~/.xmonad/actioncontrol") -- , ((modMask baseConfig, xK_e), spawn "caja")