From fc391bd1aa3cd5ba6f0073a20e5caac7369b2003 Mon Sep 17 00:00:00 2001
From: Joinemm <joonas@rautiola.co>
Date: Thu, 25 Jan 2024 19:41:03 +0200
Subject: [PATCH] Fix x1 more

---
 home-modules/neovim.nix       | 11 ++++-------
 home-modules/picom.nix        |  1 +
 home-modules/xmonad/xmonad.hs |  4 ++--
 hosts/x1/configuration.nix    |  6 ++++++
 hosts/x1/home.nix             |  1 -
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/home-modules/neovim.nix b/home-modules/neovim.nix
index 46d5a14..f61e417 100644
--- a/home-modules/neovim.nix
+++ b/home-modules/neovim.nix
@@ -28,7 +28,6 @@
       termguicolors = true;
       cursorline = true;
       signcolumn = "yes";
-      colorcolumn = "81";
       backup = false;
       swapfile = false;
       undofile = true;
@@ -43,11 +42,6 @@
         bg = "none";
         fg = "#eaeaea";
       };
-      CursorLine = {
-        bg = "none";
-        underline = true;
-      };
-      CursorLineNr.link = "CursorLine";
       VirtColumn.fg = "#000000";
       SignColumn.bg = "none";
     };
@@ -135,7 +129,7 @@
         enable = true;
         userDefaultOptions.names = false;
       };
-      # fidget.enable = true;
+      fidget.enable = true;
       lightline.enable = true;
       indent-blankline.enable = true;
       gitgutter.enable = true;
@@ -282,6 +276,7 @@
 
     extraPlugins = with pkgs.vimPlugins; [
       vim-wakatime
+      smartcolumn-nvim
     ];
 
     extraConfigLua = ''
@@ -291,6 +286,8 @@
         'confirm_done',
         cmp_autopairs.on_confirm_done()
       )
+
+      require("smartcolumn").setup()
     '';
   };
 }
diff --git a/home-modules/picom.nix b/home-modules/picom.nix
index 9c700ac..9f3bc23 100644
--- a/home-modules/picom.nix
+++ b/home-modules/picom.nix
@@ -29,5 +29,6 @@
       notification.redir-ignore = true;
       notify.redir-ignore = true;
     };
+    extraArgs = ["--no-frame-pacing"];
   };
 }
diff --git a/home-modules/xmonad/xmonad.hs b/home-modules/xmonad/xmonad.hs
index 5bb914c..2147a66 100644
--- a/home-modules/xmonad/xmonad.hs
+++ b/home-modules/xmonad/xmonad.hs
@@ -137,9 +137,9 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
       -- Swap the focused window with the previous window
       (modm .|. shiftMask, xK_k) ~> windows W.swapUp,
       -- Shrink the master area
-      (modm, xK_h) ~> sendMessage Shrink,
+      (modm .|. shiftMask, xK_h) ~> sendMessage Shrink,
       -- Expand the master area
-      (modm, xK_l) ~> sendMessage Expand,
+      (modm .|. shiftMask, xK_l) ~> sendMessage Expand,
       -- Push window back into tiling
       (modm, xK_t) ~> withFocused $ windows . W.sink,
       -- Increment the number of windows in the master area
diff --git a/hosts/x1/configuration.nix b/hosts/x1/configuration.nix
index d62da60..719fe1c 100644
--- a/hosts/x1/configuration.nix
+++ b/hosts/x1/configuration.nix
@@ -71,6 +71,12 @@ in {
         lua
         nodejs
         statix
+        (haskellPackages.ghcWithPackages (hpkgs:
+          with hpkgs; [
+            xmobar
+            xmonad
+            xmonad-contrib
+          ]))
 
         # apps
         spotify
diff --git a/hosts/x1/home.nix b/hosts/x1/home.nix
index 4c1cdea..30a3a46 100644
--- a/hosts/x1/home.nix
+++ b/hosts/x1/home.nix
@@ -44,7 +44,6 @@
       easyeffects.enable = true;
       batsignal.enable = true;
       udiskie.enable = true;
-      picom.backend = lib.mkForce "xrender";
     };
   };
 }