chore(cachy): Use external flake and drop chaotic-nyx

base/common_hardware.nix

@@ -101,10 +101,6 @@ in {
 
       builders-use-substitutes = mkDashDefault true;
 
-      substituters = [
-        "https://chaotic-nyx.cachix.org/"
-      ];
-
       trusted-substituters = [
         "https://hyprland.cachix.org"
         "https://anyrun.cachix.org"
@@ -128,7 +124,6 @@ in {
         "oxicalc.cachix.org-1:qF3krFc20tgSmtR/kt6Ku/T5QiG824z79qU5eRCSBTQ="
         "hyprdock.cachix.org-1:HaROK3fBvFWIMHZau3Vq1TLwUoJE8yRbGLk0lEGzv3Y="
         "reset.cachix.org-1:LfpnUUdG7QM/eOkN7NtA+3+4Ar/UBeYB+3WH+GjP9Xo="
-        "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
         "dashvim.cachix.org-1:uLRdxp1WOWHnsZZtu3SwUWZRsvC7SXo0Gyk3tIefuL0="
       ];
 

example/flake.nix

@@ -31,7 +31,6 @@
       "https://oxicalc.cachix.org"
       "https://hyprdock.cachix.org"
       "https://reset.cachix.org"
-      "https://chaotic-nyx.cachix.org/"
       "https://dashvim.cachix.org"
     ];
 
@@ -46,7 +45,6 @@
       "oxicalc.cachix.org-1:qF3krFc20tgSmtR/kt6Ku/T5QiG824z79qU5eRCSBTQ="
       "hyprdock.cachix.org-1:HaROK3fBvFWIMHZau3Vq1TLwUoJE8yRbGLk0lEGzv3Y="
       "reset.cachix.org-1:LfpnUUdG7QM/eOkN7NtA+3+4Ar/UBeYB+3WH+GjP9Xo="
-      "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
       "dashvim.cachix.org-1:uLRdxp1WOWHnsZZtu3SwUWZRsvC7SXo0Gyk3tIefuL0="
     ];
   };

flake.nix

@@ -18,6 +18,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "unstable";
     };
+    cachy.url = "github:xddxdd/nix-cachyos-kernel?rev=bb7b8aa687464f24dcd452354d9621331d6b0737";
 
     sops-nix.url = "github:Mic92/sops-nix";
 
@@ -49,9 +50,6 @@
 
     superfreq.url = "github:NotAShelf/superfreq";
 
-    # absolute insanity
-    chaoticNyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-
     compose.url = "github:garnix-io/nixos-compose";
   };
 

lib/default.nix

@@ -13,8 +13,8 @@
       permittedInsecurePackages = permittedPackages;
     };
     overlays = [
+      inputs.cachy.overlays.default
       inputs.nur.overlays.default
-      inputs.chaoticNyx.overlays.cache-friendly
     ];
     inherit system;
   };
@@ -76,7 +76,6 @@ in {
         ../base
         ../home
         ../modules
-        inputs.chaoticNyx.nixosModules.default
       ];
       home = [
         inputs.anyrun.homeManagerModules.default
@@ -92,7 +91,6 @@ in {
         inputs.reset.homeManagerModules.default
         inputs.sops-nix.homeManagerModules.sops
         inputs.dashvim.homeManagerModules.dashvim
-        inputs.chaoticNyx.homeManagerModules.default
         ../modules
       ];
     },

lib/importPkgs.nix

@@ -12,6 +12,6 @@ import pkgs {
   };
   overlays = [
     inputs.nur.overlays.default
-    inputs.chaoticNyx.overlays.cache-friendly
+    inputs.cachy.overlays.default
   ];
 }

lib/wm.nix

@@ -50,14 +50,11 @@ in {
     ];
     hyprland = [
       # window rules
-      "float,class:^(.*)(OxiCalc)(.*)$"
+      "match:class OxiCalc, float on"
-      "float,class:^(.*)(winecfg.exe)(.*)$"
+      "match:class winecfg.exe, float on"
-      "float,class:^(.*)(copyq)(.*)$"
+      "match:class copyq, float on"
-      "center,class:^(.*)(swappy)(.*)$"
+      "match:class swappy, center on"
-      "workspace 10 silent,class:^(.*)(steam)(.*)$"
+      "match:class steam, workspace 10 silent"
-
-      # Otherwise neovide will ignore tiling
-      "suppressevent fullscreen maximize,class:^(.*)(neovide)(.*)$"
     ];
   };
 

modules/programs/gaming.nix

@@ -34,10 +34,10 @@
       description = "Install gaming related packages";
     };
     kernel = lib.mkOption {
-      default = true;
+      default = false;
-      example = false;
+      example = true;
       type = lib.types.bool;
-      description = "Whether to use the CachyOS kernel";
+      description = "Whether to use the CachyOS kernel. WARNING: This is a manual compiled kernel!";
     };
     steam = lib.mkOption {
       default = true;
@@ -109,7 +109,7 @@
   config = lib.mkIf config.mods.gaming.enable (
     lib.optionalAttrs (options ? environment.systemPackages) {
       environment.systemPackages = config.mods.gaming.tools;
-      boot.kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
+      boot.kernelPackages = lib.mkForce pkgs.cachyosKernels.linuxPackages-cachyos-latest;
       services.scx = lib.mkIf (config.mods.gaming.scheduler != null) {
         enable = true;
         inherit (config.mods.gaming) scheduler;

modules/programs/greetd.nix

@@ -131,6 +131,7 @@
           misc {
               disable_splash_rendering = false
               disable_hyprland_logo = true
+              disable_xdg_env_checks = true
           }
 
           env=STATE_DIR,var/cache/regreet

modules/programs/homePackages.nix

@@ -119,11 +119,7 @@
             flake-checker
             gnome-keyring
             gnutar
-            (
+            regreet
-              if (options ? regreet)
-              then regreet
-              else greetd.regreet
-            )
             killall
             kitty
             libnotify

modules/programs/hypr/hyprland.nix

@@ -310,6 +310,7 @@ in {
                   enable_swallow = mkDashDefault true;
                   disable_splash_rendering = mkDashDefault true;
                   disable_hyprland_logo = mkDashDefault true;
+                  disable_xdg_env_checks = mkDashDefault true;
                   swallow_regex = mkDashDefault "^(.*)(kitty)(.*)$";
                   initial_workspace_tracking = mkDashDefault 1;
                   # just doesn't work
@@ -334,7 +335,7 @@ in {
                 layerrule = [
                   # layer rules
                   # mainly to disable animations within slurp and grim
-                  "noanim, selection"
+                  "match:namespace selection, no_anim on"
                 ];
 
                 workspace = mkWorkspace config.mods.wm.workspaces;