From 95026752e87fd4f7d480143d79267a6f652afa67 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 19 Dec 2024 11:40:15 -0500 Subject: [PATCH] flake: add chaotic-nyx --- common/nix.nix | 2 + flake.lock | 133 +++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 8 +++ 3 files changed, 140 insertions(+), 3 deletions(-) diff --git a/common/nix.nix b/common/nix.nix index 64cd89ab..fda6c0aa 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -23,12 +23,14 @@ substituters = [ "https://alyraffauf.cachix.org" "https://cache.nixos.org/" + "https://chaotic-nyx.cachix.org/" "https://nix-community.cachix.org" "https://nix-gaming.cachix.org" ]; trusted-public-keys = [ "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; diff --git a/flake.lock b/flake.lock index 31a1f67a..3320d67a 100644 --- a/flake.lock +++ b/flake.lock @@ -89,6 +89,30 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "flake-schemas": "flake-schemas", + "home-manager": "home-manager_2", + "jovian": "jovian", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734619568, + "narHash": "sha256-rYVM0KsGb+zUScfLCHnyxkR+poKOkH5VUKFzPxP1RcY=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "49af1cfc2787e08814d3b8ce95693364cc86b4bf", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -226,6 +250,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": "systems_3" @@ -342,6 +380,27 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -362,7 +421,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_4": { "inputs": { "nixpkgs": [ "stylix", @@ -404,6 +463,28 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734591594, + "narHash": "sha256-7Q4hXE+b9A4DebZ5Q+q3WStuMiWR5bMW0ltpzbY/zMQ=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "ce2abe494524cdb389a5d31c11c41834d4362ac5", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -431,6 +512,51 @@ "type": "github" } }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ], + "umu": "umu" + }, + "locked": { + "lastModified": 1733968149, + "narHash": "sha256-ulxjvehU+KoMtLqxJSQJJu97X1eeXOlhKpGDeSR7IMo=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "43b9832ae7407054aa411d485e701b4a207ce6d3", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "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" + } + }, "nixpkgs": { "locked": { "lastModified": 1733759999, @@ -529,8 +655,9 @@ "root": { "inputs": { "agenix": "agenix", + "chaotic": "chaotic", "disko": "disko", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "iio-hyprland": "iio-hyprland", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", @@ -573,7 +700,7 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 1d76c576..a507d134 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,11 @@ url = "github:ryantm/agenix"; }; + chaotic = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + }; + disko = { inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/disko"; @@ -47,12 +52,14 @@ extra-substituters = [ "https://alyraffauf.cachix.org" + "https://chaotic-nyx.cachix.org/" "https://nix-community.cachix.org" "https://nix-gaming.cachix.org" ]; extra-trusted-public-keys = [ "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; @@ -188,6 +195,7 @@ modules = [ ./hosts/${host} self.inputs.agenix.nixosModules.default + self.inputs.chaotic.homeManagerModules.default self.inputs.disko.nixosModules.disko self.inputs.home-manager.nixosModules.home-manager self.inputs.lanzaboote.nixosModules.lanzaboote