home-manager/modules/sway/default.nix

@@ -18,6 +18,7 @@ in
 {
   options.eboskma.programs.sway = {
     enable = mkEnableOption "sway";
+    wayvnc = mkEnableOption "wayvnc";
     package = mkPackageOption pkgs "sway" { };
 
     lock-wallpaper = mkOption {
@@ -367,6 +368,23 @@ in
     };
 
     systemd.user = {
+      services = {
+        wayvnc = mkIf cfg.wayvnc {
+          Unit = {
+            Description = "VNC server for wlroots based Wayland compositors";
+            After = [ "sway-session.target" ];
+          };
+
+          Service = {
+            ExecStart = "${pkgs.wayvnc}/bin/wayvnc 0.0.0.0";
+            Restart = "always";
+          };
+
+          Install = {
+            WantedBy = [ "graphical-session.target" ];
+          };
+        };
+      };
       targets.tray = {
         Unit = {
           Description = "Home Manager System Tray";

home-manager/modules/wayvnc/default.nix

@@ -1,66 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-with lib;
-let
-  cfg = config.eboskma.services.wayvnc;
-
-  wayvncArgs = builtins.concatStringsSep " " (
-    (lib.optional cfg.gpuAcceleration "--gpu") ++ [ cfg.listenAddress ]
-  );
-in
-{
-  options.eboskma.services.wayvnc = {
-    enable = mkEnableOption "wayvnc";
-    listenAddress = mkOption {
-      description = "Bind wayvnc to this address";
-      type = types.str;
-      default = "0.0.0.0";
-    };
-    gpuAcceleration = mkEnableOption "GPU Accelerated encoding";
-  };
-
-  config = mkIf cfg.enable {
-
-    # [Unit]
-    # Description=A VNC server for wlroots based Wayland compositors
-    # Requires=sway.service
-    # After=sway.service
-
-    # [Service]
-    # Type=simple
-    # ExecStart=/usr/bin/wayvnc
-    # Restart=on-failure
-    # RestartSec=1
-    # TimeoutStopSec=10
-
-    # [Install]
-    # WantedBy=multi-user.target
-
-    systemd.user = {
-      services = {
-        wayvnc = {
-          Unit = {
-            Description = "A VNC server for wlroots based Wayland compositors";
-            Requires = [ "sway-session.target" ];
-            After = [ "sway-session.target" ];
-          };
-
-          Service = {
-            ExecStart = "${pkgs.wayvnc}/bin/wayvnc ${wayvncArgs}";
-            Restart = "on-failure";
-            RestartSec = 1;
-            TimeoutStopSec = 10;
-          };
-
-          Install = {
-            WantedBy = [ "multi-user.target" ];
-          };
-        };
-      };
-    };
-  };
-}

machines/loki/configuration.nix

@@ -21,10 +21,6 @@
     ../../users/builder
   ];
 
-  nixpkgs.config = {
-    rocmSupport = true;
-  };
-
   eboskma = {
     users = {
       erwin = {

machines/mimir/configuration.nix

@@ -21,9 +21,6 @@
   ];
 
   # nixpkgs.config.allowUnfree = true;
-  nixpkgs.config = {
-    cudaSupport = true;
-  };
 
   eboskma = {
     var.workSystem = true;

users/erwin/home.nix

@@ -150,12 +150,6 @@ in
             copyCommand = "${pkgs.wl-clipboard}/bin/wl-copy";
           };
         };
-        services = {
-          wayvnc = {
-            enable = true;
-            gpuAcceleration = true;
-          };
-        };
       };
 
       home = {
@@ -184,7 +178,6 @@ in
             element-desktop
             fd
             ffmpeg_5-full
-            hashcat
             helvum
             imagemagick
             (imv.override {

users/erwin/work.nix

@@ -122,6 +122,7 @@ in
           sway = {
             enable = true;
             package = pkgs.sway;
+            wayvnc = true;
             lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png";
             output = {
               "DP-1" = {
@@ -162,9 +163,6 @@ in
         };
         services = {
           xbanish.enable = false;
-          wayvnc = {
-            enable = true;
-          };
         };
       };
       programs = {