From c62b009bee9fd32a7946ebf4657ce81c779c8472 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Mon, 21 Apr 2025 20:20:04 -0600 Subject: [PATCH] cachy kernel --- flake.lock | 189 +++++++++++++++++-- flake.nix | 13 +- hosts/workstation/hardware-configuration.nix | 3 +- 3 files changed, 183 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 1cb842f..7e905a6 100644 --- a/flake.lock +++ b/flake.lock @@ -100,6 +100,29 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "fenix": "fenix", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1745232749, + "narHash": "sha256-EpM4MNPV0tPqsSrQq1B5EaE0+91MrVXgGS+ct+q/I90=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "9117798d3fac3e83568d4d050278fdfb8842879d", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "cpu-microcodes": { "flake": false, "locked": { @@ -177,6 +200,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1745044353, + "narHash": "sha256-OoGR5ppBq2nlbGDkCrg4slQ4gU5joYbc9GnQz4R6EOQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "936f22bba519112ec47aa17a9b3304c8a3dabe54", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -302,6 +347,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" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -427,6 +486,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745071558, + "narHash": "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9676e8a52a177d80c8a42f66566362a6d74ecf78", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -446,7 +526,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -735,11 +815,11 @@ ] }, "locked": { - "lastModified": 1744607907, - "narHash": "sha256-FkZm9niiT/6O00fJG6lGD9kUvtxzWs/yuRvfPksyrfo=", + "lastModified": 1745184449, + "narHash": "sha256-iKLoo2pKkTH0Xg5T9dNNRfHZk+Of6IPeYyyut6QKuy0=", "ref": "refs/heads/master", - "rev": "0805b6ab54d0c1d1cf118f59d7173eeeb197565b", - "revCount": 86, + "rev": "afe0386bda7485058b8600cb926131b2f8247373", + "revCount": 88, "type": "git", "url": "ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git" }, @@ -748,6 +828,28 @@ "url": "ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745044299, + "narHash": "sha256-/A/xjRjJY9CGcgOHQ5kTxV7VIJxac86i6NQ5CejMzZc=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "c7ff1a4578eb11ef84288941aa23e385b6fde635", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", @@ -769,17 +871,40 @@ "type": "github" } }, - "nixpkgs": { + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { - "owner": "nixos", + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "type": "github" + }, + "original": { + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -850,6 +975,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixtendo-switch": { "inputs": { "flake-parts": "flake-parts_2", @@ -941,12 +1082,13 @@ }, "root": { "inputs": { + "chaotic": "chaotic", "doom-emacs": "doom-emacs", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "jawz-scripts": "jawz-scripts", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-small": "nixpkgs-small", "nixpkgs11": "nixpkgs11", "nixtendo-switch": "nixtendo-switch", @@ -956,6 +1098,23 @@ "ucodenix": "ucodenix" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1745002274, + "narHash": "sha256-W2Na1BK8Kq8eO8mlUmp+NGq7H5CPDpgzaGMpmyBMkas=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "a09a5502c3713e4287354b19973ea805d31ebcbc", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -987,7 +1146,7 @@ "flake-utils": "flake-utils", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index bf9f41b..93daae5 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; ucodenix.url = "github:e-tho/ucodenix"; doom-emacs = { url = "github:marienz/nix-doom-emacs-unstraightened"; @@ -85,17 +86,17 @@ }; in { - nixosConfigurations = { - workstation = createConfig "workstation" inputs.nixpkgs; - miniserver = createConfig "miniserver" inputs.nixpkgs-small; - server = createConfig "server" inputs.nixpkgs-small; - shell = createConfig "shell" inputs.nixpkgs; - }; devShells.${system} = builtins.listToAttrs ( map (lang: { name = lang; value = self.nixosConfigurations.shell.config.devShells.${lang}; }) langList ); + nixosConfigurations = { + workstation = createConfig "workstation" inputs.nixpkgs; + miniserver = createConfig "miniserver" inputs.nixpkgs-small; + server = createConfig "server" inputs.nixpkgs-small; + shell = createConfig "shell" inputs.nixpkgs; + }; }; } diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix index a2c44c5..423705e 100644 --- a/hosts/workstation/hardware-configuration.nix +++ b/hosts/workstation/hardware-configuration.nix @@ -10,6 +10,7 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") inputs.ucodenix.nixosModules.default + inputs.chaotic.nixosModules.default ]; services = { udev.extraRules = lib.mkIf config.my.apps.gaming.enable '' @@ -47,7 +48,7 @@ "udev.log_priority=3" "preempt=full" ]; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_cachyos; kernel.sysctl = { "vm.swappiness" = 80; "net.ipv4.tcp_mtu_probing" = 1;