diff --git a/flake.lock b/flake.lock index b2fea23..e15ff48 100644 --- a/flake.lock +++ b/flake.lock @@ -1,40 +1,5 @@ { "nodes": { - "chaotic": { - "inputs": { - "compare-to": "compare-to", - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1695821977, - "narHash": "sha256-KX3CffCxSiC64zmHPplGeBR6Z4kSVtub9VN74DHSdX8=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "966fa613ecd65211395168f5d1948b9f4a0d7d81", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, - "compare-to": { - "locked": { - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/0.1.2.tar.gz" - } - }, "flake-compat": { "flake": false, "locked": { @@ -73,15 +38,17 @@ }, "flake-schemas": { "locked": { - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" + "lastModified": 1693615523, + "narHash": "sha256-LeyH24etXCxNJviWptyLy2DPT9xt+oOs/zE66To1iPY=", + "owner": "DeterminateSystems", + "repo": "flake-schemas", + "rev": "8940e872c4f8c7cd7d0a1ec169fa0a24697b1f1c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.1.tar.gz" + "owner": "DeterminateSystems", + "repo": "flake-schemas", + "type": "github" } }, "flake-utils": { @@ -125,25 +92,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", - "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", - "revCount": 3026, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3026%2Brev-408ba13188ff9ce309fa2bdd2f81287d79773b00/018ab63a-64c3-7df2-b944-409c2f99bdaf/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/home-manager/0.1.0.tar.gz" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -179,6 +127,21 @@ "type": "github" } }, + "nix-empty-flake": { + "locked": { + "lastModified": 1695341185, + "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", + "owner": "chaotic-cx", + "repo": "nix-empty-flake", + "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "repo": "nix-empty-flake", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1694857738, @@ -209,13 +172,28 @@ "type": "github" } }, + "nix-systems-linux": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1695541019, - "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=", + "lastModified": 1695887975, + "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296", + "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", "type": "github" }, "original": { @@ -226,45 +204,32 @@ }, "nixpkgs": { "locked": { - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", - "revCount": 528952, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.528952%2Brev-6500b4580c2a1f3d0f980d32d285739d8e156d92/018ad520-a70a-783a-b3a5-29473c2d048b/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { - "dir": "lib", "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-lib": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "dir": "lib", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { + "dir": "lib", "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", @@ -273,11 +238,11 @@ }, "nur": { "locked": { - "lastModified": 1695847646, - "narHash": "sha256-oBcN/xmzxoI50OIB8ozEK1b2DDct5tTEoc9zVlEj1r0=", + "lastModified": 1695927626, + "narHash": "sha256-jF2giXnaIrK/KM3V4xaYoBHkl+smfVTYB7lXT+VKWPk=", "owner": "nix-community", "repo": "NUR", - "rev": "866d8cbd355a33f20af62d0358772a171e606ef5", + "rev": "03e6bf899dc4ee1c9d79a997760e7b36ad59670b", "type": "github" }, "original": { @@ -286,6 +251,42 @@ "type": "github" } }, + "nyx": { + "inputs": { + "compare-to": [ + "nix-empty-flake" + ], + "flake-schemas": [ + "flake-schemas" + ], + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "nix-systems-linux" + ], + "yafas": [ + "yafas" + ] + }, + "locked": { + "lastModified": 1695926842, + "narHash": "sha256-gCaPtzG3Z+I2yau1bZOeZhuqCk0LRXHCODkSh0fPGac=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "76f6298ae9df27bbdc387b5e187f398949655517", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -341,7 +342,9 @@ "libnbtplusplus": [ "libnbtplusplus" ], - "nix-filter": "nix-filter", + "nix-filter": [ + "nix-filter" + ], "nixpkgs": [ "nixpkgs" ], @@ -365,22 +368,27 @@ }, "root": { "inputs": { - "chaotic": "chaotic", "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "flake-schemas": "flake-schemas", "flake-utils": "flake-utils", "gitignore": "gitignore", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "libnbtplusplus": "libnbtplusplus", + "nix-empty-flake": "nix-empty-flake", + "nix-filter": "nix-filter", "nix-systems": "nix-systems", + "nix-systems-linux": "nix-systems-linux", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-lib": "nixpkgs-lib", "nur": "nur", + "nyx": "nyx", "pre-commit-hooks": "pre-commit-hooks", "prism-game-options-patch": "prism-game-options-patch", "prismlauncher": "prismlauncher", - "tela-icon-theme": "tela-icon-theme" + "tela-icon-theme": "tela-icon-theme", + "yafas": "yafas" } }, "tela-icon-theme": { @@ -398,6 +406,29 @@ "repo": "Tela-icon-theme", "type": "github" } + }, + "yafas": { + "inputs": { + "flake-schemas": [ + "flake-schemas" + ], + "systems": [ + "nix-systems" + ] + }, + "locked": { + "lastModified": 1695926485, + "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", + "owner": "UbiqueLambda", + "repo": "yafas", + "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", + "type": "github" + }, + "original": { + "owner": "UbiqueLambda", + "repo": "yafas", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9dfdafa..986bcd4 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,16 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; nur.url = "github:nix-community/NUR"; + nyx = { + url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + inputs.flake-schemas.follows = "flake-schemas"; + inputs.systems.follows = "nix-systems-linux"; + inputs.compare-to.follows = "nix-empty-flake"; + inputs.yafas.follows = "yafas"; + }; home-manager= { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -16,6 +24,7 @@ inputs.pre-commit-hooks.follows = "pre-commit-hooks"; inputs.flake-compat.follows = "flake-compat"; inputs.libnbtplusplus.follows = "libnbtplusplus"; + inputs.nix-filter.follows = "nix-filter"; }; nixos-hardware.url = "github:NixOS/nixos-hardware"; tela-icon-theme = { @@ -23,12 +32,15 @@ flake = false; }; + + # Dependencys flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs-lib"; }; nixpkgs-lib.url = "github:NixOS/nixpkgs/nixos-unstable?dir=lib"; + flake-schemas.url = "github:DeterminateSystems/flake-schemas"; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -37,6 +49,11 @@ inputs.gitignore.follows = "gitignore"; inputs.flake-utils.follows = "flake-utils"; }; + yafas = { + url = "github:UbiqueLambda/yafas"; + inputs.flake-schemas.follows = "flake-schemas"; + inputs.systems.follows = "nix-systems"; + }; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; @@ -54,6 +71,9 @@ inputs.systems.follows = "nix-systems"; }; nix-systems.url = "github:nix-systems/default"; + nix-systems-linux.url = "github:nix-systems/default-linux"; + nix-empty-flake.url = "github:chaotic-cx/nix-empty-flake"; + nix-filter.url = "github:numtide/nix-filter"; # Patches prism-game-options-patch = { @@ -67,7 +87,7 @@ home-manager, nur, nixos-hardware, - chaotic, + nyx, ... }: { nixosConfigurations = { @@ -100,7 +120,7 @@ nixos-hardware.nixosModules.common-pc-ssd nur.nixosModules.nur home-manager.nixosModules.home-manager - chaotic.nixosModules.default + nyx.nixosModules.default ]; }; yokai = nixpkgs.lib.nixosSystem { @@ -121,7 +141,7 @@ nixos-hardware.nixosModules.pine64-pinebook-pro nur.nixosModules.nur home-manager.nixosModules.home-manager - chaotic.nixosModules.default + nyx.nixosModules.default ]; }; inugami = nixpkgs.lib.nixosSystem { @@ -139,7 +159,7 @@ nixos-hardware.nixosModules.raspberry-pi-4 nur.nixosModules.nur home-manager.nixosModules.home-manager - chaotic.nixosModules.default + nyx.nixosModules.default ]; }; tuny = nixpkgs.lib.nixosSystem { @@ -159,7 +179,7 @@ nixos-hardware.nixosModules.common-pc-laptop-hdd nur.nixosModules.nur home-manager.nixosModules.home-manager - chaotic.nixosModules.default + nyx.nixosModules.default ]; }; };