diff --git a/home-modules/helix.nix b/home-modules/helix.nix index b63120d..697d2f7 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -27,6 +27,9 @@ insert = "bar"; select = "underline"; }; + soft-wrap = { + enable = true; + }; line-number = "relative"; color-modes = true; bufferline = "always"; @@ -44,6 +47,7 @@ newline = "↴"; tab = "⇥"; }; + }; }; languages.language = [{ @@ -175,7 +179,7 @@ }; "ui.statusline" = { "fg" = blue.bright; - # "bg" = black.base; + "bg" = black.base; }; "ui.statusline.inactive" = { "fg" = red.bright; diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index fcbeeac..2b0966a 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, inputs, host, user, nvidia, rice, lib, ... }: +{ pkgs, pkgs-unstable, inputs, host, user, nvidia, rice, lib, ... }: let animation-speed = "2"; transparency = builtins.toString rice.transparency; diff --git a/system-modules/ollama.nix b/system-modules/ollama.nix index f2bd649..1635b0b 100755 --- a/system-modules/ollama.nix +++ b/system-modules/ollama.nix @@ -1,43 +1,51 @@ -{ config, pkgs, lib, system, user, host, allowed, secrets, ... }: +{ pkgs, lib, host, nvidia, ... }: { environment.systemPackages = with pkgs; [ ollama ]; - services.ollama.environmentVariables = { - OLLAMA_ORIGINS = "*"; - }; + # services.ollama.environmentVariables = { + # OLLAMA_ORIGINS = "*"; + # }; - systemd.services.ollama = { - environment.OLLAMA_ORIGINS = "*"; - description = "Ollama Service"; - after = [ "network-online.target" "ollama-doesnt-respect-xdg-data-home.service" ]; - serviceConfig = { - Type = "simple"; - # Environment = "\"XDG_DATA_HOME=/run/current-system/sw/share\""; - ExecStart = "${pkgs.ollama}/bin/ollama serve"; - User = "ollama"; - Group = "ollama"; - Restart = "always"; - RestartSec = "3"; + # systemd.services.ollama = { + # environment.OLLAMA_ORIGINS = "*"; + # description = "Ollama Service"; + # after = [ "network-online.target" "ollama-doesnt-respect-xdg-data-home.service" ]; + # serviceConfig = { + # Type = "simple"; + # # Environment = "\"XDG_DATA_HOME=/run/current-system/sw/share\""; + # ExecStart = "${pkgs.ollama}/bin/ollama serve"; + # User = "ollama"; + # Group = "ollama"; + # Restart = "always"; + # RestartSec = "3"; + # }; + # wantedBy = [ "default.target" ]; + # }; + + # users.users.ollama = { + # isSystemUser = true; + # home = "/usr/share/ollama"; + # shell = "/bin/false"; + # group = "ollama"; + # }; + # users.groups.ollama = {}; + + # systemd.services.ollama-doesnt-respect-xdg-data-home = { + # wantedBy = ["multi-user.target"]; + # script = '' + # mkdir -p /usr/share/ollama/.ollama + # chown ollama:ollama -R /usr/share/ollama + # ''; + # }; + services.ollama = { + enable = true; + acceleration = lib.mkIf nvidia.enable "cuda"; + listenAddress = if host == "NxACE" then "0.0.0.0:11434" else "127.0.0.1:11434"; + environmentVariables = { + OLLAMA_ORIGINS = "*"; }; - wantedBy = [ "default.target" ]; - }; - - users.users.ollama = { - isSystemUser = true; - home = "/usr/share/ollama"; - shell = "/bin/false"; - group = "ollama"; - }; - users.groups.ollama = {}; - - systemd.services.ollama-doesnt-respect-xdg-data-home = { - wantedBy = ["multi-user.target"]; - script = '' - mkdir -p /usr/share/ollama/.ollama - chown ollama:ollama -R /usr/share/ollama - ''; }; }