diff --git a/flake.lock b/flake.lock index b3d8ad0..391f49d 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751479989, - "narHash": "sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34627c90f062da515ea358360f448da57769236e", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { diff --git a/machines/congenital-optimist/configuration.nix b/machines/congenital-optimist/configuration.nix index c63d5e5..709d234 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 # Re-enabled with LTS version + ../../modules/virtualization/incus.nix ../../modules/virtualization/libvirt.nix ../../modules/virtualization/podman.nix ]; diff --git a/modules/desktop/common.nix b/modules/desktop/common.nix index fb92519..b9f1123 100644 --- a/modules/desktop/common.nix +++ b/modules/desktop/common.nix @@ -12,12 +12,8 @@ # XDG Portal configuration for Wayland/X11 compatibility xdg.portal = { enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-wlr - pkgs.xdg-desktop-portal-gtk - ]; - config.common.default = "*"; - config.niri.default = ["wlr" "gtk"]; + wlr.enable = true; + extraPortals = [pkgs.xdg-desktop-portal-gtk]; }; # Display manager and session management diff --git a/modules/virtualization/incus.nix b/modules/virtualization/incus.nix index 06f81f0..25f07d9 100644 --- a/modules/virtualization/incus.nix +++ b/modules/virtualization/incus.nix @@ -3,12 +3,12 @@ virtualisation.incus = { enable = true; ui.enable = true; - package = pkgs.incus-lts; # Use LTS version to avoid cowsql build issues + package = pkgs.incus; }; - environment.systemPackages = [ - pkgs.incus-lts - pkgs.lxc + environment.systemPackages = with pkgs; [ + incus + lxc ]; networking.firewall.allowedTCPPorts = [ 8443 ]; diff --git a/packages/lab-tool/main.scm b/packages/lab-tool/main.scm index 15803b6..3b15de6 100755 --- a/packages/lab-tool/main.scm +++ b/packages/lab-tool/main.scm @@ -114,7 +114,15 @@ Home lab root: ~a (define (cmd-deploy machine-name . args) "Deploy configuration to machine using deploy-rs" - (let* ((options (parse-deploy-options args))) + (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)) (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 51abd04..c8838a0 100644 --- a/packages/lab-tool/utils/config.scm +++ b/packages/lab-tool/utils/config.scm @@ -20,9 +20,8 @@ (define default-config `((homelab-root . "/home/geir/Home-lab") (machines . ((congenital-optimist - (type . remote) - (hostname . "congenital-optimist.tail807ea.ts.net") - (ssh-alias . "congenital-optimist.tail807ea.ts.net") + (type . local) + (hostname . "localhost") (ssh-user . "sma") (services . (workstation development))) (sleeper-service diff --git a/packages/lab-tool/utils/ssh.scm b/packages/lab-tool/utils/ssh.scm index f6be303..1f9a56d 100644 --- a/packages/lab-tool/utils/ssh.scm +++ b/packages/lab-tool/utils/ssh.scm @@ -82,10 +82,7 @@ (port (open-pipe* OPEN_READ "/bin/sh" "-c" ssh-cmd)) (output (get-string-all port)) (status (close-pipe port))) - (values (zero? status) output))) - (lambda (key . args) - (log-error "SSH command failed for ~a: ~a ~a" machine-name key args) - (values #f "")))))))))) + (values (zero? status) output))))))) ;; Copy file to remote machine using scp (define (copy-file-to-remote machine-name local-path remote-path)