diff --git a/dotfiles/config/sparkleshare/config.xml b/dotfiles/config/sparkleshare/config.xml
new file mode 100644
index 00000000..7bee6ac5
--- /dev/null
+++ b/dotfiles/config/sparkleshare/config.xml
@@ -0,0 +1,20 @@
+
+
+
+ Ivan Malison
+ IvanMalison@gmail.com
+
+ True
+
+ org
+ a6a8820b6d7b59f782ea6b9995b6b3b141877498
+ ssh://git@bitbucket.org/ivanmalison/org.git
+ Git
+
+
+ config
+ 66e07b6027eecec90670e4b608dcd6ec7d51f5d9
+ ssh://git@bitbucket.org/ivanmalison/config
+ Git
+
+
\ No newline at end of file
diff --git a/dotfiles/config/systemd/user/keepassx.service b/dotfiles/config/systemd/user/keepassx.service
index bd19e173..f1e75228 100644
--- a/dotfiles/config/systemd/user/keepassx.service
+++ b/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
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 7f6722b2..1d36bec1 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/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:
diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 5a506ee3..63ab69ee 100644
--- a/dotfiles/emacs.d/README.org
+++ b/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
diff --git a/dotfiles/lib/bin/rofi_kill_process.sh b/dotfiles/lib/bin/rofi_kill_process.sh
new file mode 100755
index 00000000..e5d49dbb
--- /dev/null
+++ b/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
diff --git a/dotfiles/lib/bin/start_keepass.sh b/dotfiles/lib/bin/start_keepass.sh
deleted file mode 100755
index 85628227..00000000
--- a/dotfiles/lib/bin/start_keepass.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env sh
-restart.sh keepassxc "$HOME/SparkleShare/config/db.kdbx" --keyfile "$HOME/SparkleShare/config/creds/keepass.key"
diff --git a/dotfiles/lib/shellpath.sh b/dotfiles/lib/shellpath.sh
index 7b9d2110..f463c441 100644
--- a/dotfiles/lib/shellpath.sh
+++ b/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)"
}
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index 4405d477..c9fb9fee 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/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,26 +441,27 @@ 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),
- myRaiseNextMaybe (spawn spotifyCommand) spotifySelector)
+ , ((modalt, xK_s),
+ myRaiseNextMaybe (spawn spotifyCommand) spotifySelector)
-- playerctl
, ((mod3Mask, xK_f), spawn "playerctl play-pause")
diff --git a/index.html b/index.html
index 5aac7825..be29d7cb 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
+
@@ -186,9 +186,7 @@
-
+ pre.src {background-color: #fdf6e3; color: #657b83;}