From a15428963ceedaffeb990b4a6179ebcd485567d6 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Mon, 25 Sep 2023 20:11:47 +0200
Subject: [PATCH] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAa

---
 flake.nix                         |  2 +-
 hosts/catbook-j/configuration.nix | 46 +++++++++++++++----------------
 modules/desktop/default.nix       |  5 ----
 modules/helix.nix                 | 25 +++++++----------
 modules/zellij.nix                |  1 -
 5 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6d9d40c..c995e65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,7 +55,7 @@
             home-manager.useUserPackages = true;
             home-manager.users.jade = { nixosConfig, pkgs, ... }: {
               home.sessionVariables.TZ = nixosConfig.time.timeZone;
-              home.stateVersion = "${nixosConfig.system.stateVersion}";
+              home.stateVersion = "22.11";
             };
           }
         ];
diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix
index 2db92c3..870e47c 100644
--- a/hosts/catbook-j/configuration.nix
+++ b/hosts/catbook-j/configuration.nix
@@ -82,31 +82,31 @@ in {
     };
   };
 
-  nixpkgs = {
-    overlays = [
-      (self: super: {
-        linux_zen_xeniafied = pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_zen.override {
-          structuredExtraConfig = with lib.kernel; {
-            "FB" = yes;
-            "FRAMEBUFFER_CONSOLE" = yes;
-            "VGA_CONSOLE" = yes;
-            "VIDEO_SELECT" = yes;
-            LOGO = lib.mkForce yes;
-            LOGO_LINUX_CLUT224 = yes;
-          };
-          ignoreConfigErrors = true;
-        });
-      })
-    ];
-  };
+  # nixpkgs = {
+  #   overlays = [
+  #     (self: super: {
+  #       linux_zen_xeniafied = pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_zen.override {
+  #         structuredExtraConfig = with lib.kernel; {
+  #           "FB" = yes;
+  #           "FRAMEBUFFER_CONSOLE" = yes;
+  #           "VGA_CONSOLE" = yes;
+  #           "VIDEO_SELECT" = yes;
+  #           LOGO = lib.mkForce yes;
+  #           LOGO_LINUX_CLUT224 = yes;
+  #         };
+  #         ignoreConfigErrors = true;
+  #       });
+  #     })
+  #   ];
+  # };
 
   boot.kernelPackages = pkgs.linuxPackages_zen;
-  boot.kernelPatches = [ 
-    {
-      name = "fomx";
-      patch = ../../other/0001-fomx.patch;
-    } 
-  ];
+  # boot.kernelPatches = [ 
+  #   {
+  #     name = "fomx";
+  #     patch = ../../other/0001-fomx.patch;
+  #   } 
+  # ];
 
   services.xserver.displayManager.autoLogin = {
     enable = true;
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 6770f2b..2e439f6 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -153,17 +153,12 @@ in with lib; {
       notifications.x11.enable = true;
       notifications.test = true; 
     };
-    services.colord.enable = true;
 
     home-manager.users.jade = { pkgs, ... }: {
       programs.bat = {
         # TODO: more config
         enable = true;
       };
-      programs.exa = {
-        # TODO: more config
-        enable = true;
-      };
       programs.nushell = {
         enable = true;
         package = config.users.defaultUserShell;
diff --git a/modules/helix.nix b/modules/helix.nix
index bbd8cb6..737fe80 100644
--- a/modules/helix.nix
+++ b/modules/helix.nix
@@ -30,21 +30,16 @@ in with lib; {
             space."=" = ":fmt";
           };
         };
-        languages = {
-          language = [
-            {
-              name = "rust";
-            }
-            {
-              name = "php";
-              file-types = [ "php" ];
-              language-server = {
-                command = "psalm";
-                args = ["--language-server"];
-              };
-            }
-          ];
-        };
+        languages = [
+          {
+            name = "php";
+            file-types = [ "php" ];
+            language-server = {
+              command = "psalm";
+              args = ["--language-server"];
+            };
+          }
+        ];
       };
     };
   };
diff --git a/modules/zellij.nix b/modules/zellij.nix
index 71edc1a..2e45cd6 100644
--- a/modules/zellij.nix
+++ b/modules/zellij.nix
@@ -8,7 +8,6 @@ in with lib; {
     home-manager.users.jade = { pkgs, ... }: {
       programs.zellij = {
         enable = true;
-        enableZshIntegration = true;  
         settings = {
           theme = "gruvbox-dark";
           themes.gruvbox-dark = {