From 10a36f34b3fc70ebded1ab164a1908939bbdcffe Mon Sep 17 00:00:00 2001 From: scouckel Date: Mon, 8 Dec 2025 23:58:51 -0600 Subject: chaotic-nyx is dead --- flake.lock | 169 ++++-------------------------------------- flake.nix | 8 +- hosts/vecna/configuration.nix | 13 +--- modules/nixos/nordvpn.nix | 7 -- 4 files changed, 20 insertions(+), 177 deletions(-) diff --git a/flake.lock b/flake.lock index 18a81f8..4bde47f 100644 --- a/flake.lock +++ b/flake.lock @@ -20,29 +20,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1765117595, - "narHash": "sha256-kleqsZYC/YF0kaQRXfsfWniibuaQDUi0B9yHiLPOqAU=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "001dc9d3fc071c00f5117eec956b15b8311ccef4", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -101,33 +78,18 @@ "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ - "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1764788330, - "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", + "lastModified": 1765217760, + "narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", + "rev": "e5b1f87841810fc24772bf4389f9793702000c9b", "type": "github" }, "original": { @@ -137,26 +99,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -177,28 +119,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764746434, - "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1758834834, @@ -230,29 +150,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1764440730, @@ -270,22 +167,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -301,7 +182,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -325,11 +206,11 @@ ] }, "locked": { - "lastModified": 1765160517, - "narHash": "sha256-oEEQNLXF8NgmLn714yJKRyswA0hZRtkHOqK82wPo7a4=", + "lastModified": 1765231447, + "narHash": "sha256-h1q0zsVG5a9rJGdTxodGxLyuuyy8mfaJ2jl1zITLvUc=", "owner": "nix-community", "repo": "NUR", - "rev": "ddddb75726332e9513b3e352ab0836e4c4143ea0", + "rev": "ac541a9cd66b030e55fc0cf8b058139f6ee050fc", "type": "github" }, "original": { @@ -366,41 +247,19 @@ "root": { "inputs": { "auto-cpufreq": "auto-cpufreq", - "chaotic": "chaotic", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nur": "nur", "nvf": "nvf", "spicetify": "spicetify", "zen-browser": "zen-browser" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764729618, - "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "spicetify": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_2" }, "locked": { @@ -449,17 +308,17 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1765084755, - "narHash": "sha256-Da6OF+dMG/L8IRrWE7bgJPclrh6e8BJCUs0mp8V9MsA=", + "lastModified": 1765175766, + "narHash": "sha256-M4zs4bVUv0UNuVGspwwlcGs5FpCDt52LQBA5a9nj5Lg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3865973f52b821abc9c1cb2b21245391de42cc79", + "rev": "5126a8426773dc213a8c0f0d646aca116194dab6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9fda92e..b7e1be5 100644 --- a/flake.nix +++ b/flake.nix @@ -26,10 +26,10 @@ url = "github:NotAShelf/nvf/v0.8"; inputs.nixpkgs.follows = "nixpkgs"; }; - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + nordvpn-flake.url = "github:scouckel/nordvpn-flake"; }; - outputs = { nixpkgs, home-manager, nix-flatpak, nur, auto-cpufreq, nixos-hardware, chaotic, ... }@inputs: { + outputs = { nixpkgs, home-manager, nix-flatpak, nur, auto-cpufreq, nixos-hardware, nordvpn-flake, ... }@inputs: { nixosConfigurations = { # desktop vecna = nixpkgs.lib.nixosSystem { @@ -51,7 +51,6 @@ home-manager.extraSpecialArgs = {inherit inputs;}; } nur.modules.nixos.default - chaotic.nixosModules.default ]; }; # laptop @@ -75,7 +74,6 @@ } nur.modules.nixos.default auto-cpufreq.nixosModules.default - chaotic.nixosModules.default ]; }; # new laptop @@ -100,7 +98,6 @@ nur.modules.nixos.default auto-cpufreq.nixosModules.default nixos-hardware.nixosModules.framework-13-7040-amd - chaotic.nixosModules.default ]; }; generic = nixpkgs.lib.nixosSystem { @@ -123,7 +120,6 @@ home-manager.extraSpecialArgs = {inherit inputs;}; } nur.modules.nixos.default - chaotic.nixosModules.default ]; }; }; diff --git a/hosts/vecna/configuration.nix b/hosts/vecna/configuration.nix index c9cad60..f69dcc1 100644 --- a/hosts/vecna/configuration.nix +++ b/hosts/vecna/configuration.nix @@ -25,15 +25,7 @@ }; }; - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_cachyos; - chaotic.mesa-git.enable = lib.mkDefault true; - chaotic.mesa-git.fallbackSpecialisation = false; - - specialisation.eye.configuration = { - boot.kernelPackages = pkgs.linuxPackages_latest; - chaotic.mesa-git.enable = false; - }; - + boot.kernelPackages = pkgs.linuxPackages_latest; # amd gpu config hardware.graphics = { enable = true; @@ -131,6 +123,9 @@ # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; + networking.firewall.checkReversePath = false; + networking.firewall.allowedTCPPorts = [ 443 ]; + networking.firewall.allowedUDPPorts = [ 1194 ]; system.stateVersion = "25.05"; } diff --git a/modules/nixos/nordvpn.nix b/modules/nixos/nordvpn.nix index ae99d98..e69de29 100644 --- a/modules/nixos/nordvpn.nix +++ b/modules/nixos/nordvpn.nix @@ -1,7 +0,0 @@ -{ - chaotic.nordvpn.enable = true; - networking.firewall.checkReversePath = false; - networking.firewall.allowedTCPPorts = [ 443 ]; - networking.firewall.allowedUDPPorts = [ 1194 ]; -} - -- cgit v1.3