diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix index ff8d6db6..3c898436 100644 --- a/home-manager/common/software/cli/nixvim.nix +++ b/home-manager/common/software/cli/nixvim.nix @@ -38,10 +38,9 @@ plugins = { ollama = { enable = true; - model = "vanilj/Phi-4"; + model = "qwen2.5-coder:0.5b"; url = "http://127.0.0.1:11434"; action = "display"; - serve.onStart = true; }; dressing.enable = true; lsp-lines.enable = true; diff --git a/nixos/common/services/ollama.nix b/nixos/common/services/ollama.nix index 82825a00..aaf8ee07 100644 --- a/nixos/common/services/ollama.nix +++ b/nixos/common/services/ollama.nix @@ -1,9 +1,16 @@ { pkgs, ... }: { + + environment.systemPackages = [ + pkgs.oterm + ]; + services.ollama = { enable = true; openFirewall = true; loadModels = [ - "vanilj/Phi-4" + "vanilj/Phi-4" + "qwen2.5-coder:3b" + "qwen2.5-coder:0.5b" ]; }; } diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index d632fe62..17c0d852 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -13,6 +13,7 @@ ../../common/services/syncthing.nix ]; + services.ollama.acceleration = "cuda"; #### TEMPORARY TODO #### environment.variables = { MOZ_ENABLE_WAYLAND = 1; diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix index 30cf75ad..7fc7efdf 100644 --- a/nixos/hosts/nixos-framework/default.nix +++ b/nixos/hosts/nixos-framework/default.nix @@ -15,6 +15,9 @@ ../../common/services/ollama.nix ]; + services.ollama.acceleration = "rocm"; + services.ollama.package = pkgs.ollama-rocm; + hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot @@ -45,9 +48,8 @@ # Set the networking hostname: networking.hostName = "nixos-framework"; hardware = { - graphics = { - enable = true; - }; + graphics.enable = true; + amdgpu.opencl.enable = true; }; diff --git a/wallpapers b/wallpapers index 8ed82c9a..26552d8b 160000 --- a/wallpapers +++ b/wallpapers @@ -1 +1 @@ -Subproject commit 8ed82c9afaac6359cf4603196f7a5bd4b399a4b5 +Subproject commit 26552d8bade6fa39188ebf68e9ffa1a8dcd75108