cachyos + cleanup

flake.lock

@@ -1,5 +1,36 @@
 {
   "nodes": {
+    "chaotic": {
+      "inputs": {
+        "flake-schemas": "flake-schemas",
+        "home-manager": [
+          "home-manager"
+        ],
+        "jovian": [
+          "jovian"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764031508,
+        "narHash": "sha256-4Yh26aEgO1O0kV6qhW+Uw/CzAQTSbGkBGuiw6OkI/Ws=",
+        "owner": "chaotic-cx",
+        "repo": "nyx",
+        "rev": "2d5f96ca62d47d93d67fa7267e92aa2f660a3a36",
+        "type": "github"
+      },
+      "original": {
+        "owner": "chaotic-cx",
+        "ref": "nyxpkgs-unstable",
+        "repo": "nyx",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1763938834,
@@ -84,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764001463,
+        "lastModified": 1764088169,
-        "narHash": "sha256-4kEGNgKDLTv8Vw2mMi/0lJoXY3NyritYHvm8T/YPoxE=",
+        "narHash": "sha256-l0zJRJg8Fm4pcewILYqw/0jkLdMn2Kvl2SLG9xK9HB8=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "fcc5578b096e98a2f0c9657634b6f19bd17805b2",
+        "rev": "ea48b8bca040158fe8559179a9a71b462cdeda03",
         "type": "github"
       },
       "original": {
@@ -129,6 +160,20 @@
         "type": "github"
       }
     },
+    "flake-schemas": {
+      "locked": {
+        "lastModified": 1721999734,
+        "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
+        "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
+        "revCount": 75,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -158,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764007004,
+        "lastModified": 1764075860,
-        "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=",
+        "narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "125e40fa68b340aee9d474a46b540907e2537b5c",
+        "rev": "295d90e22d557ccc3049dc92460b82f372cd3892",
         "type": "github"
       },
       "original": {
@@ -186,7 +231,7 @@
         "type": "github"
       }
     },
-    "jovian-nixos": {
+    "jovian": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
@@ -244,11 +289,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1764008093,
+        "lastModified": 1764081740,
-        "narHash": "sha256-8OmHLuPkZMjjEkn/TA2tk/3tEOE+zoUYiP5YFk7JsrU=",
+        "narHash": "sha256-eeQzyHJjSQTxcjSCy1OgOgNAUjdBnIjSYntfJK0Z4+I=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "340b81b5d7cb4f15bf23f9ae8e372366c06fd423",
+        "rev": "e579b1a51f26341eeeb41e32d5b5c6e2a032e339",
         "type": "github"
       },
       "original": {
@@ -277,11 +322,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1763990232,
+        "lastModified": 1764046829,
-        "narHash": "sha256-RdtlZ+nufSwEgNsF0yuTOO2eGpn87Qm9b3tRQPsibH4=",
+        "narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "45b45ac29d654c0e6759ab996c69dfde40053536",
+        "rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0",
         "type": "github"
       },
       "original": {
@@ -302,11 +347,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1763980357,
+        "lastModified": 1764060317,
-        "narHash": "sha256-o39Zr+uZ01yq217KAQTUxO8k9gN7PLKYmoK1UTQ7eBc=",
+        "narHash": "sha256-ngeRNhpBYCuMgG+wbiwDv1lp4f1Tda3EHjnfxfsz7Tw=",
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
-        "rev": "817bc5de1ebd1045f591ae1e7cb67e78e098019c",
+        "rev": "8342ea98bf04d41447d3b7513760232407d351e0",
         "type": "github"
       },
       "original": {
@@ -333,7 +378,7 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "jovian-nixos",
+          "jovian",
           "nixpkgs"
         ]
       },
@@ -354,11 +399,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1762847253,
+        "lastModified": 1764080039,
-        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
+        "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
+        "rev": "da17006633ca9cda369be82893ae36824a2ddf1a",
         "type": "github"
       },
       "original": {
@@ -370,11 +415,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763835633,
+        "lastModified": 1763966396,
-        "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
+        "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
+        "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
         "type": "github"
       },
       "original": {
@@ -409,12 +454,13 @@
     },
     "root": {
       "inputs": {
+        "chaotic": "chaotic",
         "deploy-rs": "deploy-rs",
         "disko": "disko",
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "jovian-nixos": "jovian-nixos",
+        "jovian": "jovian",
         "lanzaboote": "lanzaboote",
         "niri": "niri",
         "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
@@ -453,11 +499,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763952169,
+        "lastModified": 1764038373,
-        "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=",
+        "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
+        "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -61,10 +61,22 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    jovian-nixos = {
+    jovian = {
       url = "github:Jovian-Experiments/Jovian-NixOS";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    chaotic = {
+      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
+
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+        rust-overlay.follows = "rust-overlay";
+        jovian.follows = "jovian";
+      };
+    };
+
   };
 
   outputs =
@@ -75,7 +87,8 @@
       nixos-hardware,
       home-manager,
       deploy-rs,
-      jovian-nixos,
+      jovian,
+      chaotic,
       ...
     }@inputs:
     let
@@ -104,7 +117,9 @@
                 ;
             };
             modules = [
+              chaotic.nixosModules.default
               home-manager.nixosModules.home-manager
+              jovian.nixosModules.default
               (
                 { config, ... }:
                 {

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
+  boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride {
-  # if I move to another lock screen program, i will have to replace `swaylock`
+    # my system is zen 5, but zen 4 is the highest option
-  security.pam.services.swaylock = { };
+    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";