From e003f215799237363f3c93b1e4b289e46bc22e3a Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 24 Sep 2023 07:32:32 +0100
Subject: [PATCH] Add dex, run at hyprland start

Move davmail to Ronin only
---
 home/accounts.nix        | 2 +-
 home/hyprland/config.nix | 7 +------
 hosts/Ronin/home.nix     | 9 ++++++++-
 system/desktop.nix       | 1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/home/accounts.nix b/home/accounts.nix
index ff4ed876..6880b801 100644
--- a/home/accounts.nix
+++ b/home/accounts.nix
@@ -58,7 +58,7 @@
       mu.enable = true;
     };
   };
-  home.packages = with pkgs; [ protonmail-bridge davmail vdirsyncer ];
+  home.packages = with pkgs; [ protonmail-bridge vdirsyncer ];
   programs = {
     mbsync.enable = true;
     msmtp.enable = true;
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index c28601f1..a0a1d482 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -1,6 +1,4 @@
 { config, pkgs, theme, ... }: ''
-  exec-once = ${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-authentication-agent-1
-
   source = ${theme}
   source = ./extra.conf
   monitor=,preferred,auto,auto
@@ -19,9 +17,6 @@
   env = DOOMLOCALDIR=${config.home.sessionVariables.DOOMLOCALDIR};
   env = DOOMPROFILELOADFILE=${config.home.sessionVariables.DOOMPROFILELOADFILE};
 
-
-  exec-once=configure-gtk
-
   input {
       kb_layout = gb
       follow_mouse = 1
@@ -228,5 +223,5 @@
   exec-once = ${pkgs.swaynotificationcenter}/bin/swaync
   exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
   exec-once = ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n
-  exec-once = ${pkgs.davmail}/bin/davmail -notray
+  exec-once = ${pkgs.dex}/bin/dex --autostart
 ''
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 8166da47..d104c491 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -1,7 +1,12 @@
 { config, pkgs, lib, user, ... }:
 
 {
-  home.packages = with pkgs; [ openfortivpn nomachine-client teams-for-linux ];
+  home.packages = with pkgs; [
+    davmail
+    openfortivpn
+    nomachine-client
+    teams-for-linux
+  ];
   programs = {
     git.userEmail = "evie.litherland-smith@ukaea.uk";
     ssh.matchBlocks = {
@@ -155,5 +160,7 @@
     windowrule = workspace 6,(teams-for-linux)
     windowrulev2 = workspace 7,title:(Zoom|zoom)
     windowrule = workspace 8,(Nxplayer.bin)
+
+    exec-once = ${pkgs.davmail}/bin/davmail -notray
   '';
 }
diff --git a/system/desktop.nix b/system/desktop.nix
index a4dce581..5c21aea3 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -2,6 +2,7 @@
 
 {
   environment.systemPackages = with pkgs; [
+    dex
     mesa
     libnotify
     glib