Revert "cachyos + cleanup"

This reverts commit 66b4931d083f0cc2adebf15dfdd3ccdc1bed5c4b.

flake.lock

@@ -1,36 +1,5 @@
 {
   "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,
@@ -160,20 +129,6 @@
         "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": [
@@ -231,7 +186,7 @@
         "type": "github"
       }
     },
-    "jovian": {
+    "jovian-nixos": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
@@ -378,7 +333,7 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "jovian",
+          "jovian-nixos",
           "nixpkgs"
         ]
       },
@@ -454,13 +409,12 @@
     },
     "root": {
       "inputs": {
-        "chaotic": "chaotic",
         "deploy-rs": "deploy-rs",
         "disko": "disko",
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "jovian": "jovian",
+        "jovian-nixos": "jovian-nixos",
         "lanzaboote": "lanzaboote",
         "niri": "niri",
         "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",

flake.nix

@@ -61,22 +61,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    jovian = {
+    jovian-nixos = {
       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 =
@@ -87,8 +75,7 @@
       nixos-hardware,
       home-manager,
       deploy-rs,
-      jovian,
+      jovian-nixos,
-      chaotic,
       ...
     }@inputs:
     let
@@ -117,9 +104,7 @@
                 ;
             };
             modules = [
-              chaotic.nixosModules.default
               home-manager.nixosModules.home-manager
-              jovian.nixosModules.default
               (
                 { config, ... }:
                 {

system/common.nix

@@ -81,19 +81,12 @@
     ];
   };
 
-  # 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_cachyos-lto;
+    kernelPackages = pkgs.linuxPackages_latest;
-    # kernelPackages = pkgs.linuxPackages_latest;
     # kernelPackages = pkgs.linuxPackages;
 
     lanzaboote = {

system/system-mreow.nix

@@ -27,10 +27,9 @@
   # PST
   # time.timeZone = lib.mkForce "America/Los_Angeles";
 
-  boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride {
+  # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
-    # my system is zen 5, but zen 4 is the highest option
+  # if I move to another lock screen program, i will have to replace `swaylock`
-    mArch = "ZEN4";
+  security.pam.services.swaylock = { };
-  };
 
   # disable framework kernel module
   # https://github.com/NixOS/nixos-hardware/issues/1330
@@ -44,6 +43,16 @@
         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,13 +18,9 @@
     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";