Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

flake.lock

@@ -346,11 +346,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1715534503,
+        "lastModified": 1715787315,
-        "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
+        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
+        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
         "type": "github"
       },
       "original": {

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;

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]
+    [class]
-      Signal = "󱅵"
+    VirtualBox = ""
-      DEFAULT = "{class}"
+    steam = "󰓓"
-      libreoffice-writer = ""
+    "VirtualBox Manager" = ""
-      pavucontrol = "󰕾"
+    "com.obsproject.Studio" = ""
-      "epicgameslauncher.exe" = "󰯷"
+    "[Ff]irefox" = "󰈹"
-      "riotclientux.exe" = "󰰌"
+    "[Tt]hunderbird" = ""
-      "[Cc]ode" = "󰨞"
+    pcbnew = ""
-      VirtualBox = ""
+    ".*.exe" = ""
-      KiCad = ""
+    Element = "󰘨"
-      Gimp = ""
+    Signal = "󱅵"
-      code-oss = "󰨞"
+    Gimp = ""
-      VSCodium = "󰨞"
+    VSCodium = "󰨞"
-      Alacritty = ""
+    "[sS]potify" = ""
-      kitty = ""
+    virt-manager = ""
-      vesktop = "󰙯"
+    lutris = "󰊗"
-      "cyberpunk2077.exe" = "󰾲"
+    DEFAULT = "{class}"
-      "Tor Browser" = "󰾔"
+    "epicgameslauncher.exe" = "󰯷"
-      "[Tt]hunderbird" = ""
+    "[Cc]ode" = "󰨞"
-      Element = "󰘨"
+    "galaxyclient.exe" = "󰮡"
-      blueman-manager = "󰂯"
+    pavucontrol = "󰕾"
-      obsidian = "󰠮"
+    "Tor Browser" = "󰾔"
-      libreoffice-calc = ""
+    mpv = ""
-      zoom = "󰬡"
+    chatterino = ""
-      mpv = ""
+    libreoffice-writer = ""
-      chatterino = ""
+    kitty = ""
-      "com.obsproject.Studio" = ""
+    "cyberpunk2077.exe" = "󰾲"
-      "leagueclientux.exe" = "󰰌"
+    KiCad = ""
-      "[sS]potify" = ""
+    "[tT]hunar" = ""
-      "org.remmina.Remmina" = "󰢹"
+    "riotclientux.exe" = "󰰌"
-      steam = "󰓓"
+    libreoffice-calc = ""
-      "galaxyclient.exe" = "󰮡"
+    "org.remmina.Remmina" = "󰢹"
-      "[Ff]irefox" = "󰈹"
+    "org.inkscape.Inkscape" = "󰕙"
-      pcbnew = ""
+    "VirtualBox Machine" = ""
-      ".*.exe" = ""
+    Bitwarden = ""
-      Chromium = ""
+    "[gG]imp-.*" = ""
-      virt-manager = ""
+    Chromium = ""
-      Bitwarden = ""
+    obsidian = "󰠮"
-      "[tT]hunar" = ""
+    "leagueclientux.exe" = "󰰌"
-      zathura = "󰈦"
+    zathura = "󰈦"
-      discord = "󰙯"
+    code-oss = "󰨞"
-      "VirtualBox Manager" = ""
+    discord = "󰙯"
-      "org.inkscape.Inkscape" = "󰕙"
+    vesktop = "󰙯"
-      "VirtualBox Machine" = ""
+    blueman-manager = "󰂯"
-      lutris = "󰊗"
+    Alacritty = ""
-      "[gG]imp-.*" = ""
+    zoom = "󰬡"
 
-      [class_active]
+    [class_active]
-      "(?i)ExampleOneTerm" = "icon"
+    "(?i)ExampleOneTerm" = "icon"
 
-      [initial_class]
+    [initial_class]
 
-      [initial_class_active]
+    [initial_class_active]
 
-      [workspaces_name]
+    [workspaces_name]
 
-      [title_in_class]
+    [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]
 
-      [exclude]
+    [title_in_class_active]
-      "(?i)fcitx" = ".*"
-      aProgram = "^$"
-      "" = "^$"
-      "[Ss]team" = "^(Friends List.*)?$"
-      "explorer.exe" = ".*"
-      "(?i)TestApp" = ""
 
-      [format]
+    [title_in_initial_class]
-      dedup = false
+
-      dedup_inactive_fullscreen = false
+    [title_in_initial_class_active]
-      delim = " "
+
-      workspace = "{id}:{clients}"
+    [initial_title_in_class]
-      workspace_empty = "{id}"
+
-      client = "{icon}"
+    [initial_title_in_class_active]
-      client_fullscreen = "{icon}"
+
-      client_active = "{icon}"
+    [initial_title_in_initial_class]
-      client_dup = "{icon}{counter_sup}"
+
-      client_dup_active = "*{icon}*{delim}{icon}{counter_unfocused_sup}"
+    [initial_title_in_initial_class_active]
-      client_dup_fullscreen = "[{icon}]{delim}{icon}{counter_unfocused_sup}"
+
+    [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}"
     '';
 }

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;

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 = {
+  # services.ollama.environmentVariables = {
-    OLLAMA_ORIGINS = "*";
+  #   OLLAMA_ORIGINS = "*"; 
-  };
+  # };
 
-  systemd.services.ollama = {
+  # systemd.services.ollama = {
-    environment.OLLAMA_ORIGINS = "*";
+  #   environment.OLLAMA_ORIGINS = "*";
-    description = "Ollama Service";
+  #   description = "Ollama Service";
-    after = [ "network-online.target" "ollama-doesnt-respect-xdg-data-home.service" ];
+  #   after = [ "network-online.target" "ollama-doesnt-respect-xdg-data-home.service" ];
-    serviceConfig = {
+  #   serviceConfig = {
-      Type = "simple";
+  #     Type = "simple";
-      # Environment = "\"XDG_DATA_HOME=/run/current-system/sw/share\"";
+  #     # Environment = "\"XDG_DATA_HOME=/run/current-system/sw/share\"";
-      ExecStart = "${pkgs.ollama}/bin/ollama serve";
+  #     ExecStart = "${pkgs.ollama}/bin/ollama serve";
-      User = "ollama";
+  #     User = "ollama";
-      Group = "ollama";
+  #     Group = "ollama";
-      Restart = "always";
+  #     Restart = "always";
-      RestartSec = "3";
+  #     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
-    '';
   };
 }