From 66b4931d083f0cc2adebf15dfdd3ccdc1bed5c4b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 25 Nov 2025 13:29:02 -0500 Subject: [PATCH] cachyos + cleanup --- flake.lock | 52 ++++++++++++++++++++++++++++++++++++++--- flake.nix | 19 +++++++++++++-- system/common.nix | 9 ++++++- system/system-mreow.nix | 17 ++++---------- system/system-yarn.nix | 6 ++++- 5 files changed, 83 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index f86ed7b..2d91086 100644 --- a/flake.lock +++ b/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, @@ -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": [ @@ -186,7 +231,7 @@ "type": "github" } }, - "jovian-nixos": { + "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", "nixpkgs": [ @@ -333,7 +378,7 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ - "jovian-nixos", + "jovian", "nixpkgs" ] }, @@ -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", diff --git a/flake.nix b/flake.nix index 2bfd51a..33d03de 100644 --- a/flake.nix +++ b/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, ... }: { diff --git a/system/common.nix b/system/common.nix index e584510..a7cc393 100644 --- a/system/common.nix +++ b/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 = { diff --git a/system/system-mreow.nix b/system/system-mreow.nix index bac09f7..3066df8 100644 --- a/system/system-mreow.nix +++ b/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 - ''; } diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 60b2f6c..6d5b03a 100644 --- a/system/system-yarn.nix +++ b/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";