configurations/desktop/configuration.nix

@@ -95,6 +95,58 @@
     };
   };
 
+  # Steam Game Platform
+  programs.steam = {
+    enable = true;
+    # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+    #gamescopeSession.enable = true;
+
+    #package = pkgs.steam.override {
+    #  extraLibraries = p: with p; [
+    #    gfxreconstruct
+    #    glslang
+    #    spirv-cross
+    #    spirv-headers
+    #    spirv-tools
+    #    vulkan-extension-layer
+    #    vulkan-headers
+    #    vulkan-loader
+    #    vulkan-tools
+    #    vulkan-tools-lunarg
+    #    vulkan-utility-libraries
+    #    vulkan-validation-layers
+    #    vkdisplayinfo
+    #    vkd3d
+    #    vkd3d-proton
+    #    vk-bootstrap
+    #  ];
+    #  extraPkgs = p: with p; [
+    #    gfxreconstruct
+    #    glslang
+    #    spirv-cross
+    #    spirv-headers
+    #    spirv-tools
+    #    vulkan-extension-layer
+    #    vulkan-headers
+    #    vulkan-loader
+    #    vulkan-tools
+    #    vulkan-tools-lunarg
+    #    vulkan-utility-libraries
+    #    vulkan-validation-layers
+    #    vkdisplayinfo
+    #    vkd3d
+    #    vkd3d-proton
+    #    vk-bootstrap
+    #  ];
+    #};
+  };
+  programs.gamescope = {
+    enable = true;
+    args = [ "--expose-wayland" ];
+  };
+  programs.gamemode.enable = true;
+
   # Single GPU Passthru Configuration
   #cspark-single-gpu-passthru.enable = true;
   #cspark-single-gpu-passthru.vmName = "win11";

configurations/laptop/configuration.nix

@@ -32,7 +32,7 @@
     knownHosts = {
       cspark-desktop-nixremotebuilder = {
         extraHostNames = [ "cspark-nixos-desktop" "192.168.1.110" ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/A49FhfRM7cI4MykQAtKdcOXgEya2dV9nCHnO2rqHt";
+        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWWfMZhdSKiUZZU1Pl7Hp6+BKHhWswLNmngLDzzMsGl";
       };
     };
     extraConfig = ''

global.nix

@@ -98,7 +98,6 @@
     rapidfuzz
     paramiko
     packaging
-    click
   ];
   python-with-my-packages = pkgs.python3.withPackages my-python-packages;
   in
@@ -119,10 +118,10 @@
   	  gcc
       cmake
       libtool
-  	  #swift
+  	  swift
-  	  #swiftPackages.Foundation
+  	  swiftPackages.Foundation
-  	  #swiftpm
+  	  swiftpm
-  	  #sourcekit-lsp	
+  	  sourcekit-lsp	
   	  gradle
   	  nodejs
   	  typescript
@@ -360,59 +359,6 @@
 
   	] ++ stablePackages;
 
-  # Steam Game Platform
-  programs.steam = {
-    enable = true;
-    # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-    #gamescopeSession.enable = true;
-
-    #package = pkgs.steam.override {
-    #  extraLibraries = p: with p; [
-    #    gfxreconstruct
-    #    glslang
-    #    spirv-cross
-    #    spirv-headers
-    #    spirv-tools
-    #    vulkan-extension-layer
-    #    vulkan-headers
-    #    vulkan-loader
-    #    vulkan-tools
-    #    vulkan-tools-lunarg
-    #    vulkan-utility-libraries
-    #    vulkan-validation-layers
-    #    vkdisplayinfo
-    #    vkd3d
-    #    vkd3d-proton
-    #    vk-bootstrap
-    #  ];
-    #  extraPkgs = p: with p; [
-    #    gfxreconstruct
-    #    glslang
-    #    spirv-cross
-    #    spirv-headers
-    #    spirv-tools
-    #    vulkan-extension-layer
-    #    vulkan-headers
-    #    vulkan-loader
-    #    vulkan-tools
-    #    vulkan-tools-lunarg
-    #    vulkan-utility-libraries
-    #    vulkan-validation-layers
-    #    vkdisplayinfo
-    #    vkd3d
-    #    vkd3d-proton
-    #    vk-bootstrap
-    #  ];
-    #};
-  };
-  programs.gamescope = {
-    enable = true;
-    args = [ "--expose-wayland" ];
-  };
-  programs.gamemode.enable = true;
-
-
   # Enable ADB Tools for android development
   programs.adb.enable = true;
 

modules/nixos/cspark-desktop-niri/home.nix

@@ -101,7 +101,7 @@ fi
       _JAVA_AWT_WM_NONREPARENTING = "1";
       SSH_ASKPASS_REQUIRE = "force";
       #SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass";
+      SSH_ASKPASS = "/run/current-system/sw/bin/pinentry-gnome3";
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";

modules/nixos/cspark-desktop-niri/module.nix

@@ -45,13 +45,8 @@ in
       lxappearance # Manage GTK Themes
       kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc
       #lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents - Issues compiling
-
+      pinentry-gnome3
       zenity # Display custom prompts
-      (writeShellScriptBin "zenity-askpass"
-        ''
-	zenity --password
-       '')
-
       pavucontrol # Audio control
       pipewire.jack
 
@@ -66,7 +61,7 @@ in
       		export _JAVA_AWT_WM_NONREPARENTING="1"
       		export SSH_ASKPASS_REQUIRE="force"
       		# export SSH_ASKPASS="/run/current-system/sw/bin/lxqt-openssh-askpass"
-      		export SSH_ASKPASS="/run/current-system/sw/bin/zenity-askpass"
+      		export SSH_ASKPASS="/run/current-system/sw/bin/pinentry-gnome3"
       		export MOZ_ENABLE_WAYLAND="1"
       		# Enable native wayland support for chromium and electron based applications
       		export NIXOS_OZONE_WL="1"
@@ -169,7 +164,7 @@ in
     programs.ssh = {
       enableAskPassword = true;
       #askPassword = "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      askPassword = "/run/current-system/sw/bin/zenity-askpass";
+      askPassword = "/run/current-system/sw/bin/pinentry-gnome3";
     };
 
     environment.sessionVariables = {
@@ -182,7 +177,7 @@ in
       _JAVA_AWT_WM_NONREPARENTING = "1";
       SSH_ASKPASS_REQUIRE = "force";
       #SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass";
+      SSH_ASKPASS = "/run/current-system/sw/bin/pinentry-gnome3";
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
@@ -200,7 +195,7 @@ in
       _JAVA_AWT_WM_NONREPARENTING = "1";
       SSH_ASKPASS_REQUIRE = "force";
       #SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/zenity-askpass";
+      SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/pinentry-gnome3";
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";