From ca4e63650bfe066313ec4c5407740dbe1664e3f0 Mon Sep 17 00:00:00 2001 From: adikro Date: Mon, 1 Dec 2025 21:50:57 +0100 Subject: added ollama --- flake.lock | 102 ++++++++++++++++++++-------------------- home/home.nix | 2 + home/wayland/niri/niri.nix | 1 + hosts/desktop/configuration.nix | 13 ++--- modules/audio.nix | 6 --- modules/ollama.nix | 20 ++++++++ 6 files changed, 79 insertions(+), 65 deletions(-) create mode 100644 modules/ollama.nix diff --git a/flake.lock b/flake.lock index 374fd94..5ca2197 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1764351487, - "narHash": "sha256-7XJcTfz0dPhBd7nfyjcFxT1LIIctJZ2LthiI2Ltd7zY=", + "lastModified": 1764596563, + "narHash": "sha256-tH3AGDWlAN3ImVuBBCLmqaqD0EbkISiPCHGeMcd430k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "2031f4a0507d0f7ab3e1aaff4c027a010feee447", + "rev": "0701ee838b0fb34a77b6dd4b35476b4bb09fbca9", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1764510518, - "narHash": "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ=", + "lastModified": 1764603455, + "narHash": "sha256-Q70rxlbrxPcTtqWIb9+71rkJESxIOou5isZBvyOieXw=", "owner": "nix-community", "repo": "home-manager", - "rev": "83053e1d337f33e0b48250588006e4b9df2f0d9d", + "rev": "effe4c007d6243d9e69ce2242d76a2471c1b8d5c", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1764515131, - "narHash": "sha256-gDP05ePlorViRWcDA3eYu4l+3NE53sayi6iHaaQDEMA=", + "lastModified": 1764607679, + "narHash": "sha256-1Bsem6lhJWMQmkLIml5oKOL+z1dYMewZ6ql0K35Y3TA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bb963fb00263bac78a0c633d1d0d02ae4763222c", + "rev": "f82a8630d7a51dab4cc70924f500bf70e723db12", "type": "github" }, "original": { @@ -701,11 +701,11 @@ ] }, "locked": { - "lastModified": 1764461186, - "narHash": "sha256-KH7BJQ1Bgf/k3mPZU1LYkUkxUKtCGWR2JU//nDfNcP4=", + "lastModified": 1764547590, + "narHash": "sha256-PDVKI5QCPfzVCPY/ZYAQTHGwC9ksT8ISNVaVZDVzb54=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b7478189e2816460e308d51e5863b0c8dfb584de", + "rev": "71ba04d8a26327031fd58284af4a4891d7b3c842", "type": "github" }, "original": { @@ -717,11 +717,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1764444989, - "narHash": "sha256-Ivlfkx/vmW2fXXUoK4WcwPAetBbMqY0KVWDpVW6XoUQ=", + "lastModified": 1764519732, + "narHash": "sha256-R0UspjBwPi5St0Dxq9Ej9ejJ34K8ivF5WeCS9dMvvVQ=", "owner": "neovim", "repo": "neovim", - "rev": "a4b2192690d7ed7c919708d8a50629c5b5cdfb50", + "rev": "d62bbe24cbe5311ce595d73a0c40dc87af989666", "type": "github" }, "original": { @@ -742,11 +742,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764488513, - "narHash": "sha256-xBUnv+ndZxRbY9mYSPEP0afaZRUVXDFcJx0WMD4ypfs=", + "lastModified": 1764595404, + "narHash": "sha256-FMKDx+r0c7L1ekkIt2dNYgvXULVfSCDN9zXnAOnArew=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9e3bbd170669d10846bae68d23dabef11832f8f2", + "rev": "36483fec897fc0c336b3075b3b2d387edac71c9e", "type": "github" }, "original": { @@ -820,11 +820,11 @@ ] }, "locked": { - "lastModified": 1764489870, - "narHash": "sha256-9OUgV/Ks1JKnjR/9nzViCCLMGvW24dlLj7RGIsgLaMc=", + "lastModified": 1764576281, + "narHash": "sha256-f6vfwmIb9C3brI4/KJ9MFUDWt6FsKQ0dbMO6AuFc7E0=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "0d9cdbda7b32f14ae8de6cea61e81d072a2bfaba", + "rev": "c8f47894134a4984acd319e66c4384eb1ff886e2", "type": "github" }, "original": { @@ -835,11 +835,11 @@ }, "nixpkgs": { "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": { @@ -866,11 +866,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { @@ -882,11 +882,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { @@ -898,11 +898,11 @@ }, "nixpkgs_2": { "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": { @@ -938,11 +938,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1764443358, - "narHash": "sha256-bd9I02P/Mp9yYGcSWgLLdI/Zt0JqF8igSTAfUzknVHk=", + "lastModified": 1764611906, + "narHash": "sha256-8UbK91SY+IN93IsA59G1W0IclCCgJ95DhNxi9b1YLHw=", "owner": "nix-community", "repo": "nixvim", - "rev": "6094d2a4396c0ff4e94b22315cc43f55db626c32", + "rev": "ee6ccaae42fc032ca4678951b48f92c635cb8ebc", "type": "github" }, "original": { @@ -958,11 +958,11 @@ ] }, "locked": { - "lastModified": 1764518881, - "narHash": "sha256-Z1a2uKodSmMiMUquIexC+5RydDe0Ja0+hFEGqVuBLcs=", + "lastModified": 1764621543, + "narHash": "sha256-cSUgRN2X0CAnAZy2Rm80eDwm+1YUpZUIByFn0t8jqSU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a773300469ecae6f1c68ff234683ea739a32c1b8", + "rev": "a498c851c31e6ec7eaca7147c10056523c6d7f07", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ ] }, "locked": { - "lastModified": 1764435951, - "narHash": "sha256-6LKbXoOJVVWQLYhAs6pmKrBzRKglMNwGWkw1cFGyRmQ=", + "lastModified": 1764619790, + "narHash": "sha256-yzCL5N4HkuTSSwHZYDx9+9vP1zUs1UnTyhq19BTojj8=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "603da29f28b56d7f36f258b0ae318071f8bc6a66", + "rev": "5e54f9e2233c68c2d367bb3fe35267f149ccea10", "type": "github" }, "original": { @@ -1148,11 +1148,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1764313190, - "narHash": "sha256-yAkUKVIwhTwkF/p4hMUQhWH5HaitHbAiH4pvCrbobcE=", + "lastModified": 1764564952, + "narHash": "sha256-KzXYifmgNQ62AsWH+oVUXbr8MrdNZtNE1dwexe1Z4RQ=", "owner": "gabm", "repo": "Satty", - "rev": "3848015764af30483daa5abce649231faed2d766", + "rev": "ff64a96055eb4c4257af979ca82be3e773da2e15", "type": "github" }, "original": { @@ -1339,11 +1339,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764366786, - "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=", + "lastModified": 1764560400, + "narHash": "sha256-Qz1WvGdawnoz4dG3JtCtlParmdQHM5xu6osnXeVOqYI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b362a3873710a42f7ac2d8ba03772d8290733934", + "rev": "9a71e77b1e06dbad4a472265e59b52ac83cbe00c", "type": "github" }, "original": { @@ -1361,11 +1361,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1764485057, - "narHash": "sha256-RYGb6lEowzdRlHm0YlEVEB97hROMlSZB3ywPi+Zzcm8=", + "lastModified": 1764599976, + "narHash": "sha256-/S9Wf9lGRqWR2lf7qGROmGBHtEhJLVPkVFMnXTFWcrQ=", "owner": "sxyazi", "repo": "yazi", - "rev": "0fb652d2ecaeb3d9af7e0c94a4a6a59b4e7171c8", + "rev": "44e244b9d6d4427d74b58a2a3bc971dc923e12db", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 02f896d..f4342a2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -27,6 +27,8 @@ home.stateVersion = "25.05"; home.packages = with pkgs; [ + halloy + xdg-utils wofi librewolf firefox diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix index 60a5e16..e14f224 100644 --- a/home/wayland/niri/niri.nix +++ b/home/wayland/niri/niri.nix @@ -68,6 +68,7 @@ }; }; spawn-at-startup = [ + { command = [ "dbus-update-activation-environment" "--systemd" "DISPLAY" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP" "SWAYSOCK" "XDG_SESSION_TYPE" "NIXOS_OZONE_WL" ]; } { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } { command = [ "awww-daemon" ]; } { command = [ "wl-paste --watch cliphist store" ]; } diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index f22c4d6..efec049 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -14,6 +14,7 @@ ../../modules/tor.nix ../../modules/hyprland.nix ../../modules/niri.nix + ../../modules/ollama.nix inputs.home-manager.nixosModules.home-manager inputs.chaotic.nixosModules.default ]; @@ -100,7 +101,7 @@ services.lact.enable = true; chaotic = { mesa-git = { enable = true; - fallbackSpecialisation = true; + fallbackSpecialisation = false; extraPackages = with pkgs; [ mesa_git.opencl ]; @@ -112,10 +113,8 @@ services.dbus.enable = true; xdg.portal = { enable = true; xdgOpenUsePortal = true; - wlr = { - enable = true; - }; extraPortals = with pkgs; [ + xdg-desktop-portal-gnome xdg-desktop-portal-gtk ]; }; @@ -154,11 +153,9 @@ environment.sessionVariables = { programs.fish.enable = true; - programs.adb.enable = true; - users.users.adam = { isNormalUser = true; - extraGroups = [ "wheel" "input" "docker" "adbusers" ]; + extraGroups = [ "wheel" "input" "docker" ]; home = "/home/adam"; shell = pkgs.fish; }; @@ -182,8 +179,8 @@ environment.sessionVariables = { nix-output-monitor nvd rivalcfg - easyeffects lutris + easyeffects ]; fonts.packages = with pkgs; [ diff --git a/modules/audio.nix b/modules/audio.nix index e7579c1..05bc8a0 100644 --- a/modules/audio.nix +++ b/modules/audio.nix @@ -1,8 +1,6 @@ { ... }: - { services = { - pipewire = { enable = true; audio.enable = true; @@ -12,10 +10,6 @@ jack.enable = true; wireplumber.enable = true; }; - -# easyeffects = { -# enable = true; -# }; playerctld = { enable = true; }; diff --git a/modules/ollama.nix b/modules/ollama.nix new file mode 100644 index 0000000..326e8c5 --- /dev/null +++ b/modules/ollama.nix @@ -0,0 +1,20 @@ +{ ... }: +{ + fileSystems."/var/lib/ollama/models" = { + device = "/home/ollama"; + fsType = "none"; + options = [ "bind" ]; + }; + + services.ollama = { + enable = true; + acceleration = "rocm"; + # loadModels = [ + # "deepseek-r1:14b" + # ]; + # syncModels = true; + user = "ollama"; + models = "/var/lib/ollama/models"; + }; + services.nextjs-ollama-llm-ui.enable = true; +} -- cgit v1.3