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

dotfiles/config/.gitignore

@@ -1,5 +1,6 @@
 /.mono/keypairs/
 /Atom/
+/Clementine/
 /Code/
 /Popcorn-Time/
 /QtProject.conf/

dotfiles/emacs.d/README.org

@@ -2661,6 +2661,11 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
   (interactive)
   (delete-process "tern"))
 #+END_SRC
+*** coffee script
+#+BEGIN_SRC emacs-lisp
+(use-package coffee-mode
+  :mode "\\.coffee\\'")
+#+END_SRC
 *** rust
 #+BEGIN_SRC emacs-lisp
 (use-package rust-mode
@@ -3420,7 +3425,7 @@ alphanumeric characters only."
 **** helm-org-rifle
 #+BEGIN_SRC emacs-lisp
 (use-package helm-org-rifle
-  :bind ("C-c C-h" . helm-rog-rifle-agenda-files))
+  :bind ("C-c C-h" . helm-org-rifle-agenda-files))
 #+END_SRC
 **** org-notify
  #+BEGIN_SRC emacs-lisp

dotfiles/lib/bin/focus_tab_by_id.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env sh
 
-windowId=$(chromix-too raw chrome.tabs.update "$1" '{"active": true}' | jq .windowId)
-chromix-too raw chrome.windows.update "$windowId" '{"focused": true}'
-
+chromix-too focus "$1"

dotfiles/lib/bin/split_chrome_tab_to_next_screen.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env zsh
-split_out.sh
-sleep .2
+
+split_current_chrome_tab.sh
 xdotool key --clearmodifiers "Shift_L+Super_L+z"

dotfiles/lib/bin/split_current_chrome_tab.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env zsh
+
+chromix-too raw chrome.windows.getLastFocused '{"populate": true}'  | jq -cM '.tabs[]' | jq 'select(.active)' | jq .id | xargs split_tab_by_id.sh

dotfiles/lib/bin/split_out.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-sleep .6
-xdotool key --clearmodifiers Escape
-xdotool key --clearmodifiers Tab
-xdotool key --clearmodifiers "W"

dotfiles/lib/bin/split_tab_by_id.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env zsh
 
+echo $1
 chromix-too raw chrome.windows.create '{"tabId": '"$1}"

dotfiles/xmonad/imalison-xmonad.cabal

@@ -23,6 +23,7 @@ executable imalison-xmonad
                        gtk-traymanager>=0.1.6,
                        hostname>=1.0,
                        multimap>=1.2.1,
+                       process>=1.4.3.0,
                        split,
                        taffybar>=0.4.6,
                        transformers>=0.5.2.0,

dotfiles/xmonad/xmonad.hs

@@ -17,6 +17,7 @@ import           Graphics.X11.ExtraTypes.XF86
 import           Network.HostName
 import           System.Directory
 import           System.FilePath.Posix
+import           System.Process
 import           System.Taffybar.Hooks.PagerHints
 import           Text.Printf
 
@@ -89,6 +90,8 @@ main =
 writeToHomeDirLog stuff = io $ getLogFile >>= flip appendFile (stuff ++ "\n")
   where getLogFile = (</> "temp" </> "xmonad.log") <$> getHomeDirectory
 
+xRunCommand cmd = void $ io $ readCreateProcess (shell cmd) ""
+
 (<..>) :: Functor f => (a -> b) -> f (f a) -> f (f b)
 (<..>) = fmap . fmap
 
@@ -237,7 +240,6 @@ togglesMap =
     toggleTuple toggle =
       fmap (\str -> (str, Toggle toggle)) (toggleToStringWithState toggle)
 
-
 toggleStateToString s =
   case s of
     Just True -> "ON"
@@ -383,7 +385,7 @@ myWindowAct c@WindowBringerConfig { menuCommand = cmd
   do
     visible <- visibleWindows
     ws <- windowMap' c { windowFilter = not . flip elem visible }
-    let chromeTabs = M.empty -- chromeTabs <- liftIO getChromeTabInfo
+    chromeTabs <- liftIO getChromeTabInfo
     let options = M.union (M.map Left ws) (M.map Right chromeTabs)
     selection <- DM.menuMapArgs cmd args options
     whenJust selection action
@@ -806,7 +808,7 @@ addKeys conf@XConfig { modMask = modm } =
 
     , ((modm .|. controlMask, xK_t), spawn taffybarCommand)
     , ((modm, xK_v), spawn "copyq paste")
-    , ((modm .|. controlMask, xK_s), spawn "split_out.sh")
+    , ((modm .|. controlMask, xK_s), spawn "split_current_chrome_tab.sh")
     , ((hyper, xK_v), spawn "copyq_rofi.sh")
     , ((hyper, xK_p), spawn "rofi-pass")
     , ((hyper, xK_h), spawn "screenshot.sh")
@@ -820,7 +822,7 @@ addKeys conf@XConfig { modMask = modm } =
     , ((hyper, xK_r), spawn "rofi_systemd.sh")
     , ((hyper, xK_0), spawn "tvpower.js")
     , ((modalt, xK_w), spawn "rofi_wallpaper.sh")
-    , ((modalt, xK_z), spawn "split_out_chrome_tab.sh")
+    , ((modalt, xK_z), spawn "split_chrome_tab_to_next_screen.sh")
     , ((hyper, xK_9), spawn "start_synergy.sh")
     , ((hyper, xK_8), spawn "rofi_paswitch.sh")
     , ((hyper, xK_slash), spawn "toggle_taffybar.sh")