From f81d99efbdcdedf810bf45aa2ab3e351bc9ff765 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Wed, 17 Aug 2022 23:45:24 +0200
Subject: [PATCH] Add more portals to wayland/sway and fix fonts

---
 modules/sway.nix                   |  5 +++-
 users/ellmau/conf/waybar/style.css |  2 +-
 users/ellmau/default.nix           | 39 +++++++++++++++++++++++++++++-
 users/ellmau/mako.nix              |  4 +--
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/modules/sway.nix b/modules/sway.nix
index 84f8f6c..2a10a6d 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -23,7 +23,10 @@ with lib; {
         enable = true;
         wlr.enable = true;
         # gtk portal needed to make gtk apps happy
-        extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+        extraPortals = [
+          pkgs.xdg-desktop-portal-gtk
+          pkgs.xdg-desktop-portal-wlr
+        ];
         gtkUsePortal = true;
       };
 
diff --git a/users/ellmau/conf/waybar/style.css b/users/ellmau/conf/waybar/style.css
index b767501..d46b9b8 100644
--- a/users/ellmau/conf/waybar/style.css
+++ b/users/ellmau/conf/waybar/style.css
@@ -29,7 +29,7 @@
 
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-family: Hasklug Nerd Font, FontAwesome, Roboto, Helvetica, Arial, sans-serif;
     font-size: 13px;
     border: none;
     border-radius: 0;
diff --git a/users/ellmau/default.nix b/users/ellmau/default.nix
index abe540a..5c9f27e 100644
--- a/users/ellmau/default.nix
+++ b/users/ellmau/default.nix
@@ -48,9 +48,46 @@
       enable = true;
       settings = {
         window = {
-          decorations = "full";
+          decorations = "none";
         };
         alt_send_esc = true;
+        font = {
+          normal.family = "Hasklug Nerd Font";
+          size = 14;
+        };
+        # colors = {
+        #   primary = {
+        #     background = "#282828"; # base3
+        #     foreground = "#dfbf8e"; # base00
+        #   };
+
+        #   cursor = {
+        #     text = "CellBackground";
+        #     cursor = "CellForeground";
+        #   };
+
+        #   normal = {
+        #     black = "#665c54"; # base02
+        #     red = "#ea6962"; # red
+        #     green = "#a9b665"; # green
+        #     yellow = "#e78a4e"; # yellow
+        #     blue = "#7daea3"; # blue
+        #     magenta = "#d3869b"; # magenta
+        #     cyan = "#89b482"; # cyan
+        #     white = "#dfbf8e"; # base2
+        #   };
+
+        #   bright = {
+        #     black = "#928374"; # base03
+        #     red = "#ea6962"; # orange
+        #     green = "#a6b665"; # base01
+        #     yellow = "#e3a84e"; # base00
+        #     blue = "#7daea3"; # base0
+        #     magenta = "#d3869b"; # violet
+        #     cyan = "#89b482"; # base1
+        #     white = "#dfbf8e"; # base3
+        #   };
+        # };
       };
     };
 
diff --git a/users/ellmau/mako.nix b/users/ellmau/mako.nix
index bcc6cf7..3d16716 100644
--- a/users/ellmau/mako.nix
+++ b/users/ellmau/mako.nix
@@ -5,8 +5,8 @@
     enable = true;
     iconPath = "${pkgs.numix-icon-theme}";
     font = "Hasklug Nerd Font 10";
-    defaultTimeout = 50000;
-    ignoreTimeout = true;
+    defaultTimeout = 8000;
+   # ignoreTimeout = true;
     
   };