diff --git a/flake.lock b/flake.lock index 79972cb..55bc725 100644 --- a/flake.lock +++ b/flake.lock @@ -268,22 +268,6 @@ "type": "github" } }, - "flake-compat_7": { - "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-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -363,17 +347,17 @@ "flake-utils": "flake-utils_3" }, "locked": { - "lastModified": 1715533576, - "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "lastModified": 1738591040, + "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1", "type": "github" }, "original": { "owner": "gytis-ivaskevicius", + "ref": "master", "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" } }, @@ -517,11 +501,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1764545050, - "narHash": "sha256-wZlUQExsOUux+/WP5M4afd7wQpLMHh+rMsujJw/0z70=", + "lastModified": 1764599891, + "narHash": "sha256-q2JwTIpkqt4ssuTq4WYdix6XliGjUF5H4o/xWdqnQH4=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "4e2c0d13f695a41fd04411f3856163f1ba03236d", + "rev": "f9ffcf2d6ddbc19a0944e1a9b9c91295edbcce89", "type": "github" }, "original": { @@ -533,11 +517,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1764546320, - "narHash": "sha256-f/Frb0Hs1/BNF+tbM8KaAOrcp3eHEbOdXhp6BxWzUsw=", + "lastModified": 1764602306, + "narHash": "sha256-mhaPQl/2y6MhfkSvW9oiSwk/eWhZWDphuKvahhHHQPQ=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "591f86a7386f76f8fa257d28512d4876aac23951", + "rev": "b7ada3645119464815703ee5b6abdc9ee4fbcfde", "type": "github" }, "original": { @@ -779,11 +763,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1764468530, - "narHash": "sha256-ZdR7SQQujR2RBO7/RDX3YxSzACp2GtNLkGIan00uGJM=", + "lastModified": 1764555746, + "narHash": "sha256-6TzxH1Y2uFU1hAW7rr4PT5kDWfPH72hq/zDBjaVAqLs=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "be03779934f17ae394f526dd2d7acda2b7bee7d1", + "rev": "5ff4631fd35568ed2ea9c4e15ebc213a69c06dba", "type": "github" }, "original": { @@ -942,11 +926,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1764494334, - "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d542db745310b6929708d9abea513f3ff19b1341", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { @@ -1006,11 +990,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -1372,22 +1356,21 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1736130495, - "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=", - "owner": "snowfallorg", + "lastModified": 1764603586, + "narHash": "sha256-bJK+w6XxNRXtPevYgzlfXulgSql9HqOvKJV8ADWJNZ8=", + "owner": "mjallen18", "repo": "lib", - "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac", + "rev": "ddfab125d3331c792c02a98fb1b0cb1fec755e9a", "type": "github" }, "original": { - "owner": "snowfallorg", + "owner": "mjallen18", "repo": "lib", "type": "github" } diff --git a/flake.nix b/flake.nix index a0c4e71..77c6bd0 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # The name "snowfall-lib" is required due to how Snowfall Lib processes your # flake's inputs. snowfall-lib = { - url = "github:snowfallorg/lib"; + url = "github:mjallen18/lib"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix index 80db039..c0d566b 100755 --- a/modules/nixos/gaming/default.nix +++ b/modules/nixos/gaming/default.nix @@ -40,7 +40,7 @@ in alvr = { enable = true; openFirewall = true; - package = pkgs.stable.alvr; + package = pkgs.alvr; }; gamescope = { diff --git a/modules/nixos/services/ai/default.nix b/modules/nixos/services/ai/default.nix index 6c31c94..b563f88 100755 --- a/modules/nixos/services/ai/default.nix +++ b/modules/nixos/services/ai/default.nix @@ -32,7 +32,7 @@ in host = "0.0.0.0"; openFirewall = true; model = "/media/nas/main/nix-app-data/llama-cpp/models/functionary-small-v3.2-GGUF/functionary-small-v3.2.Q4_0.gguf"; - package = pkgs.stable.llama-cpp; + package = pkgs.llama-cpp; extraFlags = [ "--n_gpu-layers" "500" @@ -46,7 +46,7 @@ in services.open-webui = { enable = true; - package = pkgs.stable.open-webui; + package = pkgs.open-webui; host = "0.0.0.0"; port = 8888; openFirewall = true; diff --git a/modules/nixos/services/paperless/default.nix b/modules/nixos/services/paperless/default.nix index 3298b9c..a718523 100755 --- a/modules/nixos/services/paperless/default.nix +++ b/modules/nixos/services/paperless/default.nix @@ -38,8 +38,8 @@ in port = paperlessPort; user = "paperless"; address = "0.0.0.0"; - passwordFile = "/var/lib/paperless/paperless-password"; - # environmentFile = paperlessEnv; # unstable is too unstable, but this doesnt exist in stable.... disabling altogether.... + # passwordFile = "/var/lib/paperless/paperless-password"; + environmentFile = paperlessEnv; }; # Create required users and groups diff --git a/modules/nixos/services/wyoming/default.nix b/modules/nixos/services/wyoming/default.nix index 0602669..65d7e5f 100755 --- a/modules/nixos/services/wyoming/default.nix +++ b/modules/nixos/services/wyoming/default.nix @@ -22,14 +22,13 @@ in uri = "tcp://0.0.0.0:10300"; }; - # piper = { - # package = pkgs.stable.wyoming-piper; - # servers.hass-piper = { - # enable = true; - # voice = "en-us-ryan-high"; - # uri = "tcp://0.0.0.0:10200"; - # }; - # }; + piper = { + servers.hass-piper = { + enable = true; + voice = "en-us-ryan-high"; + uri = "tcp://0.0.0.0:10200"; + }; + }; }; }; }