From c6798fa4526ab11b7e227e829d7b6ff8de3e7eb5 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 22 Nov 2016 14:36:36 -0800 Subject: [PATCH 01/13] [XMonad] Swap modalt bindings for spotify and hangouts --- dotfiles/xmonad/xmonad.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 198fd899..12d0eef8 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -452,13 +452,13 @@ addKeys conf@XConfig {modMask = modm} = -- 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") From 1126518e69f678029a3a176ee8e5eee07dd1e90c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 22 Nov 2016 14:36:58 -0800 Subject: [PATCH 02/13] [Sparkleshare] Restore sparkleshare config --- dotfiles/config/sparkleshare/config.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dotfiles/config/sparkleshare/config.xml 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 From 432cb01e51ba5ec61bc5e288bdf69a4f4831730b Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Nov 2016 13:25:27 -0800 Subject: [PATCH 03/13] [Linux] Add rofi_kill_process.sh --- dotfiles/lib/bin/rofi_kill_process.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 dotfiles/lib/bin/rofi_kill_process.sh 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 From 6e87b9d43925a1766530799ed2efc140e657c863 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Nov 2016 13:25:56 -0800 Subject: [PATCH 04/13] [taffybar] Set bar position to top --- dotfiles/config/taffybar/taffybar.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From f0e81c65f1b996fc216e631445b479bc4dcd9360 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Nov 2016 13:26:14 -0800 Subject: [PATCH 05/13] [Emacs] Fix initial setup of frame --- dotfiles/emacs.d/README.org | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 From 689302d9ec603f99a88c34d6eac9122f77b33173 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Nov 2016 13:26:14 -0800 Subject: [PATCH 06/13] [Emacs] Update github pages index file --- index.html | 6323 ++++++++++++++++++++++++++-------------------------- 1 file changed, 3167 insertions(+), 3156 deletions(-) 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;}