diff --git a/flake.lock b/flake.lock index bc2aa35..b641e65 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737534778, - "narHash": "sha256-7h/lJWRzKKCmpKmgGk2ZzWbj73Dqi607grXC/EhFQMI=", + "lastModified": 1737973837, + "narHash": "sha256-LrM+QVWUZhPKbjm2I5EkypupivGHjr/AM4rCaNbCFfE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a650b785c5d2b064777e0c5af7a414267a8fc934", + "rev": "f19af140dacd0e211a25cf907be46356347e190f", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1738261073, + "narHash": "sha256-469d7Sr5vKYEXmm5z+o+NoWFZvoTd9djv9JqDtc0AAg=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "a5e196d61f6e564f7fdeeb4a92cef92e1785d3f5", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "impermanence": { "locked": { - "lastModified": 1736688610, - "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1737357122, - "narHash": "sha256-xus6cje9ry/RJjBLqE+rSZx50CIYyBmeSXll1Bgb/3g=", + "lastModified": 1738064867, + "narHash": "sha256-vaBgjmBHdkoTDPEy4YnTDvUvrbEXYftTnCtCZmw4EDo=", "owner": "taj-ny", "repo": "kwin-effects-forceblur", - "rev": "f4ef0fbf2dea2ece4e414d52e9126aa07b8a5579", + "rev": "d7e46df232327f3d506c69f99177f2311ea4cd75", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1737504076, - "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", - "owner": "NixOS", + "lastModified": 1737929020, + "narHash": "sha256-UC9ARAC8mRxQozZ6eO+KofV2Dd7KShl6X8XZz/ecNHg=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "b200ab4d4c4bc99681909139b900f10ad70bc02b", "type": "github" }, "original": { @@ -274,16 +274,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737632463, - "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", + "lastModified": 1738223116, + "narHash": "sha256-Igf0oHuV2W8tV2OQqDsm9Fg5ct9rLuBD9h5GPAiq/qc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", + "rev": "c25903f220d0b558887672cc8321dddf91e99f7e", "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 05b1af7..0ada073 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Your new nix config"; inputs = { - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixos-hardware.url = "github:nixos/nixos-hardware/master"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index 7f4a4ab..04102e5 100644 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -159,12 +159,13 @@ in { enable = true; enable32Bit = true; # doesnt build atm - # extraPackages = with pkgs; [rocmPackages.clr.icd]; + extraPackages = with pkgs; [ + clinfo + rocmPackages.clr.icd + rocmPackages.rocminfo + rocmPackages.rocm-runtime + ]; }; - - # cpu.x86.msr = { - # enable = true; - # }; }; powerManagement = { @@ -184,6 +185,17 @@ in { pulse.enable = true; }; + ollama = { + enable = true; + acceleration = "rocm"; + environmentVariables = { + HCC_AMDGPU_TARGET = "gfx1100"; # used to be necessary, but doesn't seem to anymore + }; + rocmOverrideGfx = "11.0.0"; + }; + + open-webui.enable = true; + samba = { enable = true; settings = {