Merge remote-tracking branch 'origin/main'

darwin/_mixins/scripts/build-all/build-all.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 
-# if nh-home is in the PATH then use it
+# Build home-manager, using the best available command
 if command -v nh-home &> /dev/null; then
     nh-home build
+elif command -v nh &> /dev/null; then
+    nh home build "${HOME}/Zero/nix-config/"
+elif command -v home-manager &> /dev/null; then
+    home-manager build --flake "$HOME/Zero/nix-config" -L
 else
-    nix run nixpkgs#home-manager -- build --flake "$HOME/Zero/nix-config" -L
+    nix run nixpkgs#home-manager -- build "$HOME/Zero/nix-config" -L
 fi
 build-host

darwin/_mixins/scripts/switch-all/switch-all.sh

@@ -1,9 +1,15 @@
 #!/usr/bin/env bash
 
-# if nh-home is in the PATH then use it
+STAMP=$(date +%Y%m%d-%H%M%S)
+
+# Switch home-manager, using the best available command
 if command -v nh-home &> /dev/null; then
-    nh-home build
+    nh-home switch
+elif command -v nh &> /dev/null; then
+    nh home switch --backup-extension "${STAMP}" "${HOME}/Zero/nix-config/"
+elif command -v home-manager &> /dev/null; then
+    home-manager switch --backup-extension "${STAMP}" --flake "$HOME/Zero/nix-config" -L
 else
-    nix run nixpkgs#home-manager -- switch --flake "$HOME/Zero/nix-config" -L
+    nix run nixpkgs#home-manager -- switch --backup-extension "${STAMP}" --flake "$HOME/Zero/nix-config" -L
 fi
 switch-host

home-manager/_mixins/desktop/features/qt/default.nix

@@ -30,7 +30,7 @@ lib.mkIf isLinux {
   xdg.configFile = {
     kvantum = {
       target = "Kvantum/kvantum.kvconfig";
-      text = lib.generators.toINI { } { General.theme = "Catppuccin-Mocha-Blue"; };
+      text = lib.generators.toINI { } { General.theme = "catppuccin-mocha-blue"; };
     };
     qt5ct = {
       target = "qt5ct/qt5ct.conf";

home-manager/_mixins/scripts/mwprocapture-hunter/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+let
+  name = builtins.baseNameOf (builtins.toString ./.);
+  shellApplication = pkgs.writeShellApplication {
+    inherit name;
+    runtimeInputs = with pkgs; [
+      coreutils-full
+      curl
+    ];
+    text = builtins.readFile ./${name}.sh;
+  };
+in
+{
+  home.packages = with pkgs; [ shellApplication ];
+}

home-manager/_mixins/scripts/mwprocapture-hunter/mwprocapture-hunter.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set +e  # Disable errexit
+set +u  # Disable nounset
+set +o pipefail  # Disable pipefail
+
+# Base URL for Magewell downloads
+BASE_URL="https://www.magewell.com/files/drivers/ProCaptureForLinux_"
+#START_VERSION=4390
+START_VERSION=4407
+END_VERSION=$((START_VERSION + 100))
+
+# Function to check if URL exists using curl
+check_url() {
+    local url=$1
+    local version=$2
+    local http_code=""
+
+    # Use curl with --head to only get headers
+    # -s for silent mode, -L to follow redirects, -w for custom output format
+    # -o /dev/null to discard the actual content
+    http_code=$(curl -s -L -w "%{http_code}" --head "$url" -o /dev/null)
+
+    if [ "$http_code" = "200" ]; then
+        echo "✅ Version $version is available at: $url"
+    else
+        echo "❌ Version $version not found (HTTP $http_code)"
+    fi
+    # Add a small delay to be nice to the server
+    sleep 0.5
+}
+
+echo "Starting version check from $START_VERSION to $END_VERSION"
+echo "Results will be saved to found_versions.txt"
+echo "----------------------------------------"
+
+# Main loop
+for version in $(seq $START_VERSION $END_VERSION); do
+    url="${BASE_URL}${version}.tar.gz"
+    check_url "$url" "$version"
+done
+
+echo "----------------------------------------"
+echo "Scan complete! Available versions have been saved to found_versions.txt"

home-manager/_mixins/scripts/nh-home/nh-home.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+STAMP=$(date +%Y%m%d-%H%M%S)
+
 function usage() {
     echo "Usage: ${0} {build|switch}"
     exit 1
@@ -28,7 +30,7 @@ if [ -e "${HOME}/Zero/nix-config" ]; then
     echo "${1^}ing Home Manager 🏠️ with ${build_cores} cores"
     case $1 in
         build) nh home build "${HOME}/Zero/nix-config/" -- --cores "${build_cores}";;
-        switch) nh home switch --backup-extension backup "${HOME}/Zero/nix-config/" -- --cores "${build_cores}";;
+        switch) nh home switch --backup-extension "${STAMP}" "${HOME}/Zero/nix-config/" -- --cores "${build_cores}";;
     esac
 else
     echo "ERROR! No nix-config found in ${HOME}/Zero/nix-config"

nixos/_mixins/desktop/apps/default.nix

@@ -8,7 +8,6 @@ _: {
     ./graphics-production
     ./libreoffice
     ./steam
-    ./thunderbird
     ./utilities
     ./video-production
     ./web-browsers

nixos/_mixins/desktop/apps/evolution/default.nix

@@ -22,6 +22,52 @@
             search-gravatar-for-photo = true;
             show-sender-photo = true;
             variable-width-font = "Work Sans 12";
+            send-recv-all-on-start = true;
+            junk-check-incoming = false;
+            junk-lookup-addressbook = true;
+            junk-check-custom-header = false;
+            composer-mode = "markdown";
+            composer-magic-smileys = true;
+            composer-outlook-filenames = true;
+            composer-use-outbox = true;
+            composer-delay-outbox-flush = mkUint32 1;
+            composer-word-wrap-length = mkUint32 72;
+            composer-signature-in-new-only = true;
+            composer-ignore-list-reply-to = true;
+            composer-group-reply-to-list = true;
+            forward-style-name = "quoted";
+            forward-style = mkUint32 2;
+            reply-style-name = "quoted";
+            reply-style = mkUint32 0;
+            load-http-images = mkUint32 2;
+            notify-remote-content = false;
+            show-attachment-bar = false;
+          };
+          "org/gnome/evolution/calendar" = {
+            use-24hour-format = true;
+            day-end-hour = mkUint32 18;
+            day-end-minute = mkUint32 0;
+            allow-direct-summary-edit = true;
+            use-markdown-editor = true;
+            week-view-days-left-to-right = true;
+            hide-completed-tasks = true;
+            hide-completed-tasks-value = mkUint32 7;
+            use-default-reminder = true;
+            default-reminder-interval = mkUint32 10;
+            contacts-reminder-enabled = true;
+            contacts-reminder-units = "days";
+            contacts-reminder-interval = mkUint32 7;
+            delete-meeting-on-decline = false;
+          };
+          "org/gnome/evolution/addressbook" = {
+            completion-show-address = true;
+          };
+          "org/gnome/evolution/plugin/itip" = {
+            show-message-description = true;
+            attach-components = true;
+          };
+          "org/gnome/evolution/plugin/prefer-plain" = {
+            mode = "prefer_plain";
           };
 
           #"org/gnome/evolution/plugin/external-editor" = {

nixos/_mixins/desktop/gnome/default.nix

@@ -317,7 +317,6 @@
 
   services = {
     gnome = {
-      evolution-data-server.enable = lib.mkForce isInstall;
       games.enable = false;
       gnome-browser-connector.enable = isInstall;
       gnome-online-accounts.enable = isInstall;

nixos/_mixins/desktop/mate/default.nix

@@ -19,7 +19,6 @@
     systemPackages =
       with pkgs;
       lib.optionals isInstall [
-        evolutionWithPlugins
         gucharmap
         gnome-firmware
       ];
@@ -53,13 +52,6 @@
             titlebar-uses-system-font = false;
           };
 
-          "org/gnome/evolution/mail" = {
-            monospace-font = "FiraCode Nerd Font Mono Medium 13";
-            search-gravatar-for-photo = true;
-            show-sender-photo = true;
-            variable-width-font = "Work Sans 12";
-          };
-
           "org/gnome/evolution/plugin/external-editor" = {
             command = "pluma";
           };
@@ -339,7 +331,6 @@
         };
       }
     ];
-    evolution.enable = isInstall;
     gnome-disks.enable = isInstall;
     nm-applet = {
       enable = true;
@@ -352,7 +343,6 @@
   # Enable services to round out the desktop
   services = {
     blueman.enable = true;
-    gnome.evolution-data-server.enable = lib.mkForce isInstall;
     gnome.gnome-keyring.enable = true;
     gvfs.enable = true;
     xserver = {