From 551072f24eecd2c1c87210adb8835e73d3e0b277 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 3 May 2018 10:39:40 -0700
Subject: [PATCH] [XMonad] Fix stack build

---
 dotfiles/config/xmonad/stack.yaml     | 29 +++++++++++++++++++++------
 dotfiles/config/xmonad/xmonad-contrib |  2 +-
 dotfiles/config/xmonad/xmonad.hs      |  4 ++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/dotfiles/config/xmonad/stack.yaml b/dotfiles/config/xmonad/stack.yaml
index 6df1764b..1e804ff3 100644
--- a/dotfiles/config/xmonad/stack.yaml
+++ b/dotfiles/config/xmonad/stack.yaml
@@ -8,14 +8,31 @@ packages:
   extra-dep: true
 - location: ./taffybar
   extra-dep: true
-- location:
-    git: git@github.com:IvanMalison/gtk-traymanager.git
-    commit: 39cddcf77f3e4a8ecbc4d82894457fd61c1faff1
-  extra-dep: true
 extra-deps:
 - X11-xft-0.3.1
-- xml-helpers-1.0.0
+- alsa-mixer-0.2.0.3
+- dbus-1.0.1
+- dbus-hslogger-0.1.0.1
+- gi-dbusmenu-0.4.1
+- gi-dbusmenugtk3-0.4.1
+- gi-gdk-3.0.15
+- gi-gdkpixbuf-2.0.16
+- gi-gdkx11-3.0.2
+- gi-gio-2.0.18
+- gi-gtk-3.0.22
+- gi-pango-1.0.16
+- gi-xlib-2.0.2
+- gio-0.13.5.0
+- gtk-sni-tray-0.1.2.0
+- gtk-strut-0.1.2.0
+- gtk-traymanager-1.0.1
+- gtk3-0.14.9
+- haskell-gi-0.21.2
+- haskell-gi-base-0.21.1
 - libxml-sax-0.7.5
 - rate-limit-1.1.1
+- spool-0.1
+- status-notifier-item-0.2.1.0
 - time-units-1.0.0
-resolver: lts-8.2
+- xml-helpers-1.0.0
+resolver: lts-11.7
diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
index aebefe9a..ad9c8001 160000
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
@@ -1 +1 @@
-Subproject commit aebefe9a1c2c6de8daf599d75d2324f2521213ab
+Subproject commit ad9c8001f6e2af7a87228c5feaf41aa230a639d5
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index d358a7e0..75a17a44 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -971,9 +971,9 @@ addKeys conf@XConfig { modMask = modm } =
 
     -- Non-XMonad
 
-    , ((modm, xK_v), spawn "copyq paste")
+    , ((modm, xK_v), spawn "xclip -o | xdotool type --file -")
     , ((modm .|. controlMask, xK_s), spawn "split_current_chrome_tab.sh")
-    , ((hyper, xK_v), spawn "clipit_rofi.sh")
+    , ((hyper, xK_v), spawn "rofi_clipit.sh")
     , ((hyper, xK_p), spawn "rofi-pass")
     , ((hyper, xK_h), spawn "screenshot.sh")
     , ((hyper, xK_c), spawn "shell_command.sh")