diff --git a/flake.lock b/flake.lock index e805c96..1562abe 100755 --- a/flake.lock +++ b/flake.lock @@ -346,11 +346,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 37c97c8..697d2f7 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -1,5 +1,4 @@ -{ config, pkgs, pkgs-unstable, rice, ... }: - +{ pkgs, pkgs-unstable, rice, ... }: { home = { packages = with pkgs; [ @@ -28,6 +27,9 @@ insert = "bar"; select = "underline"; }; + soft-wrap = { + enable = true; + }; line-number = "relative"; color-modes = true; bufferline = "always"; @@ -45,6 +47,7 @@ newline = "↴"; tab = "⇥"; }; + }; }; languages.language = [{ @@ -176,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-autoname-workspaces.nix b/home-modules/hyprland-autoname-workspaces.nix index ada79da..0eae44d 100755 --- a/home-modules/hyprland-autoname-workspaces.nix +++ b/home-modules/hyprland-autoname-workspaces.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, lib, system, user, allowed, secrets, ... }: +{pkgs-unstable, lib, user, ... }: lib.mkIf (user != "tv") { home.packages = [ @@ -6,92 +6,99 @@ lib.mkIf (user != "tv") ]; home.file.".config/hyprland-autoname-workspaces/config.toml".text = '' - version = "1.1.13" + version = "1.1.14" - [class] - Signal = "󱅵" - DEFAULT = "{class}" - libreoffice-writer = "" - pavucontrol = "󰕾" - "epicgameslauncher.exe" = "󰯷" - "riotclientux.exe" = "󰰌" - "[Cc]ode" = "󰨞" - VirtualBox = "" - KiCad = "" - Gimp = "" - code-oss = "󰨞" - VSCodium = "󰨞" - Alacritty = "" - kitty = "" - vesktop = "󰙯" - "cyberpunk2077.exe" = "󰾲" - "Tor Browser" = "󰾔" - "[Tt]hunderbird" = "" - Element = "󰘨" - blueman-manager = "󰂯" - obsidian = "󰠮" - libreoffice-calc = "" - zoom = "󰬡" - mpv = "" - chatterino = "" - "com.obsproject.Studio" = "" - "leagueclientux.exe" = "󰰌" - "[sS]potify" = "" - "org.remmina.Remmina" = "󰢹" - steam = "󰓓" - "galaxyclient.exe" = "󰮡" - "[Ff]irefox" = "󰈹" - pcbnew = "" - ".*.exe" = "" - Chromium = "" - virt-manager = "" - Bitwarden = "" - "[tT]hunar" = "" - zathura = "󰈦" - discord = "󰙯" - "VirtualBox Manager" = "" - "org.inkscape.Inkscape" = "󰕙" - "VirtualBox Machine" = "" - lutris = "󰊗" - "[gG]imp-.*" = "" + [class] + VirtualBox = "" + steam = "󰓓" + "VirtualBox Manager" = "" + "com.obsproject.Studio" = "" + "[Ff]irefox" = "󰈹" + "[Tt]hunderbird" = "" + pcbnew = "" + ".*.exe" = "" + Element = "󰘨" + Signal = "󱅵" + Gimp = "" + VSCodium = "󰨞" + "[sS]potify" = "" + virt-manager = "" + lutris = "󰊗" + DEFAULT = "{class}" + "epicgameslauncher.exe" = "󰯷" + "[Cc]ode" = "󰨞" + "galaxyclient.exe" = "󰮡" + pavucontrol = "󰕾" + "Tor Browser" = "󰾔" + mpv = "" + chatterino = "" + libreoffice-writer = "" + kitty = "" + "cyberpunk2077.exe" = "󰾲" + KiCad = "" + "[tT]hunar" = "" + "riotclientux.exe" = "󰰌" + libreoffice-calc = "" + "org.remmina.Remmina" = "󰢹" + "org.inkscape.Inkscape" = "󰕙" + "VirtualBox Machine" = "" + Bitwarden = "" + "[gG]imp-.*" = "" + Chromium = "" + obsidian = "󰠮" + "leagueclientux.exe" = "󰰌" + zathura = "󰈦" + code-oss = "󰨞" + discord = "󰙯" + vesktop = "󰙯" + blueman-manager = "󰂯" + Alacritty = "" + zoom = "󰬡" - [class_active] - "(?i)ExampleOneTerm" = "icon" + [class_active] + "(?i)ExampleOneTerm" = "icon" - [initial_class] + [initial_class] - [initial_class_active] + [initial_class_active] - [workspaces_name] + [workspaces_name] - [title_in_class] - [title_in_class_active] - [title_in_initial_class] - [title_in_initial_class_active] - [initial_title_in_class] - [initial_title_in_class_active] - [initial_title_in_initial_class] - [initial_title_in_initial_class_active] + [title_in_class] - [exclude] - "(?i)fcitx" = ".*" - aProgram = "^$" - "" = "^$" - "[Ss]team" = "^(Friends List.*)?$" - "explorer.exe" = ".*" - "(?i)TestApp" = "" + [title_in_class_active] - [format] - dedup = false - dedup_inactive_fullscreen = false - delim = " " - workspace = "{id}:{clients}" - workspace_empty = "{id}" - client = "{icon}" - client_fullscreen = "{icon}" - client_active = "{icon}" - client_dup = "{icon}{counter_sup}" - client_dup_active = "*{icon}*{delim}{icon}{counter_unfocused_sup}" - client_dup_fullscreen = "[{icon}]{delim}{icon}{counter_unfocused_sup}" + [title_in_initial_class] + + [title_in_initial_class_active] + + [initial_title_in_class] + + [initial_title_in_class_active] + + [initial_title_in_initial_class] + + [initial_title_in_initial_class_active] + + [exclude] + aProgram = "^$" + "" = "^$" + "(?i)fcitx" = ".*" + "[Ss]team" = "^(Friends List.*)?$" + "explorer.exe" = ".*" + "(?i)TestApp" = "" + + [format] + dedup = false + dedup_inactive_fullscreen = false + delim = " " + workspace = "{id}:{clients}" + workspace_empty = "{id}" + client = "{icon}" + client_fullscreen = "{icon}" + client_active = "{icon}" + client_dup = "{icon}{counter_sup}" + client_dup_active = "*{icon}*{delim}{icon}{counter_unfocused_sup}" + client_dup_fullscreen = "[{icon}]{delim}{icon}{counter_unfocused_sup}" ''; -} \ No newline at end of file +} diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index e6784fb..59293fe 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 - ''; }; }