From cb06e57fb872d9baaffa1ab212c2a50d6101c5a7 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 10 Oct 2016 12:52:56 -0700 Subject: [PATCH 01/21] [Linux] Use env to find wallpaper executable --- dotfiles/config/systemd/user/wallpaper.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/systemd/user/wallpaper.service b/dotfiles/config/systemd/user/wallpaper.service index 5e972ffb..e9fb1dd5 100644 --- a/dotfiles/config/systemd/user/wallpaper.service +++ b/dotfiles/config/systemd/user/wallpaper.service @@ -5,7 +5,7 @@ After=compton.service [Service] Type=simple -ExecStart=/usr/bin/bash "wallpaper.sh" +ExecStart=/usr/bin/env wallpaper.sh ExecStop=/usr/bin/pkill wallpaper.sh [Install] From 5448d7e468ff0efef10ad51e2a1c3b73a1f05661 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 10 Oct 2016 12:53:16 -0700 Subject: [PATCH 02/21] [XMonad] Clean up stack.yaml Things still aren't working yet. --- dotfiles/xmonad/stack.yaml | 54 +++----------------------------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml index f14ab04b..88a12586 100644 --- a/dotfiles/xmonad/stack.yaml +++ b/dotfiles/xmonad/stack.yaml @@ -3,8 +3,10 @@ extra-package-dbs: [] packages: - '.' extra-deps: -- X11-xft-0.3.1 -- xmonad-contrib-0.12 + - xmonad-contrib-0.12 + - taffybar-0.4.6 + - gtk-traymanager-0.1.6 + - gtk2hs-buildtools resolver: lts-7.0 # For advanced use and comprehensive documentation of the format, please see: # http://docs.haskellstack.org/en/stable/yaml_configuration/ @@ -21,51 +23,3 @@ resolver: lts-7.0 # name: custom-snapshot # location: "./custom-snapshot.yaml" resolver: lts-7.0 - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. -packages: -- '.' -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -extra-deps: ["xmonad-contrib-0.12"] - -# Override default flag values for local packages and extra-deps -flags: {} - -# Extra package databases containing global packages -extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=1.1" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor From 55664d849a4d8af5a7fb59ded2c83b0cf475f60c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:06:05 -0700 Subject: [PATCH 03/21] [Linux] Add system_password script --- dotfiles/lib/bin/system_password.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 dotfiles/lib/bin/system_password.sh diff --git a/dotfiles/lib/bin/system_password.sh b/dotfiles/lib/bin/system_password.sh new file mode 100755 index 00000000..26df938f --- /dev/null +++ b/dotfiles/lib/bin/system_password.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +PASSWORD="$(keepasshttp.py --get -u "http://system.com" | jq '.[].password' | unescape.py)" +sleep .1s +xdotool type "$PASSWORD" From 7f2c2f8d62d1b5b9db5f4d9f54b1c164edbab464 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:06:30 -0700 Subject: [PATCH 04/21] Make unescape.py python3 compatible --- dotfiles/lib/python/unescape.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/lib/python/unescape.py b/dotfiles/lib/python/unescape.py index 1f251175..b0deb329 100755 --- a/dotfiles/lib/python/unescape.py +++ b/dotfiles/lib/python/unescape.py @@ -3,7 +3,7 @@ import sys def unescape(string): - print eval(string) + print(eval(string)) if __name__ == '__main__': From 1560d01cfae812d74ee0f38a8cb7846fb3c8d41d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:07:02 -0700 Subject: [PATCH 05/21] [XMonad] Improve xmonad build ...Though it is still quite broken --- dotfiles/xmonad/imalison-xmonad.cabal | 5 ++++- dotfiles/xmonad/stack.yaml | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dotfiles/xmonad/imalison-xmonad.cabal b/dotfiles/xmonad/imalison-xmonad.cabal index 8e5556f2..4a6b3bd8 100644 --- a/dotfiles/xmonad/imalison-xmonad.cabal +++ b/dotfiles/xmonad/imalison-xmonad.cabal @@ -21,6 +21,9 @@ executable imalison-xmonad -- other-modules: -- other-extensions: build-depends: base >=4.9 && <4.10, - xmonad-contrib>=0.12 + xmonad-contrib>=0.12, + X11>=1.6.1.2, + xmonad>=0.12, + taffybar>=0.4.6 hs-source-dirs: . default-language: Haskell2010 diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml index 88a12586..62a893b9 100644 --- a/dotfiles/xmonad/stack.yaml +++ b/dotfiles/xmonad/stack.yaml @@ -6,7 +6,6 @@ extra-deps: - xmonad-contrib-0.12 - taffybar-0.4.6 - gtk-traymanager-0.1.6 - - gtk2hs-buildtools resolver: lts-7.0 # For advanced use and comprehensive documentation of the format, please see: # http://docs.haskellstack.org/en/stable/yaml_configuration/ From ceadc6f16360cb6a1ba1ee564755ba66e1dca676 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:07:54 -0700 Subject: [PATCH 06/21] [Arch] Add mopidy dependencies --- tasks/arch.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tasks/arch.py b/tasks/arch.py index 790d3585..b4047972 100644 --- a/tasks/arch.py +++ b/tasks/arch.py @@ -20,14 +20,14 @@ PACKAGES = [ "network-manager-applet", "feh", "copyq", "imagemagick", "rcm", "rofi", "cabal-install", "pavucontrol", "lsof", "fbset", "git-subrepo", "trayer", "ttf-font-awesome", "conky", "lemonbar", "razercfg", "xdotool", "xclip", - "udiskie", "strace", "emojione-color-font", "hub", "plantuml", - "noto-fonts-cjk", "adapta-gtk-theme", "numix-icon-theme-git", "jq", - "android-sdk-platform-tools", "android-sdk", "keepassx-http", "global", - "screencloud", "mopidy-spotify", "rcm", "xsettingsd-git", "aspell-en", - "festival", "festival-freebsoft-utils", "hsetroot", "imwheel", "remmina", - "racket", "xorg-utils", "playerctl", "pasystray", "dunst", "otf-fira-code", + "udiskie", "strace", "emojione-color-font", "hub", "plantuml", "jq", + "noto-fonts-cjk", "adapta-gtk-theme", "numix-icon-theme-git", "global", + "android-sdk-platform-tools", "android-sdk", "keepassx-http", "aspell-en", + "screencloud", "mopidy-spotify", "rcm", "xsettingsd-git", "festival", + "festival-freebsoft-utils", "hsetroot", "imwheel", "remmina", "racket", + "xorg-utils", "playerctl", "pasystray", "dunst", "otf-fira-code", "ttf-mac-fonts", "otf-hermit", "ttf-font-awesome", "ttf-monaco", "tcpdump", - "ngrep", "wireshark-gtk", + "ngrep", "wireshark-gtk", "teamviewer", "mopidy-podcast", ] From 09d75c5b4f5cd3b1cd22c4de6db6c1c64140dc1d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:08:10 -0700 Subject: [PATCH 07/21] [Gtk+] Set paper theme --- dotfiles/config/gtk-3.0/settings.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotfiles/config/gtk-3.0/settings.ini b/dotfiles/config/gtk-3.0/settings.ini index 699d27e5..98617029 100644 --- a/dotfiles/config/gtk-3.0/settings.ini +++ b/dotfiles/config/gtk-3.0/settings.ini @@ -1,11 +1,11 @@ [Settings] gtk-key-theme-name=Emacs gtk-application-prefer-dark-theme=false -gtk-theme-name=Adapta-Nokto-Eta +gtk-theme-name=Paper gtk-fallback-icon-theme=gnome gtk-icon-theme-name=Numix gtk-font-name=Roboto 11 -gtk-cursor-theme-name=Adwaita +gtk-cursor-theme-name=Paper gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR From b175b9048a6f0027c9840f1a4df67882cee4d498 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:08:29 -0700 Subject: [PATCH 08/21] [Linux] Remove random comments from dunstrc --- dotfiles/config/dunst/dunstrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/dotfiles/config/dunst/dunstrc b/dotfiles/config/dunst/dunstrc index 9f776cb1..c58840ea 100644 --- a/dotfiles/config/dunst/dunstrc +++ b/dotfiles/config/dunst/dunstrc @@ -21,9 +21,6 @@ horizontal_padding = 8 separator_color = "#585858" startup_notification = false - # https://github.com/knopwob/dunst/issues/26#issuecomment-36159395 - #icon_position = left - #icon_folders = /usr/share/icons/elementary/actions/16/ [frame] width = 1 From 63c4cf9022bb8248ed4d478c436f3d62829342ce Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:08:49 -0700 Subject: [PATCH 09/21] [XMonad] Add system_password.sh binding --- dotfiles/xmonad/xmonad.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index ad1e6d0c..8ca5f3e1 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -53,6 +53,7 @@ addKeys conf@XConfig {modMask = modm} = , ((mod3Mask, xK_e), moveTo Next EmptyWS) , ((mod3Mask .|. shiftMask, xK_e), shiftTo Next EmptyWS) , ((mod3Mask, xK_v), spawn "copyq_rofi.sh") + , ((mod3Mask, xK_p), spawn "system_password.sh") -- playerctl , ((mod3Mask, xK_f), spawn "playerctl play-pause") From 6fb754156598e07a1a36d45adbe47e87ed3717c3 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:09:20 -0700 Subject: [PATCH 10/21] [XMonad] Use WindowBringer goTo --- dotfiles/xmonad/xmonad.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 8ca5f3e1..ac467ec5 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -38,7 +38,7 @@ shiftThenView i = W.greedyView i . W.shift i addKeys conf@XConfig {modMask = modm} = [ ((modm, xK_p), spawn "rofi -show drun") , ((modm .|. shiftMask, xK_p), spawn "rofi -show run") - , ((modm, xK_g), spawn "rofi -show window") + , ((modm, xK_g), gotoMenuArgs' "rofi" ["-dmenu"]) , ((modm .|. controlMask, xK_t), spawn "systemctl --user restart taffybar.service") , ((modm, xK_b), bringMenuArgs' "rofi" ["-dmenu"]) From e5faaf7ed5ab1cbbf90b442dae575c835544fb87 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:09:35 -0700 Subject: [PATCH 11/21] [XMonad] Whitespace tweaks --- dotfiles/xmonad/xmonad.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index ac467ec5..dd3a04eb 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -69,7 +69,9 @@ addKeys conf@XConfig {modMask = modm} = , ((0, xF86XK_AudioMute), spawn "pactl set-sink-mute 0 toggle") , ((mod3Mask, xK_w), spawn "pactl set-sink-volume 0 +05%") , ((mod3Mask, xK_s), spawn "pactl set-sink-volume 0 -05%") + ] ++ + -- Replace original moving stuff around + greedy view bindings [((additionalMask .|. modm, key), windows $ function workspace) | (workspace, key) <- zip (workspaces conf) [xK_1 .. xK_9] From b757998f4b16ce151cca6f70aa2073cee5611edb Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:10:53 -0700 Subject: [PATCH 12/21] [XMonad] Move layouts definition --- dotfiles/xmonad/xmonad.hs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index dd3a04eb..b6279182 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -35,6 +35,7 @@ myLogHook = fadeInactiveLogHook 0.9 shiftThenView i = W.greedyView i . W.shift i +layouts = multiCol [1, 1] 2 0.01 (-0.5) ||| Full ||| Tall 1 (3/100) (1/2) addKeys conf@XConfig {modMask = modm} = [ ((modm, xK_p), spawn "rofi -show drun") , ((modm .|. shiftMask, xK_p), spawn "rofi -show run") @@ -80,10 +81,6 @@ addKeys conf@XConfig {modMask = modm} = , (W.shift, shiftMask) , (shiftThenView, controlMask)]] -layouts = multiCol [1, 1] 2 0.01 (-0.5) ||| Full ||| tiled - where - tiled = Tall 1 (3/100) (1/2) - myLayoutHook = avoidStruts . smartSpacing 10 . noBorders . minimize . boringWindows . mkToggle (MIRROR ?? EOT) $ layouts From 5e38adb2bae3331f8d679bb962c3619c208de76d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:11:21 -0700 Subject: [PATCH 13/21] [XMonad] Move other definitions before addKeys --- dotfiles/xmonad/xmonad.hs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index b6279182..6f4c42b8 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -36,6 +36,13 @@ myLogHook = fadeInactiveLogHook 0.9 shiftThenView i = W.greedyView i . W.shift i layouts = multiCol [1, 1] 2 0.01 (-0.5) ||| Full ||| Tall 1 (3/100) (1/2) + +myLayoutHook = avoidStruts . smartSpacing 10 . noBorders . minimize + . boringWindows . mkToggle (MIRROR ?? EOT) $ layouts + +myStartup = do + spawn "systemctl --user start wm.target" + addKeys conf@XConfig {modMask = modm} = [ ((modm, xK_p), spawn "rofi -show drun") , ((modm .|. shiftMask, xK_p), spawn "rofi -show run") @@ -80,9 +87,3 @@ addKeys conf@XConfig {modMask = modm} = [ (W.greedyView, 0) , (W.shift, shiftMask) , (shiftThenView, controlMask)]] - -myLayoutHook = avoidStruts . smartSpacing 10 . noBorders . minimize - . boringWindows . mkToggle (MIRROR ?? EOT) $ layouts - -myStartup = do - spawn "systemctl --user start wm.target" From f178646dd447169cd99e170cd2b394b1c0748ec9 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 00:17:47 -0700 Subject: [PATCH 14/21] [Arch] Add teamviewer systemd unit --- tasks/arch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/arch.py b/tasks/arch.py index b4047972..e3c7127e 100644 --- a/tasks/arch.py +++ b/tasks/arch.py @@ -32,7 +32,7 @@ PACKAGES = [ SERVICES = [ - "sshd.socket", "nvidia-persistenced.service", "NetworkManager.service", + "sshd.socket", "nvidia-persistenced.service", "NetworkManager.service", "teamviewerd.service", ] From 0a3ee6ecc42e428142f654f4cd3af77c79dafc7a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 12:45:52 -0700 Subject: [PATCH 15/21] [Emacs] Remove global racket run binding --- dotfiles/emacs.d/README.org | 1 - 1 file changed, 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 7c6e3070..0bc034c2 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -3145,7 +3145,6 @@ This mode seems to be better maintained than plantuml-mode *** racket #+BEGIN_SRC emacs-lisp (use-package racket-mode - :bind (("C-r" . racket-run)) :mode "\\.rkt\\'") #+END_SRC * Programming From a1301bf629699db50800f2332dadab0b33e50973 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 13:28:44 -0700 Subject: [PATCH 16/21] [XMonad] Minor cleanup --- dotfiles/xmonad/xmonad.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 6f4c42b8..b0e2a5ce 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -27,10 +27,9 @@ main = xmonad $ ewmh $ pagerHints def , logHook = myLogHook , handleEventHook = docksEventHook <+> fullscreenEventHook , startupHook = myStartup - , keys = customKeys (\x -> []) addKeys + , keys = customKeys (const []) addKeys } -myLogHook :: X() myLogHook = fadeInactiveLogHook 0.9 shiftThenView i = W.greedyView i . W.shift i From e5a60f07eb6266bb80e60f23a3a576d75ca503b6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 13:29:23 -0700 Subject: [PATCH 17/21] Revert "[Emacs] Re-enable intero" This reverts commit 086e46c898185b5addc298f2826cbe0ea54b870a. --- dotfiles/emacs.d/README.org | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 0bc034c2..0b323a4d 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2450,6 +2450,7 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877 **** intero #+BEGIN_SRC emacs-lisp (use-package intero + :disabled t :demand t :after haskell-mode :config (add-hook 'haskell-mode-hook 'intero-mode)) From 28dc91e83ee374fe7d6b73ad134e3b2ceaac8d44 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Oct 2016 13:29:37 -0700 Subject: [PATCH 18/21] Revert "[Emacs] Remove intero is disabled comment" This reverts commit 3f82cbe327b7f3950864f82d4cd4c209413f881a. --- dotfiles/emacs.d/README.org | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 0b323a4d..ac6e1c2f 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2448,6 +2448,7 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877 (setq haskell-tags-on-save t))) #+END_SRC **** intero +Intero seems to be causing hangs, so it has been disabled #+BEGIN_SRC emacs-lisp (use-package intero :disabled t From 5d8255e31d312ceb4b1b0af7719d476ae6231446 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 14 Oct 2016 03:52:09 -0700 Subject: [PATCH 19/21] [XMonad] Add automaticallySetworkspaceNames Thought it compiles, it may not yet function properly. --- dotfiles/xmonad/xmonad.hs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index b0e2a5ce..c2e9ff3c 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -4,6 +4,7 @@ import System.Taffybar.Hooks.PagerHints (pagerHints) import XMonad hiding ( (|||) ) import XMonad.Actions.CycleWS import XMonad.Actions.WindowBringer +import XMonad.Actions.WorkspaceNames import XMonad.Config () import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.ManageDocks @@ -18,6 +19,7 @@ import XMonad.Layout.NoBorders import XMonad.Layout.Spacing import qualified XMonad.StackSet as W import XMonad.Util.CustomKeys +import XMonad.Util.NamedWindows (getName) main = xmonad $ ewmh $ pagerHints def { modMask = mod4Mask @@ -32,6 +34,13 @@ main = xmonad $ ewmh $ pagerHints def myLogHook = fadeInactiveLogHook 0.9 +automaticallySetWorkspaceNames = do + ws <- gets windowset + mapM_ setWorkspaceNameToFocusedWindow (W.workspaces ws) + where setWorkspaceNameToFocusedWindow workspace = do + namedWindows <- mapM getName $ take 2 $ W.integrate' $ W.stack workspace + setWorkspaceName (W.tag workspace) (concatMap show namedWindows) + shiftThenView i = W.greedyView i . W.shift i layouts = multiCol [1, 1] 2 0.01 (-0.5) ||| Full ||| Tall 1 (3/100) (1/2) @@ -86,3 +95,7 @@ addKeys conf@XConfig {modMask = modm} = [ (W.greedyView, 0) , (W.shift, shiftMask) , (shiftThenView, controlMask)]] + +-- Local Variables: +-- flycheck-ghc-args: ("-Wno-missing-signatures") +-- End: From 61413af628130b983afc627a31d22fd6bc6be39d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 14 Oct 2016 14:48:51 -0700 Subject: [PATCH 20/21] [XMonad] Don't use do notation for startup hook --- dotfiles/xmonad/xmonad.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index c2e9ff3c..93535f12 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -48,8 +48,7 @@ layouts = multiCol [1, 1] 2 0.01 (-0.5) ||| Full ||| Tall 1 (3/100) (1/2) myLayoutHook = avoidStruts . smartSpacing 10 . noBorders . minimize . boringWindows . mkToggle (MIRROR ?? EOT) $ layouts -myStartup = do - spawn "systemctl --user start wm.target" +myStartup = spawn "systemctl --user start wm.target" addKeys conf@XConfig {modMask = modm} = [ ((modm, xK_p), spawn "rofi -show drun") From 7567cefc54b46848d3cf715743aa347389a5eb41 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 14 Oct 2016 14:49:16 -0700 Subject: [PATCH 21/21] [Arch] Add okular dependency --- tasks/arch.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/arch.py b/tasks/arch.py index e3c7127e..df1100c0 100644 --- a/tasks/arch.py +++ b/tasks/arch.py @@ -28,6 +28,7 @@ PACKAGES = [ "xorg-utils", "playerctl", "pasystray", "dunst", "otf-fira-code", "ttf-mac-fonts", "otf-hermit", "ttf-font-awesome", "ttf-monaco", "tcpdump", "ngrep", "wireshark-gtk", "teamviewer", "mopidy-podcast", + "kdegraphics-okular", ]