add: ollama waybar integration, modified cloud config to add ollama systemd service

wip: want to do something different with this

defaults/waybar/config

@@ -2,7 +2,7 @@
   "layer": "top",
   "modules-left": ["sway/workspaces"],
   "modules-center": ["clock"],
-  "modules-right": ["custom/playerctl", "custom/weather", "pulseaudio", "network", "tray"],
+  "modules-right": ["custom/playerctl", "custom/weather", "pulseaudio", "custom/network", "custom/ollama", "tray"],
   "sway/workspaces": {
     "disable-scroll": true,
     "all-outputs": true,
@@ -34,14 +34,22 @@
     "exec": "wttrbar --fahrenheit --main-indicator 'temp_F' --location 'Grand Rapids'",
     "return-type": "json"
   },
-  "network": {
+  "custom/network": {
-    "format-wifi": " {essid} ({signalStrength}%)",
+    "format": "{text}",
-    "format-ethernet": " {ipaddr}",
+    "return-type": "json",
-    "format-disconnected": "⚠ Disconnected",
+    "exec": "bash $HOME/.config/waybar/network.sh",
-    "family": "ipv4",
+    "on-click": "bash $HOME/.config/waybar/network.sh toggle",
     "interval": 5,
     "tooltip": false
   },
+  "custom/ollama": {
+    "format": "{text}",
+    "return-type": "json",
+    "exec": "bash $HOME/.config/waybar/ollama.sh",
+    "on-click": "bash $HOME/.config/waybar/ollama.sh toggle",
+    "interval": 2,
+    "tooltip": true
+  },
   "pulseaudio": {
     "format": "{icon} {volume}%",
     "format-bluetooth": "{icon} {volume}%",

defaults/waybar/network.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+set -u
+
+state_dir="${XDG_RUNTIME_DIR:-/tmp}/waybar-${UID}"
+state_file="$state_dir/public-ip"
+
+if [[ ${1:-} == toggle ]]; then
+  mkdir -p -m 700 "$state_dir"
+  if [[ -s $state_file ]]; then
+    : > "$state_file"
+  else
+    public_ip=$(curl -4fsS --max-time 5 https://wtfismyip.com/json 2>/dev/null |
+      jq -er '.YourFuckingIPAddress | select(type == "string") | split(".") |
+        select(length == 4 and all(.[]; test("^[0-9]{1,3}$") and (tonumber <= 255))) |
+        join(".")' 2>/dev/null) || exit 0
+    printf '%s\n' "$public_ip" > "$state_file"
+  fi
+  exit 0
+fi
+
+route=$(ip -4 route get 1.1.1.1 2>/dev/null) || route=
+if [[ ! $route =~ [[:space:]]dev[[:space:]]([^[:space:]]+) ]]; then
+  jq -cn '{text: "⚠ Disconnected", class: "disconnected"}'
+  exit 0
+fi
+
+interface=${BASH_REMATCH[1]}
+if [[ ! $route =~ [[:space:]]src[[:space:]]([0-9.]+) ]]; then
+  jq -cn '{text: "⚠ Disconnected", class: "disconnected"}'
+  exit 0
+fi
+
+local_ip=${BASH_REMATCH[1]}
+
+if [[ -s $state_file ]]; then
+  jq -cn --rawfile ip "$state_file" '{text: (" " + ($ip | rtrimstr("\n"))), class: "public"}'
+  exit 0
+fi
+
+if [[ $(nmcli -g GENERAL.TYPE device show "$interface" 2>/dev/null) == wifi ]]; then
+  essid=$(nmcli -g GENERAL.CONNECTION device show "$interface" 2>/dev/null | head -n 1)
+  signal=$(nmcli -t -f IN-USE,SIGNAL device wifi list ifname "$interface" --rescan no 2>/dev/null |
+    awk -F: '$1 == "*" { print $2; exit }')
+  if [[ -n $essid && $essid != -- ]]; then
+    text=" $essid"
+    [[ -n $signal ]] && text="${text} (${signal}%)"
+  else
+    text=" $local_ip"
+  fi
+else
+  text=" $local_ip"
+fi
+
+jq -cn --arg text "$text" '{text: $text, class: "connected"}'

defaults/waybar/ollama.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -u
+
+service=ollama.service
+
+# The shared Waybar config is also used by hosts without Ollama.
+if ! systemctl --user cat "$service" >/dev/null 2>&1; then
+  exit 0
+fi
+
+if [[ ${1:-} == toggle ]]; then
+  if systemctl --user is-active --quiet "$service"; then
+    systemctl --user stop "$service"
+  else
+    systemctl --user start "$service"
+  fi
+  exit $?
+fi
+
+if systemctl --user is-active --quiet "$service"; then
+  printf '%s\n' '{"text":"<span foreground=\"#9ece6a\">●</span> Local AI","tooltip":"Ollama is running. Click to stop it.","class":"running"}'
+else
+  printf '%s\n' '{"text":"<span foreground=\"#f7768e\">●</span> Local AI","tooltip":"Ollama is stopped. Click to start it.","class":"stopped"}'
+fi

defaults/waybar/style.css

@@ -31,11 +31,12 @@ window#waybar {
 #cpu,
 #memory,
 #pulseaudio,
-#network,
+#custom-network,
+#custom-ollama,
 #battery,
 #clock,
 #custom-playerctl {
-  padding: 0 10px;
+  padding: 0 5px;
   margin: 0 5px;
 }
 
@@ -65,7 +66,7 @@ window#waybar {
   animation-direction: alternate;
 }
 
-#network.disconnected {
+#custom-network.disconnected {
   color: #cc241d;
 }
 

flake.lock

@@ -32,11 +32,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1789283312,
+        "lastModified": 1790492877,
-        "narHash": "sha256-Sv/2AyUTydH5d4eNk/ej1lHD1rpDvNjiB5Y3hmg/EGk=",
+        "narHash": "sha256-RK9eeRQv9l3pQ8qNCdJ8fpkFCp/+QpNn7lR7Kkfrv8w=",
         "ref": "refs/heads/master",
-        "rev": "31673a5c64497a0f40487d51820d3738dec13d60",
+        "rev": "d3216bbe660f8265f1393ecf263ab5f8662f5a58",
-        "revCount": 24,
+        "revCount": 26,
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
       },
@@ -267,11 +267,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1789623807,
+        "lastModified": 1790872110,
-        "narHash": "sha256-pqmP+T+fR2+MDen+ro2iF7mdH7S83AUuvNZwVDl3jUk=",
+        "narHash": "sha256-dXrMwUGE/9pT0J7MeW1BuYxpnnPPc52/oLxfqQF/5q8=",
         "owner": "purpleclay",
         "repo": "go-overlay",
-        "rev": "b19679b19d64dc29b96caf07e3282c250611ac57",
+        "rev": "8e136930a2a34c501d612f7b7b0ee8806531768f",
         "type": "github"
       },
       "original": {
@@ -290,11 +290,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789623807,
+        "lastModified": 1790872110,
-        "narHash": "sha256-pqmP+T+fR2+MDen+ro2iF7mdH7S83AUuvNZwVDl3jUk=",
+        "narHash": "sha256-dXrMwUGE/9pT0J7MeW1BuYxpnnPPc52/oLxfqQF/5q8=",
         "owner": "purpleclay",
         "repo": "go-overlay",
-        "rev": "b19679b19d64dc29b96caf07e3282c250611ac57",
+        "rev": "8e136930a2a34c501d612f7b7b0ee8806531768f",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1789887932,
+        "lastModified": 1790492923,
-        "narHash": "sha256-ryX9MgESeWwjpFMgxlaF97FgtaRyfIELgFLEeUR8xLQ=",
+        "narHash": "sha256-pi8p2jRW9pprb0ZFH50/Z9Bxv0bKgddMXbLZ0D03L3w=",
         "ref": "refs/heads/master",
-        "rev": "70288a728cc39eb5f390f71ae24d4a58763216b1",
+        "rev": "580082101efc0807637529e539886ee6c5f95672",
-        "revCount": 14,
+        "revCount": 15,
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
       },
@@ -333,11 +333,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789267039,
+        "lastModified": 1790996401,
-        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
+        "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
+        "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
         "type": "github"
       },
       "original": {
@@ -355,11 +355,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789867870,
+        "lastModified": 1790989254,
-        "narHash": "sha256-sOag/7DTqw4tXLI7UxjrZxPGV+dlTe6zFtJn0VSkgFM=",
+        "narHash": "sha256-ZN+riaeFuE+DZ5zfqJiXlM12jLwZzeIXiNkU1YeHMXI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d2a22a3659a6ae99847ea9176114f6957b8ac62e",
+        "rev": "acd21c5a3420a9d5fd0ed06299b10828267ef9ba",
         "type": "github"
       },
       "original": {
@@ -370,11 +370,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1780772958,
+        "lastModified": 1784154424,
-        "narHash": "sha256-VKKe8r4pwCGWZ3Yr9CPN129R4S3CKLSrlYqdYz3vKpM=",
+        "narHash": "sha256-HRn4O1X2ShYtbq5Egji72/aemyc2cIQicjRZD9hBqM8=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "0871dbf63a53610c95db04439ed8ea4d6ec9c160",
+        "rev": "0151d9fa87992cbeb67c86616fb9170dcec830b6",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1789749394,
+        "lastModified": 1790920529,
-        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
+        "narHash": "sha256-nQyFkMR78WP6PiXKkDW2SjqzLf/spQqjRuxRGSbcV8k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
+        "rev": "774debe7a0d1b496e35677ad955a1011c6ff74f3",
         "type": "github"
       },
       "original": {
@@ -433,11 +433,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1789749394,
+        "lastModified": 1790920529,
-        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
+        "narHash": "sha256-nQyFkMR78WP6PiXKkDW2SjqzLf/spQqjRuxRGSbcV8k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
+        "rev": "774debe7a0d1b496e35677ad955a1011c6ff74f3",
         "type": "github"
       },
       "original": {
@@ -449,11 +449,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1787498568,
+        "lastModified": 1790046670,
-        "narHash": "sha256-FoOSoBG7tEvOlGRTpWnVdY506Ner4y7r7UYO3OGgmE8=",
+        "narHash": "sha256-OJe62m8gZx4xEAQnMcqH1u31/uu4Xf0q2ykAEHZfgrg=",
-        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
+        "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1060451.56c02bc00adc/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1077996.6774f7bc2537/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -487,11 +487,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1789887979,
+        "lastModified": 1791097561,
-        "narHash": "sha256-ln0cOIfvEFNd4IdVbiYfdtxS01E5npnstm0YCTOxpJY=",
+        "narHash": "sha256-AmeVVy0WbW/y/sZv7ZGYn3dY6HuHPqvUgYorahAe4lM=",
         "ref": "refs/heads/master",
-        "rev": "39c33599b191ae2d595b3cc38e8ad4bf2766cd89",
+        "rev": "55e8c40fbcd0c848c38002fdefb37de7084715be",
-        "revCount": 99,
+        "revCount": 107,
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
       },
@@ -507,11 +507,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1789854559,
+        "lastModified": 1790797021,
-        "narHash": "sha256-6GDssza3F+ukpUujSuTL50vW5AHaoG+4vjsDgWqRyeQ=",
+        "narHash": "sha256-H2vA5yUaS58Wtdp46piMbRqSQe3Qn716i/oZPYoyhp8=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "85bf39cd0409ad8a7fa5b3ad0d29e89e9da97a0e",
+        "rev": "2477cb0a5f394df36ddc72867c2657225d93d157",
         "type": "github"
       },
       "original": {
@@ -563,11 +563,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789196581,
+        "lastModified": 1790407471,
-        "narHash": "sha256-yJr1Bt4fKkKIpPYbsKGqJ0VFdoDnURgRwuffmBQ2WzY=",
+        "narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "228ecefb6329d5a531b77b46b581a2f0c26ee056",
+        "rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
         "type": "github"
       },
       "original": {
@@ -585,11 +585,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789802016,
+        "lastModified": 1790407471,
-        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
         "type": "github"
       },
       "original": {
@@ -606,11 +606,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789802016,
+        "lastModified": 1791013993,
-        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "narHash": "sha256-BiFPwFsbFnZH5GfWbQFKYuQNg+67aNQCoRSRNTeJFQc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "rev": "7470661ba2b51156048af08464b82020223dc942",
         "type": "github"
       },
       "original": {
@@ -624,11 +624,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1789802016,
+        "lastModified": 1791013993,
-        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "narHash": "sha256-BiFPwFsbFnZH5GfWbQFKYuQNg+67aNQCoRSRNTeJFQc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "rev": "7470661ba2b51156048af08464b82020223dc942",
         "type": "github"
       },
       "original": {

home/neovim.nix

@@ -27,6 +27,10 @@
             enable = true;
             lsp.servers = [ "typescript-language-server" "deno" ];
           };
+          csharp = {
+            enable = true;
+            lsp.servers = [ "omnisharp" ];
+          };
         };
 
         utility.surround.enable = true;

home/sway.nix

@@ -36,6 +36,10 @@ in {
   xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
   xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
   xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
+  xdg.configFile."waybar/network.sh".source = dirs.defaults + /waybar/network.sh;
+  xdg.configFile."waybar/ollama.sh".source = dirs.defaults + /waybar/ollama.sh;
+
+  home.packages = with pkgs; [ curl iproute2 networkmanager ];
 
   programs.wofi = { 
     enable = pkgs.stdenv.isLinux;

modules/desktop/xdg.nix

@@ -22,6 +22,13 @@ in {
       xdg.portal.config.common.default = ["gtk"];
     })
 
+    (lib.mkIf cfg.sway.enable {
+      xdg.portal.wlr.settings.screencast = {
+        chooser_type = "dmenu";
+        chooser_cmd = "${pkgs.wmenu}/bin/wmenu -l 10 -p 'Select screen to share:'";
+      };
+    })
+
     (lib.mkIf (usesPortal && config.services.gnome.gnome-keyring.enable) {
       xdg.portal.config.common."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
     })

modules/machine/cloud/configuration.nix

@@ -86,6 +86,18 @@ in {
     vlc
   ];
 
+  systemd.user.services.ollama = {
+    description = "Ollama local AI server";
+    serviceConfig = {
+      ExecStart = "${pkgs.ollama-rocm}/bin/ollama serve";
+      Restart = "on-failure";
+      Environment = [
+        "OLLAMA_HOST=0.0.0.0:11434"
+        "OLLAMA_CONTEXT_LENGTH=64000"
+      ];
+    };
+  };
+
   # Enable Polkit
   security.polkit.enable = true;