From bb8c8a8c046cacc56caf0c44f2bbe37ed9137408 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Tue, 16 Aug 2022 11:58:16 +0200
Subject: [PATCH] Fixing a couple of issues with sway

still not poished enough for using it as a production system
---
 modules/sway.nix      | 84 +++++++++++++++++++++++++------------------
 users/ellmau/mako.nix |  4 +--
 users/ellmau/sway.nix | 10 ++++--
 3 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/modules/sway.nix b/modules/sway.nix
index 3f85932..3f63b34 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -5,30 +5,31 @@ with lib; {
     let
       cfg = config.elss.graphical.sway;
     in
-      mkIf cfg.enable {
-        services.pipewire = {
-          enable = true;
-          alsa.enable = true;
-          pulse.enable = true;
-        };
+    mkIf cfg.enable {
+      services.pipewire = {
+        enable = true;
+        alsa.enable = true;
+        pulse.enable = true;
+      };
 
-        # xdg-desktop-portal works by exposing a series of D-Bus interfaces
-        # known as portals under a well-known name
-        # (org.freedesktop.portal.Desktop) and object path
-        # (/org/freedesktop/portal/desktop).
-        # The portal interfaces include APIs for file access, opening URIs,
-        # printing and others.
-        services.dbus.enable = true;
-        xdg.portal = {
-          enable = true;
-          wlr.enable = true;
-          # gtk portal needed to make gtk apps happy
-          extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-          gtkUsePortal = true;
-        };
+      # xdg-desktop-portal works by exposing a series of D-Bus interfaces
+      # known as portals under a well-known name
+      # (org.freedesktop.portal.Desktop) and object path
+      # (/org/freedesktop/portal/desktop).
+      # The portal interfaces include APIs for file access, opening URIs,
+      # printing and others.
+      services.dbus.enable = true;
+      xdg.portal = {
+        enable = true;
+        wlr.enable = true;
+        # gtk portal needed to make gtk apps happy
+        extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+        gtkUsePortal = true;
+      };
 
-        # enable sway window manager
-        programs.sway = {
+      # enable sway window manager
+      programs = {
+        sway = {
           enable = true;
           extraPackages = with pkgs; [
             rofi
@@ -42,20 +43,33 @@ with lib; {
           };
         };
 
-        # greetd login manager
-        services.greetd = {
+        nm-applet = {
           enable = true;
-          package = pkgs.greetd.tuigreet;
-          settings = {
-            default_session = {
-              command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
-            };
-          };
-        };
-
-        security.pam.services.greetd = {
-          enableGnomeKeyring = true;
-          gnupg.enable = true;
+          indicator = true;
         };
       };
+
+      # greetd login manager
+      services.greetd = {
+        enable = true;
+        package = pkgs.greetd.tuigreet;
+        settings = {
+          default_session = {
+            command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
+          };
+        };
+      };
+
+      security.pam.services.greetd = {
+        enableGnomeKeyring = true;
+        gnupg.enable = true;
+      };
+
+      environment.systemPackages = with pkgs; [
+        gnome3.adwaita-icon-theme
+        wl-clipboard
+      ];
+
+
+    };
 }
diff --git a/users/ellmau/mako.nix b/users/ellmau/mako.nix
index c855937..a3d1c00 100644
--- a/users/ellmau/mako.nix
+++ b/users/ellmau/mako.nix
@@ -2,9 +2,9 @@
 {
   programs.mako = {
     enable = true;
-    iconpath = "${pkgs.numix-icon-theme}";
+    iconPath = "${pkgs.numix-icon-theme}";
     font = "Hasklug Nerd Font 10";
   };
 
-  home.packages = [ pkgs.numic-icon-theme ];
+  home.packages = [ pkgs.numix-icon-theme ];
 }
diff --git a/users/ellmau/sway.nix b/users/ellmau/sway.nix
index 2d88a6b..44ca09c 100644
--- a/users/ellmau/sway.nix
+++ b/users/ellmau/sway.nix
@@ -2,9 +2,15 @@
 {
   services = {
     blueman-applet.enable = true;
-    network-manager-applet.enable = true;
   };
-  home.file.".background-image".source = ../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
+  home.file.".background-image".source = ../../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
+
+  gtk.enable = true;
+
+  home.packages = [
+    pkgs.gnome-icon-theme
+  ];
+  
   wayland.windowManager.sway = {
     enable = true;
     config = {