cachyos + cleanup

system/common.nix

@@ -81,12 +81,19 @@
     ];
   };
 
+  # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
+  # if I move to another lock screen program, i will have to replace `swaylock`
+  security.pam.services.swaylock = { };
+
   # allow unfree packages for jovian-nixos
   nixpkgs.config.allowUnfree = true;
 
+  services.scx.enable = true;
+
   # kernel options
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
+    # kernelPackages = pkgs.linuxPackages_cachyos-lto;
+    # kernelPackages = pkgs.linuxPackages_latest;
     # kernelPackages = pkgs.linuxPackages;
 
     lanzaboote = {

system/system-mreow.nix

@@ -27,9 +27,10 @@
   # PST
   # time.timeZone = lib.mkForce "America/Los_Angeles";
 
-  # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
-  # if I move to another lock screen program, i will have to replace `swaylock`
-  security.pam.services.swaylock = { };
+  boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride {
+    # my system is zen 5, but zen 4 is the highest option
+    mArch = "ZEN4";
+  };
 
   # disable framework kernel module
   # https://github.com/NixOS/nixos-hardware/issues/1330
@@ -43,16 +44,6 @@
         command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time";
         user = username;
       };
-      terminal.vt = lib.mkForce 2;
     };
   };
-
-  environment.etc."xdg/wayland-sessions/niri-session.desktop".text = ''
-    [Desktop Entry]
-    Name=Niri Session
-    Comment=Niri Wayland compositor
-    Exec=niri-session
-    Type=Application
-    DesktopNames=niri
-  '';
 }

system/system-yarn.nix

@@ -18,9 +18,13 @@
     inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
     inputs.impermanence.nixosModules.impermanence
     inputs.disko.nixosModules.disko
-    inputs.jovian-nixos.nixosModules.default
   ];
 
+  boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride {
+    # this system is zen 3, but this is the highest level this system supports
+    mArch = "GENERIC_V4";
+  };
+
   fileSystems."/media/games" = {
     device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8";
     fsType = "f2fs";