From 23f08f931c6aeb4ca8b04b93cc0f591580f8f113 Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Sun, 17 Apr 2022 19:21:23 +0200
Subject: [PATCH] updated flakes

---
 flake.lock                                 | 18 +++++++++---------
 home/desktop-xmonad/desktop_config.nix     |  7 -------
 home/desktop-xmonad/xmonad/lib/Bindings.hs |  2 +-
 home/nixos-common.nix                      |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 049b660..60ca2ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648751066,
-        "narHash": "sha256-pYUSID9rSgYnl4PNa45/haCaHUKzY+Ul0fkqqSGflxs=",
+        "lastModified": 1650190514,
+        "narHash": "sha256-BoBvGT71yOfrNDTZQs7+FX0zb4yjMBETgIjtTsdJw+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cf62e96bf7c72e6a88e0bd43165110f42e44cdb4",
+        "rev": "620ed197f3624dafa5f42e61d5c043f39b8df366",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1648632716,
-        "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
+        "lastModified": 1650076401,
+        "narHash": "sha256-QGxadqKWICchuuLIF2QwmHPVaUk+qO33ml5p1wW4IyA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8",
+        "rev": "75ad56bdc927f3a9f9e05e3c3614c4c1fcd99fcb",
         "type": "github"
       },
       "original": {
@@ -53,11 +53,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1648648646,
-        "narHash": "sha256-pHAq/GvsP7zRHkUTCs+4d31C0IEtTIuC6/TFASIA+zg=",
+        "lastModified": 1650143261,
+        "narHash": "sha256-KI3IDHAtXG/7Uu1gNuuy6ovKqP/d6OhV0HwCWIKx0Aw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "efea022d6fe0da84aa6613d4ddeafb80de713457",
+        "rev": "0a862f558d4001c62f15f652b1b907002dc1e9b9",
         "type": "github"
       },
       "original": {
diff --git a/home/desktop-xmonad/desktop_config.nix b/home/desktop-xmonad/desktop_config.nix
index 3dd4191..76eee1a 100644
--- a/home/desktop-xmonad/desktop_config.nix
+++ b/home/desktop-xmonad/desktop_config.nix
@@ -58,13 +58,6 @@ in {
   xsession.windowManager.xmonad = {
     enable = true;
     enableContribAndExtras = true;
-    haskellPackages = pkgs.haskellPackages.override {
-      overrides = self: super: {
-        xmonad = self.xmonad_0_17_0;
-        xmonad-contrib = self.xmonad_0_17_0;
-        xmonad-extras = self.xmonad-extras_0_17_0;
-      };
-    };
     extraPackages = haskellPackages: [
       haskellPackages.monad-logger
       haskellPackages.dbus
diff --git a/home/desktop-xmonad/xmonad/lib/Bindings.hs b/home/desktop-xmonad/xmonad/lib/Bindings.hs
index a231b9d..f81db73 100644
--- a/home/desktop-xmonad/xmonad/lib/Bindings.hs
+++ b/home/desktop-xmonad/xmonad/lib/Bindings.hs
@@ -364,7 +364,7 @@ spacesOnCurrentScreen = WSIs $ isOnScreen <$> currentScreen
         currentScreen = gets $ screen . current . windowset
 
 workspaceBinds :: XConfig Layout -> M.Map (ButtonMask, KeySym) (X ())
-workspaceBinds conf@ XConfig {modMask = modm} = M.fromList $
+workspaceBinds conf@XConfig {modMask = modm} = M.fromList $
     [((m .|. modm, k), windows $ onCurrentScreen f i)
         | (i, k) <- zip (workspaces' conf) [xK_1 .. xK_9]
         , (f, m) <- [(view, 0), (shift, shiftMask)]]
diff --git a/home/nixos-common.nix b/home/nixos-common.nix
index 81d3ba8..5fc7816 100644
--- a/home/nixos-common.nix
+++ b/home/nixos-common.nix
@@ -127,7 +127,7 @@
     android-tools
     ansible
     bind.dnsutils
-    calibre
+    # calibre
     docker-compose
     file
     gimp