attempt to simplify and fix

.config/hypr/hyprland.conf

@@ -454,7 +454,7 @@ bind = CTRL+ALT,2,pass,^(com\.obsproject\.Studio)$
 #windowrulev2=opacity 0.9,class:Code
 #windowrulev2=opacity 0.9,class:Spotify
 
-windowrulev2 = suppress_event maximize,class:^(vesktop)$
+#windowrulev2 = suppress_event maximize,class:^(vesktop)$
 
 #windowrulev2=workspace 10,class:Code # Open Code on secondary monitor
 

servers/ui-mode/configuration.nix

@@ -6,15 +6,10 @@
   config,
   pkgs,
   options,
-  nixpkgs-unstable,
   lib,
   dms,
   ...
 }:
-let
-  unstable-pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; # import nixpkgs-unstable.nixosModules.readOnlyPkgs {};
-  # unstable-pkgs = hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
 {
   imports = [
     dms.nixosModules.greeter
@@ -114,17 +109,13 @@ in
     LC_TIME = "en_GB.UTF-8";
   };
   services.displayManager.sddm.enable = true;
-  services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6 = {
     enable = true;
   };
   # services.desktopManager.gnome.enable = true;
-  services.xserver = {
+  services.xserver.xkb = {
-    enable = false;
+    layout = "us";
-    xkb = {
+    variant = "";
-      layout = "us";
-      variant = "";
-    };
   };
 
   services.printing.enable = true;
@@ -442,22 +433,6 @@ in
     ))
   ];
 
-  environment.variables =
-    let
-      qtVersions = with pkgs; [
-        qt5
-        qt6
-      ];
-    in
-    {
-      QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions;
-      QML2_IMPORT_PATH =
-        map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions
-        ++ (with unstable-pkgs; [
-          "${quickshell}/lib/qt-6/qml/"
-        ]);
-    };
-
   nixpkgs.config = {
     allowUnfree = true;
     cudaSupport = true;

servers/ui-mode/home.nix

@@ -26,7 +26,9 @@ let
       allowUnfree = true;
     };
   };
-  activitywatchPackages = pkgs.qt6Packages.callPackage "${pkgs.path}/pkgs/applications/office/activitywatch" { };
+  activitywatchPackages =
+    pkgs.qt6Packages.callPackage "${pkgs.path}/pkgs/applications/office/activitywatch"
+      { };
   activitywatchFixed = pkgs.activitywatch.override {
     aw-server-rust = pkgs.aw-server-rust.overrideAttrs (oldAttrs: {
       env = (oldAttrs.env or { }) // {
@@ -36,31 +38,16 @@ let
       };
     });
   };
-  codexbarWrapped = pkgs.writeShellApplication {
+
-    name = "codexbar";
+  vesktopWrapped = pkgs.vesktop.overrideAttrs (oldAttrs: {
-    runtimeInputs = [ pkgs.bubblewrap ];
+    nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
-    text = ''
+    postFixup = (oldAttrs.postFixup or "") + ''
-      exec bwrap \
-        --die-with-parent \
-        --bind / / \
-        --dev-bind /dev /dev \
-        --proc /proc \
-        --tmpfs /usr \
-        --dir /usr/bin \
-        --ro-bind ${pkgs.which}/bin/which /usr/bin/which \
-        -- \
-        ${codexbar.packages.${pkgs.system}.default}/bin/codexbar "$@"
-    '';
-  };
-  vesktopWrapped = pkgs.symlinkJoin {
-    name = "vesktop-pipewire";
-    paths = [ pkgs.vesktop ];
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
       wrapProgram $out/bin/vesktop \
-        --add-flags "--enable-features=WebRTCPipeWireCapturer,WaylandWindowDecorations"
+        --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath [ pkgs.pipewire ]}" \
+        --add-flags "--ozone-platform=wayland --enable-features=WebRTCPipeWireCapturer,WaylandWindowDecorations"
     '';
-  };
+  });
+
   # system = stdenv.hostPlatform.system;
 in
 {
@@ -79,7 +66,7 @@ in
       firefox
       unrar
       wine
-      codexbarWrapped
+      codexbar.packages.${pkgs.system}.default
       codex
       jellyfin-desktop
       (kdePackages.qt6ct.overrideAttrs (oldAttrs: {
@@ -431,6 +418,9 @@ in
     ];
     zen-browser = {
       enable = true;
+      extraPrefs = ''
+        user_pref("media.webrtc.camera.allow-pipewire", true);
+      '';
       extraPrefsFiles = [
         # (builtins.fetchurl {
         #   url = "https://raw.githubusercontent.com/MrOtherGuy/fx-autoconfig/master/program/config.js";