Progress on desktop system, added integration with nixgreety

user-modules/desktop/custom/bar/waybar.nix

@@ -32,6 +32,7 @@ in
 
     programs.waybar = {
       enable = true;
+      systemd.enable = false;
       settings = {
         mainBar = {
           layer = "top";

user-modules/desktop/custom/default.nix

@@ -20,12 +20,6 @@ in
 
   options.modules.desktop = {
     wayland = mkEnableOption "wayland";
-    # TODO: Remove, not needed with session/display manager
-    initScript = mkOption {
-      type = types.lines;
-      default = "${pkgs.bash}/bin/bash";
-      description = "Bash script to execute after logging in.";
-    };
     # TODO: Find a nicer way to do this as this is also executed on startup
     reloadScript = mkOption {
       type = types.lines;
@@ -69,16 +63,16 @@ in
           );
         };
 
-        home.file.".initrc" = {
-          enable = true;
-          executable = true;
-          text =
-            ''
-              #!${pkgs.bash}/bin/bash
+        # home.file.".initrc" = {
+        #   enable = true;
+        #   executable = true;
+        #   text =
+        #     ''
+        #       #!${pkgs.bash}/bin/bash
 
-            ''
-            + cfg.initScript;
-        };
+        #     ''
+        #     + cfg.initScript;
+        # };
       }
       (
         # TODO: Move to dedicated module within desktop or maybe theming?

user-modules/desktop/custom/window-manager/i3.nix

@@ -16,7 +16,7 @@ in
     # modules.desktop.x11 = true;
     modules.rofi.enable = true;
 
-    modules.desktop.initScript = ''
+    desktop.initScript = ''
       i3
     '';
 

user-modules/desktop/custom/window-manager/river.nix

@@ -32,10 +32,13 @@ in
     ];
 
     # Change desktop to execute river
-    modules.desktop.initScript = ''
-      river
+    desktop.initScript = ''
+      ${pkgs.dbus}/bin/dbus-run-session ${pkgs.river}/bin/river
     '';
 
+    desktop.session.type = "wayland";
+    desktop.session.desktop = "river";
+
     # TODO: Fix this
     # modules.desktop.reloadScript = ''
     #   ${pkgs.river}/bin/riverctl background-color 0x${config.theming.colors.bg}
@@ -62,6 +65,7 @@ in
     wayland.windowManager.river = {
       enable = true;
       xwayland.enable = false;
+      systemd.enable = false;
       settings =
         let
           layout = "filtile";