From 3bc3966e4493248deac3aec019543db33a9b8d52 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 6 Jul 2023 15:37:26 -0400
Subject: [PATCH] fix(tutanota): add desktop file

---
 configs/hypr/main.conf      | 7 +++++--
 nixos/overlays/tutanota.nix | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/configs/hypr/main.conf b/configs/hypr/main.conf
index 6c1ec23..24fe65d 100644
--- a/configs/hypr/main.conf
+++ b/configs/hypr/main.conf
@@ -17,7 +17,7 @@ exec-once = $HOME/.config/lisgd/config &
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
 # Execute your favorite apps at launch
-exec-once = bash -c "sleep 3; nm-applet"
+exec-once = bash -c "sleep 3; XDG_DATA_DIRS=/home/matt/.nix/configs/share nm-applet"
 exec-once = bash -c "sleep 4; blueberry-tray"
 exec-once = bash -c "sleep 5; nextcloud --background"
 exec-once = bash -c "sleep 6; tutanota-desktop -a"
@@ -27,6 +27,9 @@ exec-once = eww daemon
 exec-once = eww open tablet-toggle
 exec-once = eww open notif-panel
 
+# sometimes waybar starts after and stops me from pressing eww buttons
+exec-once = bash -c "sleep 0.5; eww reload"
+
 exec-once = gnome-keyring-daemon --start --components=secrets
 exec-once = squeekboard
 
@@ -34,7 +37,7 @@ exec-once = $menu
 exec-once = hyprpaper
 
 # after boot, there are 2 bars for some reason, so I kill them and rerun the command
-exec-once = bash -c "killall -r -0 waybar && killall -r waybar; waybar"
+exec-once = bash -c "killall -r -0 waybar && killall -r waybar; XDG_DATA_DIRS=/home/matt/.nix/configs/share waybar"
 exec-once = swaync
 
 exec-once = wl-paste --watch cliphist store
diff --git a/nixos/overlays/tutanota.nix b/nixos/overlays/tutanota.nix
index 21384b9..1ae8630 100644
--- a/nixos/overlays/tutanota.nix
+++ b/nixos/overlays/tutanota.nix
@@ -27,7 +27,9 @@ let
     inherit pname version src;
   };
 
-in appimageTools.wrapType2 {
+in 
+
+appimageTools.wrapType2 {
   inherit name src;
 
   profile = ''
@@ -37,13 +39,14 @@ in appimageTools.wrapType2 {
   targetPkgs = pkgs: [ libGL libsecret ffmpeg curl alsa-lib udev ];
 
   extraInstallCommands = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/share/applications
     
     cp -r ${extracted}/* $out/
 
     ln -s $out/tutanota-desktop $out/bin/tutanota-desktop
     
-    substituteInPlace $out/tutanota-desktop.desktop \
+    mv $out/tutanota-desktop.desktop $out/share/applications/
+    substituteInPlace $out/share/applications/tutanota-desktop.desktop \
       --replace AppRun ${pname}
     
     source "${makeWrapper}/nix-support/setup-hook"