Fix x1 more

joinemm · Jan 25, 2024 · fc391bd · fc391bd
1 parent e6f6875
commit fc391bd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -44,7 +44,6 @@
       easyeffects.enable = true;
       batsignal.enable = true;
       udiskie.enable = true;
-      picom.backend = lib.mkForce "xrender";
     };
   };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,12 @@ in { @@
             lua
             nodejs
             statix
+            (haskellPackages.ghcWithPackages (hpkgs:
+              with hpkgs; [
+                xmobar
+                xmonad
+                xmonad-contrib
+              ]))
             # apps
             spotify
@@ Expand Down @@