Merge branch 'master' of 192.168.1.126:TheCrazyInsanity/nixos-configv3

flake.lock

@@ -31,7 +31,6 @@
           "llm-agents",
           "flake-parts"
         ],
-        "import-tree": "import-tree",
         "nixpkgs": [
           "llm-agents",
           "nixpkgs"
@@ -46,16 +45,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1776182890,
+        "lastModified": 1777369708,
-        "narHash": "sha256-+/VOe8XGq5klpU+I19D+3TcaR7o+Cwbq67KNF7mcFak=",
+        "narHash": "sha256-1xW7cRZNsFNPQD+cE0fwnLVStnDth0HSoASEIFeT7uI=",
-        "owner": "Mic92",
+        "owner": "nix-community",
         "repo": "bun2nix",
-        "rev": "648d293c51e981aec9cb07ba4268bc19e7a8c575",
+        "rev": "e659e1cc4b8e1b21d0aa85f1c481f9db61ecfa98",
         "type": "github"
       },
       "original": {
-        "owner": "Mic92",
+        "owner": "nix-community",
-        "ref": "catalog-support",
+        "ref": "staging-2.1.0",
         "repo": "bun2nix",
         "type": "github"
       }
@@ -68,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1777988971,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
         "type": "github"
       },
       "original": {
@@ -91,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773656868,
+        "lastModified": 1777767341,
-        "narHash": "sha256-IvWd8A3MM2qASf2U5diOoYEc2dCxqR4BOhB5RuOQnZM=",
+        "narHash": "sha256-lV2i2hBWxUKU2dgHza9SGfizOsV+uUcTQD/De+6/X3M=",
         "owner": "glide-browser",
         "repo": "glide.nix",
-        "rev": "1a3dd001865f6ac5a3562d2cb484388672ad6eaf",
+        "rev": "790c9d37e3dcf9bb04ae4486a0320b999a8eec32",
         "type": "github"
       },
       "original": {
@@ -111,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776891022,
+        "lastModified": 1778248595,
-        "narHash": "sha256-vEe2f4NEhMvaNDpM1pla4hteaIIGQyAMKUfIBPLasr0=",
+        "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "508daf831ab8d1b143d908239c39a7d8d39561b2",
+        "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
         "type": "github"
       },
       "original": {
@@ -165,21 +164,6 @@
         "type": "github"
       }
     },
-    "import-tree": {
-      "locked": {
-        "lastModified": 1763762820,
-        "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
-        "owner": "vic",
-        "repo": "import-tree",
-        "rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
-        "type": "github"
-      },
-      "original": {
-        "owner": "vic",
-        "repo": "import-tree",
-        "type": "github"
-      }
-    },
     "llm-agents": {
       "inputs": {
         "blueprint": "blueprint",
@@ -190,11 +174,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1776864758,
+        "lastModified": 1778247177,
-        "narHash": "sha256-qQFek7fJDmMpwT0B1KlW+4DMjAlMYrLF0SbVRhkYqHI=",
+        "narHash": "sha256-ZSe9r9xbx72NnBCCiC1UZxmIFzFA9IPno10Esp1kjiE=",
         "owner": "Qumulo",
         "repo": "llm-agents",
-        "rev": "a3532e7336c51044432a7d35a184510baf149a28",
+        "rev": "02444d83933d3ca28c9fd5d0be28812bdcf1232e",
         "type": "github"
       },
       "original": {
@@ -221,11 +205,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1776329215,
+        "lastModified": 1778124196,
-        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
+        "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
         "type": "github"
       },
       "original": {
@@ -237,11 +221,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1776548001,
+        "lastModified": 1777954456,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {

global/default.nix

@@ -16,6 +16,9 @@
         nix-fast-build
         colmena
         ;
+      openldap = prev.openldap.overrideAttrs {
+        doCheck = !prev.stdenv.hostPlatform.isi686;
+      };
     })
   ];
   nix.package = pkgs.lixPackageSets.stable.lix;
@@ -101,7 +104,6 @@
       } -C $out/bin
       chmod +x $out/bin/llama-swap
     '';
-
   };
 
   # 🇺🇸
@@ -233,6 +235,12 @@
     nasctui
     trilium-desktop
     haruna
+    (pkgs.runCommand "nvenc-compress" { nativeBuildInputs = [ pkgs.bash ]; }
+      ''
+        mkdir -p $out/bin
+        cp ${./nvenc_compress.sh} $out/bin/nvenc-compress
+        chmod +x $out/bin/nvenc-compress
+      '')
   ];
 
   fonts.packages = with pkgs; [

global/nvenc_compress.sh

@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Usage: nvenc_compress.sh <video_path> [target_size_mb]
+
+VIDEO="$1"
+TARGET_MB="${2:-9}"
+TARGET_BYTES=$((TARGET_MB * 1024 * 1024))
+
+if [[ ! -f "$VIDEO" ]]; then
+  echo "Error: file not found: $VIDEO"
+  exit 1
+fi
+
+BASENAME="${VIDEO##*/}"
+BASENAME="${BASENAME%.*}"
+OUTDIR="$(dirname "$VIDEO")"
+OUTFILE="$OUTDIR/${BASENAME}_compressed.mp4"
+
+# nvenc cq range: 0 (best/largest) to 51 (worst/smallest)
+# We binary search this range to hit the target file size
+LO=0
+HI=51
+BEST_DIFF=999999999
+BEST_CQ=23
+MAX_ITERATIONS=20
+
+echo "Target size: ${TARGET_MB}MB (${TARGET_BYTES} bytes)"
+echo "Encoding with nvenc (h264_nvenc)..."
+echo ""
+
+for ((i=0; i<MAX_ITERATIONS; i++)); do
+  CQ=$(( (LO + HI) / 2 ))
+  TMPFILE="${OUTFILE}_iter_${i}_cq${CQ}.mp4"
+
+  echo "--- Iteration $((i+1))/$MAX_ITERATIONS ---"
+  echo "Trying cq=$CQ (lo=$LO, hi=$HI)"
+
+  ffmpeg -y -i "$VIDEO" -c:v h264_nvenc -cq "$CQ" -c:a copy -preset p7 -f mp4 "$TMPFILE" 2>/dev/null
+
+  if [[ ! -f "$TMPFILE" ]]; then
+    echo "Error: ffmpeg failed at cq=$CQ"
+    rm -f "$TMPFILE"
+    break
+  fi
+
+  FILE_SIZE=$(stat -c%s "$TMPFILE" 2>/dev/null || stat -f%z "$TMPFILE" 2>/dev/null)
+  DIFF=$(( FILE_SIZE - TARGET_BYTES ))
+  ABS_DIFF=${DIFF#-}
+
+  echo "  Size: $(( FILE_SIZE / 1024 / 1024 ))MB (diff: $(( DIFF / 1024 / 1024 ))MB)"
+
+  if (( ABS_DIFF < BEST_DIFF )); then
+    BEST_DIFF=$ABS_DIFF
+    BEST_CQ=$CQ
+    cp "$TMPFILE" "$OUTFILE"
+  fi
+
+  rm -f "$TMPFILE"
+
+  # If within 1% of target, we're close enough
+  if (( ABS_DIFF < TARGET_BYTES / 100 )); then
+    echo ""
+    echo "Within tolerance! Stopping."
+    break
+  fi
+
+  # Binary search direction:
+  # Higher cq = smaller file, lower cq = larger file
+  if (( FILE_SIZE > TARGET_BYTES )); then
+    # File too big, need higher cq (smaller)
+    LO=$(( CQ + 1 ))
+  else
+    # File too small, need lower cq (larger)
+    HI=$(( CQ - 1 ))
+  fi
+
+  if (( LO > HI )); then
+    echo ""
+    echo "Range exhausted. Stopping."
+    break
+  fi
+done
+
+echo ""
+echo "Done! Best cq=$BEST_CQ, final size: $(( BEST_DIFF / 1024 / 1024 ))MB from target"
+echo "Output: $OUTFILE"

machines/homepc/configuration.nix

@@ -32,6 +32,8 @@
   # Configure network connections interactively with nmcli or nmtui.
   networking.networkmanager.enable = true;
 
+  virtualization.podman.enableNvidia = true;
+
   # Only computer I own that can actually run ollama, and I don't want to make an ai folder.
   # services.ollama = {
   #   enable = true;
@@ -49,6 +51,7 @@
     pkgs.llama-cpp
     pkgs.llama-swap
     # pkgs.agent-browser
+    pkgs.nvidia-container-toolkit
 
     inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.pi
     inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.rtk
@@ -112,20 +115,14 @@
       "Qwen3-4B-Claude-Opus-Distill":
         cmd: llama-server --port ''${PORT} -hf TeichAI/Qwen3-4B-Thinking-2507-Claude-4.5-Opus-High-Reasoning-Distill-GGUF:Q4_K_M --ctx-size 32768 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256
         ttl: 300
-      "Qwen3.5-9B-Thinking":
+      "Qwen3.5-9B":
-        cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-9B-GGUF:Q4_K_M --ctx-size 128000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256 --chat-template-kwargs '{\"enable_thinking\": true}' --no-mmproj --no-kv-offload"
+        cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-9B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256"
         ttl: 300
       "Qwen3.5-9B-Claude-Opus-Distill":
         cmd: "llama-server --port ''${PORT} -hf Jackrong/Qwen3.5-9B-Claude-4.6-Opus-Reasoning-Distilled-GGUF:Q4_K_S --ctx-size 32000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 512 --chat-template-kwargs '{\"enable_thinking\": true}' --no-mmproj"
         ttl: 300
-      "Qwen3.5-4B-Thinking":
+      "Qwen3.5-4B":
-        cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-4B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256 --chat-template-kwargs '{\"enable_thinking\": true}'"
+        cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-4B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256"
-        ttl: 300
-      "Qwen3.5-9B-Non-Thinking":
-        cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-9B-GGUF:Q4_K_M --ctx-size 32000 --temp 0.7 --top-p 0.8 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256 --no-mmproj"
-        ttl: 300
-      "Qwen3.5-4B-Non-Thinking":
-        cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-4B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.7 --top-p 0.8 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256"
         ttl: 300
       "Gemma4-E4B":
         cmd: "llama-server --port ''${PORT} -hf Abhiray/gemma-4-E4B-it-heretic-GGUF:Q4_K_M --ctx-size 64000 --temp 0.7 --top-p 0.8 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256"

machines/homepc/home.nix

@@ -1,4 +1,11 @@
-{config, pkgs, lib, inputs, outputs, ...}:
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  outputs,
+  ...
+}:
 {
   # These both are probably always going to be the same, but I'll keep them local just in case:tm:
   home.username = "laythe";
@@ -11,4 +18,6 @@
   home.stateVersion = "24.11";
 
   programs.home-manager.enable = true;
+
+  fonts.fontconfig.subpixelRendering = "none";
 }

machines/latitude/configuration.nix

@@ -6,6 +6,7 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 {
@@ -87,9 +88,9 @@
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
-  #environment.systemPackages = with pkgs; [
+  environment.systemPackages = [
-  #  cura-appimage # I want cura but not kicad so i dont pull in fabrication
+    inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.pi
-  # ];
+  ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

modules/sway/default.nix

@@ -52,7 +52,6 @@ in
       pkgs.wmenu
       pkgs.wl-clipboard
       pkgs.mako
-      pkgs.kdePackages.spectacle
       pkgs.kdePackages.kate
       pkgs.kdePackages.filelight
       inputs.glide.packages.${pkgs.stdenv.hostPlatform.system}.default
@@ -62,6 +61,7 @@ in
       pkgs.dracula-theme # gtk theme
       pkgs.brightnessctl
       configure-gtk
+      pkgs.mpvpaper
     ];
   };
 

modules/sway/home.nix

@@ -85,6 +85,7 @@
 
         "Mod4+j" = "[class=\"Jami\"] scratchpad show, resize set 90 ppt 90 ppt, move position center";
 
+        "Print" = "exec flameshot gui";
       };
       bars = [
         {
@@ -140,72 +141,101 @@
         }
       ];
     };
-    extraConfig = ''
-      exec_always swaymsg output "*" bg ~/.background-image fill
-    '';
   };
 
-  # yeah this was written by ai if it wasn't obvious
   systemd.user.services.random-background = {
     Unit = {
-      Description = "Update ~/.background_image with a random wallpaper";
+      Description = "Universal Wallpaper Rotator (Images, GIFs, Videos)";
-    };
+      After = [ "graphical-session.target" ];
-    Service = {
+      PartOf = [ "graphical-session.target" ];
-      Type = "oneshot";
-      # pkgs.writeShellScript creates an executable script in the nix store
-      ExecStart = "${pkgs.writeShellScript "random-bg-script" ''
-        # Nix uses 'set -e' by default, meaning any command failure kills the script.
-        # We use native bash features to safely handle finding the image and socket.
-
-        WALLPAPER_DIR="$HOME/wallpapers"
-        TARGET="$HOME/.background_image"
-
-        if [ ! -d "$WALLPAPER_DIR" ]; then
-          echo "Wallpaper directory not found."
-          exit 0
-        fi
-
-        # 1. Get a random image safely (|| true prevents set -e crashes if find returns nothing)
-        RANDOM_IMG=$(${pkgs.findutils}/bin/find "$WALLPAPER_DIR" -type f \( -iname \*.jpg -o -iname \*.png -o -iname \*.jpeg \) 2>/dev/null | ${pkgs.coreutils}/bin/shuf -n 1 || true)
-
-        if [ -n "$RANDOM_IMG" ]; then
-          # 2. Update symlink
-          ${pkgs.coreutils}/bin/ln -sf "$RANDOM_IMG" "$TARGET"
-          
-          # 3. Safely find the socket using native Bash globbing.
-          # systemd user services natively provide the correct $XDG_RUNTIME_DIR (/run/user/1000)
-          shopt -s nullglob
-          SOCKETS=("$XDG_RUNTIME_DIR"/sway-ipc.*.sock)
-          
-          # 4. Check if the bash array found any socket files
-          if [ ''${#SOCKETS[@]} -gt 0 ]; then
-            export SWAYSOCK="''${SOCKETS[0]}"
-            echo "Using socket: $SWAYSOCK"
-            
-            # 5. Execute swaymsg
-            ${pkgs.sway}/bin/swaymsg output "*" bg "$RANDOM_IMG" fill
-            echo "Updated background to $RANDOM_IMG"
-          else
-            echo "Error: Could not find any sway socket in $XDG_RUNTIME_DIR"
-            exit 1
-          fi
-        else
-          echo "No images found in $WALLPAPER_DIR"
-        fi
-      ''}";
-    };
     };
 
-  systemd.user.timers.random-background = {
-    Unit = {
-      Description = "Run random-background service every hour";
-    };
-    Timer = {
-      OnCalendar = "minutely";
-      Persistent = true;
-    };
     Install = {
-      WantedBy = [ "timers.target" ];
+      WantedBy = [ "graphical-session.target" ];
+    };
+
+    Service = {
+      Type = "simple";
+      Restart = "on-failure";
+      RestartSec = 5;
+
+      ExecStart = "${pkgs.writeShellScript "wallpaper-rotator" ''
+        WALLPAPER_DIR="$HOME/wallpapers"
+        INTERVAL=60 # Time in seconds between wallpaper changes (600 = 10 mins)
+
+        # 1. Safely find Wayland and Sway sockets
+        if [ -z "$WAYLAND_DISPLAY" ]; then
+          shopt -s nullglob
+          W_SOCKETS=("$XDG_RUNTIME_DIR"/wayland-[0-9]*)
+          if [ ''${#W_SOCKETS[@]} -gt 0 ]; then
+            export WAYLAND_DISPLAY=$(basename "''${W_SOCKETS[0]}")
+          fi
+        fi
+
+        if [ -z "$SWAYSOCK" ]; then
+          shopt -s nullglob
+          S_SOCKETS=("$XDG_RUNTIME_DIR"/sway-ipc.*.sock)
+          if [ ''${#S_SOCKETS[@]} -gt 0 ]; then
+            export SWAYSOCK="''${S_SOCKETS[0]}"
+          fi
+        fi
+
+        # State tracking for mpvpaper
+        MPV_PID=""
+
+        # Clean up mpvpaper gracefully if systemd stops the service
+        cleanup() {
+            if [ -n "$MPV_PID" ]; then
+                kill $MPV_PID 2>/dev/null || true
+            fi
+            exit 0
+        }
+        trap cleanup SIGINT SIGTERM
+
+        # 2. Infinite rotation loop
+        while true; do
+          if [ ! -d "$WALLPAPER_DIR" ]; then
+            echo "Wallpaper directory not found. Waiting..."
+            ${pkgs.coreutils}/bin/sleep 60
+            continue
+          fi
+
+          # Find images, gifs, and videos
+          MEDIA=$(${pkgs.findutils}/bin/find "$WALLPAPER_DIR" -type f \( \
+            -iname \*.jpg -o -iname \*.jpeg -o -iname \*.png -o \
+            -iname \*.mp4 -o -iname \*.webm -o -iname \*.mkv -o -iname \*.gif \
+          \) 2>/dev/null | ${pkgs.coreutils}/bin/shuf -n 1 || true)
+
+          if [ -n "$MEDIA" ]; then
+            echo "Selected: $MEDIA"
+            EXT="''${MEDIA##*.}"
+            EXT=$(echo "$EXT" | tr '[:upper:]' '[:lower:]') # Convert to lowercase
+
+            # If it's a static image, use Sway directly (saves battery/RAM)
+            if [[ "$EXT" == "jpg" || "$EXT" == "jpeg" || "$EXT" == "png" ]]; then
+              if [ -n "$MPV_PID" ]; then
+                kill $MPV_PID 2>/dev/null || true
+                MPV_PID=""
+              fi
+              ${pkgs.sway}/bin/swaymsg output "*" bg "$MEDIA" fill
+            
+            # If it's a video/gif, use mpvpaper
+            else
+              if [ -n "$MPV_PID" ]; then
+                kill $MPV_PID 2>/dev/null || true
+              fi
+              # Start mpvpaper in the background and record its process ID
+              ${pkgs.mpvpaper}/bin/mpvpaper -o "loop no-audio" "*" "$MEDIA" &
+              MPV_PID=$!
+            fi
+          else
+            echo "No media found in $WALLPAPER_DIR."
+          fi
+
+          # Wait for the next rotation
+          ${pkgs.coreutils}/bin/sleep $INTERVAL
+        done
+      ''}";
     };
   };
 
@@ -256,7 +286,8 @@
         };
 
         clock = {
-          format = "{:%Y-%m-%d %H:%M}";
+          "format" = "{:%I:%M %p}";
+          "format-alt" = "{:%d-%m-%Y}";
           tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
         };
         battery = {
@@ -293,6 +324,21 @@
     };
   };
 
+  services.flameshot = {
+    # Also installs/enables flameshot
+    enable = true;
+    settings = {
+      General = {
+        useGrimAdapter = true;
+        # Stops warnings for using Grim
+        disabledGrimWarning = true;
+        uiColor = "#00ff73";
+        contrastUiColor = "#002f01";
+        drawColor = "#ff0000";
+      };
+    };
+  };
+
   # Install packages for better Qt support and kvantum themes
   home.packages = with pkgs; [
     kdePackages.breeze

modules/virtualization/default.nix

@@ -14,5 +14,6 @@
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;
+    # enableNvidia = true;
   };
 }