From add2152e3a9721a47a3fdb2323e6ea56ecd33454 Mon Sep 17 00:00:00 2001
From: "Geir O. Jerstad" <geir@geokkjer.eu>
Date: Fri, 4 Jul 2025 15:09:23 +0200
Subject: [PATCH] disabled incus

---
 flake.lock                                    |  6 ++--
 .../congenital-optimist/configuration.nix     |  2 +-
 modules/desktop/common.nix                    |  8 +++--
 modules/virtualization/incus.nix              | 32 ++++++++++++++++---
 packages/lab-tool/main.scm                    | 10 +-----
 packages/lab-tool/utils/config.scm            |  5 +--
 6 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 391f49d..b3d8ad0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1751211869,
-        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
+        "lastModified": 1751479989,
+        "narHash": "sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
+        "rev": "34627c90f062da515ea358360f448da57769236e",
         "type": "github"
       },
       "original": {
diff --git a/machines/congenital-optimist/configuration.nix b/machines/congenital-optimist/configuration.nix
index 709d234..1c86f71 100644
--- a/machines/congenital-optimist/configuration.nix
+++ b/machines/congenital-optimist/configuration.nix
@@ -46,7 +46,7 @@
     ../../modules/users/sma.nix
 
     # Virtualization configuration
-    ../../modules/virtualization/incus.nix
+    # ../../modules/virtualization/incus.nix  # Disabled: cowsql build issue
     ../../modules/virtualization/libvirt.nix
     ../../modules/virtualization/podman.nix
   ];
diff --git a/modules/desktop/common.nix b/modules/desktop/common.nix
index b9f1123..fb92519 100644
--- a/modules/desktop/common.nix
+++ b/modules/desktop/common.nix
@@ -12,8 +12,12 @@
   # XDG Portal configuration for Wayland/X11 compatibility
   xdg.portal = {
     enable = true;
-    wlr.enable = true;
-    extraPortals = [pkgs.xdg-desktop-portal-gtk];
+    extraPortals = [
+      pkgs.xdg-desktop-portal-wlr
+      pkgs.xdg-desktop-portal-gtk
+    ];
+    config.common.default = "*";
+    config.niri.default = ["wlr" "gtk"];
   };
 
   # Display manager and session management
diff --git a/modules/virtualization/incus.nix b/modules/virtualization/incus.nix
index 25f07d9..49cb49b 100644
--- a/modules/virtualization/incus.nix
+++ b/modules/virtualization/incus.nix
@@ -1,14 +1,38 @@
 { config, pkgs, ... }:
+let
+  # Fix cowsql build issue with glibc 2.40
+  cowsql-fixed = pkgs.cowsql.overrideAttrs (oldAttrs: {
+    patches = (oldAttrs.patches or []) ++ [
+      (pkgs.writeText "cowsql-float-t-fix.patch" ''
+        --- a/src/lib/serialize.h
+        +++ b/src/lib/serialize.h
+        @@ -37,7 +37,9 @@
+         #define SERIALIZE_H_
+         
+         #include <uv.h>
+        +#ifndef _MATH_H
+         typedef double float_t;
+        +#endif
+         
+         struct serialize;
+      '')
+    ];
+  });
+  
+  incus-fixed = pkgs.incus.override {
+    cowsql = cowsql-fixed;
+  };
+in
 {
   virtualisation.incus = {
     enable = true;
     ui.enable = true;
-    package = pkgs.incus;
+    package = incus-fixed;
   };
 
-  environment.systemPackages = with pkgs; [
-    incus
-    lxc
+  environment.systemPackages = [
+    incus-fixed
+    pkgs.lxc
   ];
   
   networking.firewall.allowedTCPPorts = [ 8443 ];
diff --git a/packages/lab-tool/main.scm b/packages/lab-tool/main.scm
index 3b15de6..15803b6 100755
--- a/packages/lab-tool/main.scm
+++ b/packages/lab-tool/main.scm
@@ -114,15 +114,7 @@ Home lab root: ~a
 
 (define (cmd-deploy machine-name . args)
   "Deploy configuration to machine using deploy-rs"
-  (let* ((base-options (parse-deploy-options args))
-         ;; Auto-skip checks for local machines to speed up deployment
-         (local-machines '("little-rascal"))
-         (should-skip-checks (member machine-name local-machines))
-         (options (if should-skip-checks
-                      (cons '(skip-checks . #t) base-options)
-                      base-options)))
-    (when should-skip-checks
-      (log-info "Auto-skipping checks for local machine: ~a" machine-name))
+  (let* ((options (parse-deploy-options args)))
     (log-info "Deploying to machine: ~a using deploy-rs" machine-name)
     (if (validate-machine-name machine-name)
         (let ((result (deploy-machine machine-name "default" options)))
diff --git a/packages/lab-tool/utils/config.scm b/packages/lab-tool/utils/config.scm
index c8838a0..51abd04 100644
--- a/packages/lab-tool/utils/config.scm
+++ b/packages/lab-tool/utils/config.scm
@@ -20,8 +20,9 @@
 (define default-config
   `((homelab-root . "/home/geir/Home-lab")
     (machines . ((congenital-optimist 
-                  (type . local)
-                  (hostname . "localhost")
+                  (type . remote)
+                  (hostname . "congenital-optimist.tail807ea.ts.net")
+                  (ssh-alias . "congenital-optimist.tail807ea.ts.net")
                   (ssh-user . "sma")
                   (services . (workstation development)))
                  (sleeper-service