diff --git a/flake.lock b/flake.lock index b5613c5..94f0a60 100644 --- a/flake.lock +++ b/flake.lock @@ -111,28 +111,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "steam-servers", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705332421, - "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", - "owner": "numtide", - "repo": "devshell", - "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -203,23 +181,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "v1.0.1", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "flake": false, "locked": { "lastModified": 1650374568, @@ -235,99 +196,16 @@ "type": "github" } }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "steam-servers", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-root": { - "locked": { - "lastModified": 1692742795, - "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=", - "owner": "srid", - "repo": "flake-root", - "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -355,79 +233,6 @@ "type": "github" } }, - "flake-utils-plus_2": { - "inputs": { - "flake-utils": "flake-utils_2" - }, - "locked": { - "lastModified": 1715533576, - "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -450,28 +255,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "steam-servers", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gpg-base-conf": { "flake": false, "locked": { @@ -1044,25 +827,6 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1748397391, - "narHash": "sha256-g2quQIkkDOHFMipUOBs7+D3xr490slZp9qiamOkPzO4=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "39bae253dc201cfe03ee53bd90ed813f89afa9cd", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nix-ld": { "inputs": { "nixpkgs": [ @@ -1152,32 +916,17 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1746906442, - "narHash": "sha256-kQme/JyxLvfpabjoeOwEBzX/3fgkiCqffknGljeT1SU=", + "lastModified": 1748117141, + "narHash": "sha256-Pns1JFJE07tmpwvsBH6wUYb4YxFyWQ0a3H+/4sK+d00=", "owner": "Daholli", "repo": "nixpkgs", - "rev": "b7b8918da23391e1bd5f12e2f2f602455680fb67", + "rev": "1f36f691a2a05eb0785d35164ba03962607348bf", "type": "github" }, "original": { "owner": "Daholli", "repo": "nixpkgs", - "rev": "b7b8918da23391e1bd5f12e2f2f602455680fb67", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "rev": "1f36f691a2a05eb0785d35164ba03962607348bf", "type": "github" } }, @@ -1197,22 +946,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-tuya-vacuum": { "locked": { "lastModified": 1743180016, @@ -1294,22 +1027,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1748190013, "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", @@ -1325,7 +1042,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -1340,7 +1057,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -1356,7 +1073,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1743448293, "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", @@ -1395,31 +1112,6 @@ "type": "github" } }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_4", - "gitignore": "gitignore_2", - "nixpkgs": [ - "steam-servers", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "raspberry-pi-nix": { "inputs": { "libcamera-src": "libcamera-src", @@ -1463,21 +1155,18 @@ "hyprland-plugins": "hyprland-plugins", "hyprlock": "hyprlock", "hyprpanel": "hyprpanel", - "nix-gaming": "nix-gaming", "nix-ld": "nix-ld", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-latest-factorio": "nixpkgs-latest-factorio", "nixpkgs-master": "nixpkgs-master", "nixpkgs-tuya-vacuum": "nixpkgs-tuya-vacuum", "nixpkgs-unstable": "nixpkgs-unstable", "raspberry-pi-nix": "raspberry-pi-nix", "simple-nixos-mailserver": "simple-nixos-mailserver", - "snowfall-flake": "snowfall-flake", - "snowfall-lib": "snowfall-lib_2", + "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", - "steam-servers": "steam-servers", "tuya-vaccum-maps": "tuya-vaccum-maps", "zen-browser": "zen-browser" } @@ -1643,7 +1332,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { @@ -1661,56 +1350,10 @@ "type": "gitlab" } }, - "snowfall-flake": { - "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "snowfall-lib": "snowfall-lib" - }, - "locked": { - "lastModified": 1716675632, - "narHash": "sha256-AOgmoVZvMPUMSlHMrRjWaPykNS5YWxnUNp7STgfjGdA=", - "owner": "snowfallorg", - "repo": "flake", - "rev": "d3b1167f7265d28549930b95b98327c277ef8afd", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "flake", - "type": "github" - } - }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils-plus": "flake-utils-plus", - "nixpkgs": [ - "snowfall-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716675292, - "narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "5d6e9f235735393c28e1145bec919610b172a20f", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "ref": "v3.0.2", - "repo": "lib", - "type": "github" - } - }, - "snowfall-lib_2": { - "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" ] @@ -1731,7 +1374,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1747603214, @@ -1747,53 +1390,6 @@ "type": "github" } }, - "steam-fetcher": { - "inputs": { - "nixpkgs": [ - "steam-servers", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703704267, - "narHash": "sha256-X44wqMWyaMsymcrgxwlnEWDplcop54e3eopfJ/p+S3s=", - "owner": "aidalgol", - "repo": "nix-steam-fetcher", - "rev": "aa223d3d03fd60a7b9f20831a06776ca0f1b3630", - "type": "github" - }, - "original": { - "owner": "aidalgol", - "repo": "nix-steam-fetcher", - "type": "github" - } - }, - "steam-servers": { - "inputs": { - "devshell": "devshell", - "flake-parts": "flake-parts_2", - "flake-root": "flake-root", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks_2", - "steam-fetcher": "steam-fetcher", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1712364428, - "narHash": "sha256-DpKCpHXIokf2G6gO6gvv3JtzhvhRI9HB3hLrGVrvSIY=", - "owner": "scottbot95", - "repo": "nix-steam-servers", - "rev": "42f01ff2d2635b4f559264e988ac8f6e803a6623", - "type": "github" - }, - "original": { - "owner": "scottbot95", - "repo": "nix-steam-servers", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1689347949, @@ -1839,57 +1435,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "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": [ - "steam-servers", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707300477, - "narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "ac599dab59a66304eb511af07b3883114f061b9d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "tuya-vaccum-maps": { "flake": false, "locked": { @@ -1963,7 +1508,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1748402010, diff --git a/flake.nix b/flake.nix index 2ed9a59..dfe5487 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/b7b8918da23391e1bd5f12e2f2f602455680fb67"; + nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/1f36f691a2a05eb0785d35164ba03962607348bf"; nixpkgs-tuya-vacuum.url = "github:Daholli/nixpkgs/84b34e39e7a0879367189f34401191f6a0364bcf"; home-manager = { @@ -51,11 +51,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - snowfall-flake = { - url = "github:snowfallorg/flake"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - helix = { url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -80,13 +75,6 @@ simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/b4fbffe79c00f19be94b86b4144ff67541613659"; catppuccin.url = "github:catppuccin/nix"; - nix-gaming.url = "github:fufexan/nix-gaming"; - - steam-servers = { - url = "github:scottbot95/nix-steam-servers"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ############### # homeassitant @@ -130,7 +118,6 @@ outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; }; overlays = with inputs; [ - snowfall-flake.overlays.default hyprpanel.overlay ]; diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 64bf9dc..dfe7b92 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -41,7 +41,6 @@ in }) cfg.extra-substituters; environment.systemPackages = with pkgs; [ - snowfallorg.flake nixfmt-rfc-style nix-prefetch-git nix-du