From 49919ec78722559c4a9646a4403c358f3654dbb2 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Mon, 15 Aug 2022 17:43:21 +0200
Subject: [PATCH] Add mako and set further options

configure mako
adding base commands for nm-applet, blueman-applet
---
 modules/graphical.nix    |  4 ----
 users/ellmau/default.nix |  5 +++--
 users/ellmau/mako.nix    | 10 ++++++++++
 users/ellmau/sway.nix    | 21 ++++++++++++++++++---
 4 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 users/ellmau/mako.nix

diff --git a/modules/graphical.nix b/modules/graphical.nix
index ae7c1f5..2ee6d9d 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -57,10 +57,6 @@ with lib; {
         printing.enable = true;
       };
 
-      programs.nm-applet = {
-        enable = true;
-      };
-
       sound.enable = true;
 
       hardware = {
diff --git a/users/ellmau/default.nix b/users/ellmau/default.nix
index a22dbdd..cc5b6b3 100644
--- a/users/ellmau/default.nix
+++ b/users/ellmau/default.nix
@@ -2,10 +2,11 @@
 {
   imports = [
 #    ./autorandr.nix
-    ./dunst.nix
+#    ./dunst.nix
     ./git.nix
     ./gpg.nix
-#    ./i3.nix
+    ./i3.nix
+    ./mako.nix
     ./nextcloud.nix
 #    ./polybar.nix
     ./zsh.nix
diff --git a/users/ellmau/mako.nix b/users/ellmau/mako.nix
new file mode 100644
index 0000000..c855937
--- /dev/null
+++ b/users/ellmau/mako.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ...}:
+{
+  programs.mako = {
+    enable = true;
+    iconpath = "${pkgs.numix-icon-theme}";
+    font = "Hasklug Nerd Font 10";
+  };
+
+  home.packages = [ pkgs.numic-icon-theme ];
+}
diff --git a/users/ellmau/sway.nix b/users/ellmau/sway.nix
index 34581a0..2d88a6b 100644
--- a/users/ellmau/sway.nix
+++ b/users/ellmau/sway.nix
@@ -1,5 +1,10 @@
 { config, pkgs, lib, ... }:
 {
+  services = {
+    blueman-applet.enable = true;
+    network-manager-applet.enable = true;
+  };
+  home.file.".background-image".source = ../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
   wayland.windowManager.sway = {
     enable = true;
     config = {
@@ -28,17 +33,27 @@
 
       startup = [
         {
-          command = "--no-startup-id nm-applet";
+          command = "--no-startup-id nm-applet --indicator";
           always = true;
         }
-
+        {
+          command = "--no-startup-id blueman-applet";
+          always = true;
+        }
+        {
+          command = "--no-startup-id systemctl --user restart waybar.service";
+          always = true;
+        }
+        {
+          command = "--no-startup-id .config/i3/keepassxc.sh";
+        }
       ];
       terminal = "alacritty";
       window = {
         titlebar = true;
       };
 
-      bars = [];
+      bars = [ ];
     };
     extraConfig = ''
       set $mode_system System (l) lock, (CTRL+e) logout, (CTRL+r) reboot, (CTRL+s) shutdown