diff --git a/flake.lock b/flake.lock index 549ca43..6338aa9 100644 --- a/flake.lock +++ b/flake.lock @@ -608,11 +608,11 @@ ] }, "locked": { - "lastModified": 1764891212, - "narHash": "sha256-74ZPvCEmT5JatN227aSBOnORAtW3RWcMjjAkeiHp8UE=", + "lastModified": 1764912896, + "narHash": "sha256-ftxQocr098v5ngqB3SXa9tW6aqovBSBOEdIRcLEj44c=", "owner": "nix-community", "repo": "home-manager", - "rev": "df7bac2b2bdbaae8f9100be4e4cd21c7155611e9", + "rev": "6bcb2395ab9ed05616052262da526cd7c5b4b123", "type": "github" }, "original": { @@ -641,11 +641,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1764899704, - "narHash": "sha256-ieFJUlQ5DyhVDx/cNfziypv5SSDT7OlOZGD+xzPTGCU=", + "lastModified": 1764950034, + "narHash": "sha256-6yieaKFC8qzuiC/ll4mXFILKQbTALPWLaAFHazaKbt0=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "83f3236c603bf9132cb321892306dcb9f00bf4a1", + "rev": "66dd4ded0cbdaaf4917379d545c3f0b7621f31fe", "type": "github" }, "original": { @@ -657,11 +657,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1764899272, - "narHash": "sha256-SvPuKmnuSdK1/SHBvdoar81UrL7kLblezRPa5y4ck6U=", + "lastModified": 1764950598, + "narHash": "sha256-LMQp2OiQ2RtXm8yM2MG0nNZH7C5B7YCyjyillmlLhGQ=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "ba1a9678fea7f697483178fe8a495cd587a20b46", + "rev": "f32ca383821af7493be6646d3284e23beb4bb8f0", "type": "github" }, "original": { @@ -713,11 +713,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1764746434, - "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -924,11 +924,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1764813642, - "narHash": "sha256-z/znqf9lNPFfFcUEh0K1hD+SDWu7E1ZCaMq8iZLhRWY=", + "lastModified": 1764900054, + "narHash": "sha256-eMQ+eu5u/3AkhZ5zm3CaE7GSrP3Ca+70WzPs51uNKZ0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "8a8477df6c22e188f61ea011c4654cf1a929fa54", + "rev": "7194cfbf5b270c228ff189078e6d345ead97ae69", "type": "github" }, "original": { @@ -1126,11 +1126,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1764677808, - "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { @@ -1174,16 +1174,16 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1764897201, + "narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 825cb61..1f2a15e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; # The name "snowfall-lib" is required due to how Snowfall Lib processes your diff --git a/modules/nixos/homeassistant/services/homeassistant/default.nix b/modules/nixos/homeassistant/services/homeassistant/default.nix index 871d378..0cfda60 100644 --- a/modules/nixos/homeassistant/services/homeassistant/default.nix +++ b/modules/nixos/homeassistant/services/homeassistant/default.nix @@ -29,7 +29,6 @@ in "bluetooth" "bluetooth_adapters" "bluetooth_le_tracker" - "bluetooth_tracker" "brother" "browser" "button" @@ -47,7 +46,6 @@ in "configurator" "counter" "cpuspeed" - "cups" "date" "datetime" "deluge" @@ -122,8 +120,6 @@ in "ipp" "isal" "jellyfin" - "keyboard" - "keyboard_remote" "lidarr" "light" "litterrobot" diff --git a/modules/nixos/services/ai/default.nix b/modules/nixos/services/ai/default.nix index b563f88..b63d9e5 100755 --- a/modules/nixos/services/ai/default.nix +++ b/modules/nixos/services/ai/default.nix @@ -15,12 +15,12 @@ in config = mkIf cfg.enable { services.ollama = { enable = true; + package = pkgs.ollama-rocm; port = 11434; host = "0.0.0.0"; user = "nix-apps"; group = "jallen-nas"; openFirewall = true; - acceleration = "rocm"; rocmOverrideGfx = "11.0.2"; loadModels = [ "mistral:instruct" ]; home = "/media/nas/main/nix-app-data/ollama"; @@ -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.llama-cpp; + package = pkgs.llama-cpp-rocm; extraFlags = [ "--n_gpu-layers" "500"