diff --git a/flake.lock b/flake.lock index 7e45046..ac339bc 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1733908662, - "narHash": "sha256-vuyqYX91/kEs+oYAw0az5A/JHeIX8hrv06WtLmhfZ5A=", + "lastModified": 1734057772, + "narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=", "owner": "catppuccin", "repo": "nix", - "rev": "5dfc780ad24353d01161c3c5784200ef042019af", + "rev": "20b6328df20ae45752c81311d225fd47cba32483", "type": "github" }, "original": { @@ -78,11 +78,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733967201, - "narHash": "sha256-gfA/6BUhFmrfTMaTNToHm5Lm9c/snG7ED4W/x4vCGJs=", + "lastModified": 1734087975, + "narHash": "sha256-dQYXdA5zGKZ1G5HfPj9Gjf0JRGwXexl/dC9oZW5xOec=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1559608a73a9211c7f78e7a0a8c13caca9f31006", + "rev": "1174e016e517f60a8cfe00f0a5785e4c8bd17b53", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1734011192, - "narHash": "sha256-NghuiWXx6Q3gwLiudiNwDpYQ1CPEUK7J+f9dWREN8KA=", + "lastModified": 1734088167, + "narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=", "owner": "nix-community", "repo": "disko", - "rev": "0f31ad735e784315a22d9899d3ba24340ce64220", + "rev": "d32f2d1750d61a476a236526b725ec5a32e16342", "type": "github" }, "original": { @@ -236,39 +236,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "freetype2": { "flake": false, "locked": { @@ -353,11 +320,11 @@ ] }, "locked": { - "lastModified": 1733951607, - "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -440,11 +407,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1734005819, - "narHash": "sha256-hbA0aFybdxjpu4Tr4xH57mOLjRMqcop6iBVA0ZFIIx4=", + "lastModified": 1734129402, + "narHash": "sha256-SSyk9SJ5Uu3/LhaoH2Bsgbx8fDgR6ZYQZG/13aNjL3M=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "aefaeedf5e3f773c923373795267c1633141566c", + "rev": "3cba4ba44e7ba3cc8bb67ac71bc61245b5aca347", "type": "github" }, "original": { @@ -625,41 +592,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1729298361, - "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", - "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729360442, - "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", - "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -685,11 +617,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -701,11 +633,11 @@ }, "nixpkgs-smol": { "locked": { - "lastModified": 1733925265, - "narHash": "sha256-SD/Gr1y7fhndRohoZy/edif3RM3+W84E4Vlzzejn0bI=", + "lastModified": 1734143535, + "narHash": "sha256-YVchPYuRpCFWqx6EVA1V1CY0NCTI1d3fADjOlB6oYe0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8cd84794deeea7d0d03c4bd3d0f6fdc32d806582", + "rev": "6160d771fb09b838abefba72df27c0c32699fe45", "type": "github" }, "original": { @@ -749,11 +681,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -765,11 +697,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -818,11 +750,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734011512, - "narHash": "sha256-S0l5K/daUvuj94ZER+2YA5ixWuCbeyKBXuddV5Rqym8=", + "lastModified": 1734172733, + "narHash": "sha256-26j5mCeAIFmrTCbNyQq4H8Ikda+dX9+n6YJhHcZ6m6Y=", "owner": "nix-community", "repo": "NUR", - "rev": "4ae3bc562b6a45625f3e4c199624afb5b8891365", + "rev": "e06a083e1258845c7c8bcd5f4dcc2aab9964318c", "type": "github" }, "original": { @@ -864,7 +796,6 @@ "disko": "disko", "home-manager": "home-manager_2", "hyprland": "hyprland", - "lix-module": "lix-module", "nixpkgs": "nixpkgs_3", "nixpkgs-smol": "nixpkgs-smol", "nur": "nur", @@ -923,11 +854,11 @@ ] }, "locked": { - "lastModified": 1733977011, - "narHash": "sha256-o01UQJJwQWKXYGTrBy2TBmtTeCVUPmoGKVQv9JQcICk=", + "lastModified": 1734149768, + "narHash": "sha256-pdfUlO6eARnfEnmHy2rUa5DvqyaniLDNEZRGt1pj1VI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b13d7de63ad41b10bab6e96ad7aacbfa83ab1d26", + "rev": "af0b468ef40138b62eaeec905106e7b741b4eab6", "type": "github" }, "original": { @@ -996,21 +927,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1052,7 +968,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", diff --git a/flake.nix b/flake.nix index 1e578ff..f005024 100644 --- a/flake.nix +++ b/flake.nix @@ -26,12 +26,6 @@ chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; nur.url = "github:nix-community/NUR"; - lix-module = { - url = - "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; @@ -72,15 +66,19 @@ }; - outputs = { self, nixpkgs, chaotic, nur, home-manager, lix-module, disko, ... - }@inputs: + outputs = { nixpkgs, nixpkgs-smol, chaotic, home-manager, disko, ... }@inputs: let system = "x86_64-linux"; in { nixosConfigurations = { nyx = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; + specialArgs = { + inherit inputs; + pkgs-smol = import nixpkgs-smol { + inherit system; + config.allowUnfree = true; + }; + }; modules = [ - # lix-module.nixosModules.default ./hosts/nyx/configuration.nix inputs.home-manager.nixosModules.default chaotic.nixosModules.default @@ -101,7 +99,8 @@ }; epimetheus = nixpkgs.lib.nixosSystem { - modules = [ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ]; + modules = + [ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ]; }; }; };