Merge branch 'master' of github.com:IvanMalison/dotfiles

dotfiles/config/sparkleshare/config.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sparkleshare>
+  <user>
+    <name>Ivan Malison</name>
+    <email>IvanMalison@gmail.com</email>
+  </user>
+  <notifications>True</notifications>
+  <folder>
+    <name>org</name>
+    <identifier>a6a8820b6d7b59f782ea6b9995b6b3b141877498</identifier>
+    <url>ssh://git@bitbucket.org/ivanmalison/org.git</url>
+    <backend>Git</backend>
+  </folder>
+  <folder>
+    <name>config</name>
+    <identifier>66e07b6027eecec90670e4b608dcd6ec7d51f5d9</identifier>
+    <url>ssh://git@bitbucket.org/ivanmalison/config</url>
+    <backend>Git</backend>
+  </folder>
+</sparkleshare>

dotfiles/config/systemd/user/keepassx.service

@@ -5,8 +5,8 @@ After=taffybar.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/keepassx "$HOME/SparkleShare/config/creds/keepass.key" "$HOME/SparkleShare/config/db.kdbx"
-ExecStop=/usr/bin/pkill keepassx
+ExecStart=/usr/bin/env keepassxc --keyfile="$HOME/SparkleShare/config/creds/keepass.key" "$HOME/SparkleShare/config/db.kdbx"
+ExecStop=/usr/bin/pkill keepassxc
 
 [Install]
 WantedBy=wm.target

dotfiles/config/taffybar/taffybar.hs

@@ -36,7 +36,7 @@ main = do
   defaultTaffybar defaultTaffybarConfig { startWidgets = [ pager ]
                                         , endWidgets = [ tray, clock, mem, cpu, mpris ]
                                         , monitorNumber = 1
-                                        , barPosition = Bottom
+                                        , barPosition = Top
                                         }
 
 -- Local Variables:

dotfiles/emacs.d/README.org

@@ -4720,13 +4720,17 @@ load-theme hook (See the heading below).
   (load-theme imalison:dark-theme t)
   (spaceline-compile)
   (imalison:remove-fringe-and-hl-line-mode))
+#+END_SRC
+*** Hooks to set everything up
+#+BEGIN_SRC emacs-lisp
+(defun imalison:initial-setup-hook (&rest args)
+  (apply 'imalison:appearance args)
+  (remove-hook 'after-make-frame-functions 'imalison:initial-setup-hook))
 
 ;; This is needed because you can't set the font or theme at daemon start-up.
 ;; (when (display-graphic-p) (imalison:appearance))
 (add-hook 'after-init-hook 'imalison:appearance)
-(add-hook 'after-make-frame-functions 'imalison:appearance)
-;; TODO/XXX: why do we immediately remove this hook?
-(remove-hook 'after-make-frame-functions 'imalison:appearance)
+(add-hook 'after-make-frame-functions 'imalison:initial-setup-hook)
 #+END_SRC
 * Post Init Custom
 #+BEGIN_SRC emacs-lisp

dotfiles/lib/bin/rofi_kill_process.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env zsh
+
+ps -o 'pid cmd' x | rofi -dmenu -i | get_cols 1 | xargs kill -9

dotfiles/lib/bin/start_keepass.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env sh
-restart.sh keepassxc "$HOME/SparkleShare/config/db.kdbx" --keyfile "$HOME/SparkleShare/config/creds/keepass.key"

dotfiles/lib/shellpath.sh

@@ -21,7 +21,7 @@ function _setup_env {
     _tex_setup
 
     # This makes systemd aware of change to $PATH
-    run_if_exists systemctl --user import-environment PATH
+    run_if_exists systemctl --user import-environment PATH DISPLAY XAUTHORITY HOME
     export ENVIRONMENT_SETUP_DONE="$(date)"
 }
 

dotfiles/xmonad/xmonad.hs

@@ -411,11 +411,11 @@ shiftToNextScreen = withWindowSet $ \ws ->
 addKeys conf@XConfig {modMask = modm} =
     [ ((modm, xK_p), spawn "rofi -show drun")
     , ((modm .|. shiftMask, xK_p), spawn "rofi -show run")
-    , ((modm, xK_g), andDeactivateFull $ maybeUnminimizeAfter $
+    , ((modm, xK_g), andDeactivateFull . maybeUnminimizeAfter $
                    actionMenu myWindowBringerConfig greedyFocusWindow)
     , ((modm, xK_b), andDeactivateFull $ myBringWindow myWindowBringerConfig)
-    , ((modm .|. shiftMask, xK_b), swapMinimizeStateAfter $
-                                 actionMenu myWindowBringerConfig swapFocusedWith)
+    , ((modm .|. shiftMask, xK_b),
+       swapMinimizeStateAfter $ actionMenu myWindowBringerConfig swapFocusedWith)
     , ((modm .|. controlMask, xK_t), spawn
        "systemctl --user restart taffybar.service")
     , ((modm, xK_v), spawn "copyq paste")
@@ -441,25 +441,26 @@ addKeys conf@XConfig {modMask = modm} =
     , ((mod3Mask, xK_p), spawn "system_password.sh")
     , ((mod3Mask, xK_h), spawn "screenshot.sh")
     , ((mod3Mask, xK_c), spawn "shell_command.sh")
-    , ((mod3Mask, xK_l), spawn "dm-tool lock")
-    , ((mod3Mask, xK_5), selectLayout)
+    , ((mod3Mask .|. shiftMask, xK_l), spawn "dm-tool lock")
+    , ((mod3Mask, xK_l), selectLayout)
+    , ((mod3Mask, xK_k), spawn "rofi_kill_process.sh")
+    , ((mod3Mask, xK_t), selectToggle)
 
     -- ModAlt bindings
     , ((modalt, xK_w), spawn "rofi_wallpaper.sh")
     , ((modalt, xK_z), spawn "split_out_chrome_tab.sh")
     , ((modalt, xK_space), deactivateFullOr restoreOrMinimizeOtherClasses)
     , ((modalt, xK_Return), deactivateFullAnd restoreAllMinimized)
-    , ((modalt, xK_5), selectToggle)
     , ((modalt, xK_4), selectLimit)
 
     -- ScratchPads
     , ((modalt, xK_m), doScratchpad "htop")
-    , ((modalt, xK_s), doScratchpad "spotify")
-    , ((modalt, xK_h), doScratchpad "hangouts")
+    , ((modalt .|. controlMask, xK_s), doScratchpad "spotify")
+    , ((modalt .|. controlMask, xK_h), doScratchpad "hangouts")
 
-    , ((modalt .|. controlMask, xK_h),
+    , ((modalt, xK_h),
        myRaiseNextMaybe (spawn hangoutsCommand) hangoutsSelector)
-    , ((modalt .|. controlMask, xK_s),
+    , ((modalt, xK_s),
        myRaiseNextMaybe (spawn spotifyCommand) spotifySelector)
 
     -- playerctl