diff --git a/hosts/galadriel/configuration.nix b/hosts/galadriel/configuration.nix index adc56b2..cb883c4 100644 --- a/hosts/galadriel/configuration.nix +++ b/hosts/galadriel/configuration.nix @@ -13,7 +13,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./nvidia.nix + #./nvidia.nix #we have intel gpu now ../../modules/boot.nix ../../modules/zram.nix ../../modules/zfs.nix @@ -42,7 +42,7 @@ ]; #Load zfs pool - boot.zfs.extraPools = [ "Main" ]; + boot.zfs.extraPools = [ "Main" "lorien" ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; diff --git a/hosts/galadriel/hardware-configuration.nix b/hosts/galadriel/hardware-configuration.nix index d77f921..c1bba1b 100644 --- a/hosts/galadriel/hardware-configuration.nix +++ b/hosts/galadriel/hardware-configuration.nix @@ -26,6 +26,18 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + environment.systemPackages = with pkgs; [ + mkl + ]; + + hardware.graphics = { + enable = true; + extraPackages = with pkgs; [ + vpl-gpu-rt + + ]; + }; + fileSystems."/" = { device = "/dev/disk/by-uuid/7789ad41-d578-40bc-bf86-b761e0a4921e"; fsType = "btrfs"; diff --git a/modules/basePackages.nix b/modules/basePackages.nix index c5c9d08..2bb85d3 100644 --- a/modules/basePackages.nix +++ b/modules/basePackages.nix @@ -10,6 +10,8 @@ git wget htop + bottom + nvtopPackages.full busybox nixfmt-rfc-style nixfmt-tree diff --git a/modules/immich.nix b/modules/immich.nix index b1a3b00..2873205 100644 --- a/modules/immich.nix +++ b/modules/immich.nix @@ -12,7 +12,7 @@ openFirewall = true; - mediaLocation = "/Main/Data/media/pictures"; + mediaLocation = "/lorien/media/pictures"; accelerationDevices = null; settings = { diff --git a/modules/nix.nix b/modules/nix.nix index 2c3d207..e6f48b2 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -73,7 +73,8 @@ system = "x86_64-linux"; maxJobs = 4; speedFactor = 4001; - supportedFeatures = [ "cuda" ]; + #supportedFeatures = [ "cuda" ]; + supportedFeatures = [ ]; mandatoryFeatures = [ ]; } diff --git a/hosts/galadriel/nvidia.nix b/modules/nvidia.nix similarity index 100% rename from hosts/galadriel/nvidia.nix rename to modules/nvidia.nix diff --git a/modules/ollama.nix b/modules/ollama.nix index a923022..b8ea239 100644 --- a/modules/ollama.nix +++ b/modules/ollama.nix @@ -15,15 +15,17 @@ in services.ollama = { enable = true; - package = pkgs.unstable.ollama; + package = lib.mkDefault pkgs.unstable.ollama-vulkan; + acceleration = lib.mkDefault "vulkan"; host = "0.0.0.0"; openFirewall = true; port = 11434; home = "/var/lib/ollama"; - + environmentVariables = { + OLLAMA_CONTEXT_LENGTH="32000"; + }; # Preloaded models loadModels = [ - "gemma3:1b" "qwen3:latest" "qwen3:4b" "qwen3:0.6b" diff --git a/modules/qbittorrent.nix b/modules/qbittorrent.nix index c236e6f..5901af5 100644 --- a/modules/qbittorrent.nix +++ b/modules/qbittorrent.nix @@ -4,6 +4,9 @@ pkgs, ... }: +let +dataLocation = "/lorien/media/" +in { sops.secrets."qbittorrent/interfaceAddress" = { restartUnits = [ "qbittorrent-nox.service" ]; @@ -45,9 +48,9 @@ AnonymousModeEnabled = false; BTProtocol = "Both"; BandwidthSchedulerEnabled = false; - DefaultSavePath = "/Main/Data/media/Downloads"; + DefaultSavePath = dataLocation+"Downloads"; Encryption = 1; - FinishedTorrentExportDirectory = "/Main/Data/media/Downloads/torrents-complete"; + FinishedTorrentExportDirectory =dataLocation+"Downloads/torrents-complete"; GlobalDLSpeedLimit = 0; GlobalMaxRatio = 1.5; GlobalUPSpeedLimit = 0; @@ -69,7 +72,7 @@ TempPath = "/Main/Data/media/Downloads/temp"; TempPathEnabled = true; TorrentContentLayout = "Subfolder"; - TorrentExportDirectory = "/Main/Data/media/Downloads/torrents"; + TorrentExportDirectory = dataLocation "Downloads/torrents"; UseAlternativeGlobalSpeedLimit = false; }; };