home/graphical/fuzzel.nix

@@ -10,7 +10,7 @@
         line-height = 30;
         fields = "name,generic,comment";
         terminal = lib.my.getExe osConfig.modules.system.roles.desktop.terminal;
-        prompt = ''"❯   "'';
+        prompt = "❯   ";
         layer = "overlay";
       };
       colors = {

home/hyprland/default.nix

@@ -29,7 +29,11 @@ mkIf osConfig.programs.hyprland.enable {
 
       exec-once = [
         "${config.services.kdeconnect.package}/bin/kdeconnect-indicator"
-        "${pkgs.keepassxc}/bin/keepassxc"
+        "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"
+
+        # keepassxc ignores themeing and doesnt show up in system tray otherwise
+        # Dirty solution but hey
+        "sleep 3 && ${pkgs.keepassxc}/bin/keepassxc"
         (lib.mkIf config.services.hypridle.enable "${pkgs.hypridle}/bin/hypridle")
       ];
 

hosts/marr/default.nix

@@ -73,7 +73,6 @@
   };
 
   programs = {
-    uwsm.enable = true;
     dconf.enable = true;
     fish.enable = true;
     firefox.enable = true;

modules/programs/hyprland.nix

@@ -1,10 +1 @@
-{ lib, config, ... }:
+{ lib, config, ... }: lib.mkIf config.programs.hyprland.enable { }
-lib.mkIf config.programs.hyprland.enable {
-  programs.uwsm = {
-    waylandCompositors.hyprland = {
-      prettyName = "Hyprland";
-      comment = "Hyprland compositor managed by UWSM";
-      binPath = "/run/current-system/sw/bin/Hyprland";
-    };
-  };
-}

modules/programs/sway.nix

@@ -1,17 +1,7 @@
 { config, lib, ... }:
 lib.mkIf config.programs.sway.enable {
-
+  programs.sway = {
-  programs = {
+    wrapperFeatures.gtk = true;
-    uwsm = {
+    extraPackages = [ ];
-      waylandCompositors.sway = {
-        prettyName = "Sway";
-        comment = "Sway compositor managed by UWSM";
-        binPath = "/run/current-system/sw/bin/sway";
-      };
-    };
-    sway = {
-      wrapperFeatures.gtk = true;
-      extraPackages = [ ];
-    };
   };
 }

options/services/nysh.nix

@@ -26,7 +26,10 @@ in
         pkgs.brightnessctl
         pkgs.networkmanager
       ];
-      wantedBy = [ "graphical-session.target" ];
+      wantedBy = [
+        "multi-user.target"
+        "graphical-session.target"
+      ];
       partOf = [ "graphical-session.target" ];
       after = [ "graphical-session-pre.target" ];
 

options/services/tailscale.nix

@@ -86,7 +86,7 @@ in
       description = "tailscale system tray";
       wantedBy = [ "graphical-session.target" ];
       wants = [ "graphical-session.target" ];
-      after = [ "graphical-session-pre.target" ];
+      after = [ "graphical-session.target" ];
       path = [ pkgs.polkit ];
       serviceConfig = {
         Type = "simple";