From 8b4ec77e937b6b87dfa3b41e77a4cdfd7d5a31dd Mon Sep 17 00:00:00 2001
From: Daniel Bulant <danbulant@gmail.com>
Date: Thu, 4 Jun 2026 23:09:58 +0200
Subject: [PATCH] attempt to simplify and fix

---
 servers/ui-mode/configuration.nix | 61 +++++++------------------------
 servers/ui-mode/home.nix          | 19 +---------
 2 files changed, 16 insertions(+), 64 deletions(-)

diff --git a/servers/ui-mode/configuration.nix b/servers/ui-mode/configuration.nix
index bef9580..73f972f 100644
--- a/servers/ui-mode/configuration.nix
+++ b/servers/ui-mode/configuration.nix
@@ -109,17 +109,13 @@
     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 = {
-    enable = false;
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
   };
 
   services.printing.enable = true;
@@ -223,8 +219,6 @@
 
   programs.hyprland = {
     enable = true;
-    # Installs UWSM's user units required by the Hyprland (uwsm-managed) session.
-    withUWSM = true;
     #    package = hyprland.packages.${pkgs.system}.hyprland;
     # portalPackage = hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland.override
     #  {
@@ -257,45 +251,18 @@
       };
     };
   };
-  systemd.user.services = {
-    xdg-desktop-portal-hyprland = {
-      unitConfig = {
-        Description = "Portal service (Hyprland implementation)";
-        PartOf = "graphical-session.target";
-        After = [
-          "graphical-session.target"
-          "wayland-session-waitenv.service"
-          "wayland-wm@hyprland.desktop.service"
-        ];
-        Wants = [ "wayland-session-waitenv.service" ];
-        ConditionEnvironment = [
-          "WAYLAND_DISPLAY"
-          "HYPRLAND_INSTANCE_SIGNATURE"
-        ];
-      };
-      serviceConfig = {
-        Type = "dbus";
-        BusName = "org.freedesktop.impl.portal.desktop.hyprland";
-        ExecStart = "${pkgs.xdg-desktop-portal-hyprland}/libexec/xdg-desktop-portal-hyprland";
-        Restart = "on-failure";
-        RestartSec = "2s";
-        Slice = "session.slice";
-      };
+  systemd.user.services.plasma-xdg-desktop-portal-kde = {
+    unitConfig = {
+      Description = "Xdg Desktop Portal For KDE";
+      PartOf = "graphical-session.target";
+      After = "plasma-core.target";
+      ConditionEnvironment = "XDG_CURRENT_DESKTOP=KDE";
     };
-
-    plasma-xdg-desktop-portal-kde = {
-      unitConfig = {
-        Description = "Xdg Desktop Portal For KDE";
-        PartOf = "graphical-session.target";
-        After = "plasma-core.target";
-        ConditionEnvironment = "XDG_CURRENT_DESKTOP=KDE";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.kdePackages.xdg-desktop-portal-kde}/libexec/xdg-desktop-portal-kde";
-        BusName = "org.freedesktop.impl.portal.desktop.kde";
-        Slice = "session.slice";
-        Restart = "no";
-      };
+    serviceConfig = {
+      ExecStart = "${pkgs.kdePackages.xdg-desktop-portal-kde}/libexec/xdg-desktop-portal-kde";
+      BusName = "org.freedesktop.impl.portal.desktop.kde";
+      Slice = "session.slice";
+      Restart = "no";
     };
   };
   programs.dank-material-shell.greeter = {
diff --git a/servers/ui-mode/home.nix b/servers/ui-mode/home.nix
index 0eba2a7..4ae05a4 100644
--- a/servers/ui-mode/home.nix
+++ b/servers/ui-mode/home.nix
@@ -38,22 +38,7 @@ let
       };
     });
   };
-  codexbarWrapped = pkgs.writeShellApplication {
-    name = "codexbar";
-    runtimeInputs = [ pkgs.bubblewrap ];
-    text = ''
-      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.vesktop.overrideAttrs (oldAttrs: {
     nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
     postFixup = (oldAttrs.postFixup or "") + ''
@@ -81,7 +66,7 @@ in
       firefox
       unrar
       wine
-      codexbarWrapped
+      codexbar.packages.${pkgs.system}.default
       codex
       jellyfin-desktop
       (kdePackages.qt6ct.overrideAttrs (oldAttrs: {