From b1047d2b5442c53fb148dbc8b879e5b7af0b65b7 Mon Sep 17 00:00:00 2001
From: Jacob Bachmann <jacob.bachmann@posteo.de>
Date: Mon, 8 Jan 2024 21:14:10 +0100
Subject: [PATCH] feat: set all dbus env vars on sway exec

---
 modules/default.nix                            |  1 +
 modules/packages.nix                           |  1 +
 modules/sddm.nix                               | 12 ++++++++++++
 users/gandalf/modules/gui/programs/default.nix |  1 +
 users/gandalf/modules/gui/sway/default.nix     |  3 +++
 5 files changed, 18 insertions(+)
 create mode 100644 modules/sddm.nix

diff --git a/modules/default.nix b/modules/default.nix
index 113f718..0643080 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -67,6 +67,7 @@
     ./power.nix
     ./packages.nix
     ./printing.nix
+    ./sddm.nix
     ./security.nix
     ./shell.nix
     ./steam.nix
diff --git a/modules/packages.nix b/modules/packages.nix
index 35ada7a..9565b48 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -12,6 +12,7 @@
     expect # contains 'unbuffer'
     jq # parse json
     unzip
+    libsecret
   ] ++ lib.optionals (devenv.enable) [
     # languages
     gcc13
diff --git a/modules/sddm.nix b/modules/sddm.nix
new file mode 100644
index 0000000..6fef4a5
--- /dev/null
+++ b/modules/sddm.nix
@@ -0,0 +1,12 @@
+{ lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && lib.elem "i3" gui.flavour) {
+
+  /*
+  services.xserver.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+  };
+
+  programs.sway.enable = true;
+  */
+
+}
diff --git a/users/gandalf/modules/gui/programs/default.nix b/users/gandalf/modules/gui/programs/default.nix
index e20e138..614020a 100644
--- a/users/gandalf/modules/gui/programs/default.nix
+++ b/users/gandalf/modules/gui/programs/default.nix
@@ -19,6 +19,7 @@
     gnome.simple-scan
     telegram-desktop
     signal-desktop
+    zathura
   ] ++ lib.optionals nixosConfig.bchmnn.printing.enable [
     system-config-printer
   ];
diff --git a/users/gandalf/modules/gui/sway/default.nix b/users/gandalf/modules/gui/sway/default.nix
index 490cc10..6568cd2 100644
--- a/users/gandalf/modules/gui/sway/default.nix
+++ b/users/gandalf/modules/gui/sway/default.nix
@@ -79,6 +79,9 @@ in
       terminal = "${pkgs.alacritty}/bin/alacritty";
       menu = "${pkgs.wofi}/bin/wofi";
       startup = with pkgs; [
+        # TODO activate with systemd prbly requires a graphical.target?
+        # { command = "${dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK"; }
+        { command = "${dbus}/bin/dbus-update-activation-environment --all"; }
         { command = "${kanshi}/bin/kanshi"; }
         { command = "${networkmanagerapplet}/bin/nm-applet"; }
         { command = "${blueman}/bin/blueman-applet"; }