From c9f6de6459a4bc0185a1c12c247d765a21bf057a Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 2 Mar 2020 11:57:25 +0800
Subject: [PATCH] Revert "switch to neo layout"

This reverts commit a541d9f8ce64ebd75ffe85349d3b98727cf4b31a.
---
 system/desktop/home-manager.nix            |  9 ---------
 system/desktop/home-manager/xmonad.nix     |  6 +++---
 system/desktop/home-manager/xmonad/Main.hs | 14 +++-----------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/system/desktop/home-manager.nix b/system/desktop/home-manager.nix
index 2e2f5ad..0244204 100644
--- a/system/desktop/home-manager.nix
+++ b/system/desktop/home-manager.nix
@@ -193,16 +193,8 @@ in {
   environment.systemPackages = let
     library = import <library> { inherit pkgs lib; };
 
-    neoKeyboard = pkgs.writeScriptBin "neo-Keyboard" # sh
-      ''
-        ${pkgs.numlockx}/bin/numlockx off
-        ${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout de neo
-      '';
-
     fixKeyboard = pkgs.writeScriptBin "fix-Keyboard" # sh
       ''
-        ${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout us
-        ${pkgs.numlockx}/bin/numlockx on
         ${pkgs.xorg.xmodmap}/bin/xmodmap ${xmodmapConfig}
       '';
 
@@ -234,7 +226,6 @@ in {
     fixXhost
     (library.desktopFile fixX { longName = "fix X"; })
     fixKeyboard
-    neoKeyboard
     (library.desktopFile fixKeyboard { longName = "fix keyboard"; })
   ];
 
diff --git a/system/desktop/home-manager/xmonad.nix b/system/desktop/home-manager/xmonad.nix
index 79a7fb4..1846099 100644
--- a/system/desktop/home-manager/xmonad.nix
+++ b/system/desktop/home-manager/xmonad.nix
@@ -3,8 +3,8 @@ let
 
   background-repo = pkgs.fetchgit {
     url = "https://git.ingolf-wagner.de/palo/image-generator-lib";
-    rev = "8327c5aaffc1d2ca56decbefcdba5fb98028b870";
-    sha256 = "12w2b8qs7ibijvyyw4zf7626ikg6sbc8lxkhb3fcvc6w4xfiiny0";
+    rev = "99b5c9acaa9abbbc15ea035fdd44ac8d2f456a37";
+    sha256 = "0z2q798gwdgxgqkr6nyg0hmlq1ndspzkqb8yv9kisgkv0d0jqqmv";
   };
 
   nixCommands = { height, width }:
@@ -19,7 +19,7 @@ let
       nixStartRedshift = "${pkgs.redshift}/bin/redshift -O 6100 -g 0.9:0.9:0.9 -b 0.9"
       nixResetRedshift = "${pkgs.redshift}/bin/redshift -x"
       nixSetCursorImage = "${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr"
-      nixSetBackground = "${pkgs.image-generator}/bin/image-generator --line-size 2.0 ${background-repo}/honeycombs.json --height ${
+      nixSetBackground = "${pkgs.image-generator}/bin/image-generator --line-size 2.0 ${background-repo}/tictoctoe.json --height ${
         toString height
       } --width ${
         toString width
diff --git a/system/desktop/home-manager/xmonad/Main.hs b/system/desktop/home-manager/xmonad/Main.hs
index 44ad3f2..92ed612 100644
--- a/system/desktop/home-manager/xmonad/Main.hs
+++ b/system/desktop/home-manager/xmonad/Main.hs
@@ -182,7 +182,7 @@ multiKeys [] = []
 multiKeys ((key, command):xs) = (createMultiKey key command) ++ multiKeys xs
   where
     createMultiKey keyString command =
-      [("M4-" ++ keyString, command), ("M4-z " ++ keyString, command) ]
+      [("M4-" ++ keyString, command), ("M4-z " ++ keyString, command)]
 
 myAdditionaKeys :: [(String, X ())]
 myAdditionaKeys
@@ -199,13 +199,6 @@ myAdditionaKeys
               nonRemovableWorkspaces
               (withWorkspace autoXPConfig (windows . W.greedyView))
             updateBoring)
-     -- neo layout alternative
-     , ( "x"
-       , do removeEmptyWorkspaceAfterExcept
-              nonRemovableWorkspaces
-              (withWorkspace autoXPConfig (windows . W.greedyView))
-            updateBoring)
-
     -- move focused window to workspace
      , ("S-<Space>", withWorkspace myXPConfig (windows . W.shift))
     -- copy focused window to workspace
@@ -224,9 +217,6 @@ myAdditionaKeys
      , ( "r"
        , do renameWorkspace myXPConfig
             sequence_ [addHiddenWorkspace ws | ws <- myWorkspaces])
-     , ( "<Tab>"
-       , do toggleWS' ["NSP"]
-            updateBoring)
      , ( "<Esc>"
        , do toggleWS' ["NSP"]
             updateBoring)
@@ -265,6 +255,8 @@ myAdditionaKeys
      , ( "k"
        , do sendMessage FirstLayout
             focusUp)
+    -- Swap the focused window and the master window
+     , ("<Tab>", windows W.swapMaster)
     -- Swap the focused window with the next window
      , ( "S-j"
        , do sendMessage FirstLayout