home-manager/modules/sway/default.nix

@@ -37,7 +37,6 @@ in
     };
     startup = mkOption {
       description = "Commands that should be executed at startup.";
-      default = [ ];
       type = types.listOf (
         types.submodule {
           options = {
@@ -93,6 +92,14 @@ in
       config = {
         modifier = mod;
 
+        assigns = {
+          "1" = [ { app_id = "firefox"; } ];
+          "2" = [ { app_id = "foot"; } ];
+          "3" = [
+            { class = "Code"; }
+            { app_id = "emacs"; }
+          ];
+        };
         bars = [ ];
 
         # Dracula theme

home-manager/modules/waybar/default.nix

@@ -9,11 +9,7 @@ let
   cfg = config.eboskma.programs.waybar;
 in
 {
-  options.eboskma.programs.waybar = {
+  options.eboskma.programs.waybar.enable = mkEnableOption "Enable waybar";
-    enable = mkEnableOption "Enable waybar";
-    sway = mkEnableOption "sway";
-    river = mkEnableOption "river";
-  };
 
   config = mkIf cfg.enable {
     programs.waybar = {
@@ -26,18 +22,18 @@ in
           position = "top";
           height = 32;
 
-          modules-left =
+          modules-left = [
-            [ ]
+            "wlr/workspaces"
-            ++ lib.optionals cfg.river [
+            "river/tags"
-              "river/tags"
+            "river/mode"
-              "river/mode"
+            "sway/workspaces"
-            ]
+            "sway/mode"
-            ++ lib.optionals cfg.sway [
+            "custom/now_playing"
-              "sway/workspaces"
+          ];
-              "sway/mode"
+          modules-center = [
-            ]
+            "sway/window"
-            ++ [ "custom/now_playing" ];
+            "river/window"
-          modules-center = (lib.optional cfg.sway "sway/window") ++ (lib.optional cfg.river "river/window");
+          ];
           modules-right = [
             "network"
             "memory"

users/erwin/home.nix

@@ -10,6 +10,26 @@ let
   cfg = config.eboskma.users.erwin;
   homeCfg = config.home-manager.users.erwin;
   bt = config.eboskma.bluetooth;
+
+  ewwDaemon =
+    let
+      path = lib.makeBinPath (
+        with pkgs;
+        [
+          ha-now-playing
+          jaq
+          pamedia
+          bash
+          helvum
+          pavucontrol
+        ]
+      );
+    in
+    pkgs.writeShellScript "eww-daemon" ''
+      export PATH=${path}:''${PATH}
+
+      ${homeCfg.eboskma.programs.eww.package}/bin/eww $@
+    '';
 in
 {
   config = mkIf cfg.home {
@@ -36,6 +56,9 @@ in
           emacs = {
             enable = true;
             package = pkgs.emacs-unstable-pgtk;
+            # .override {
+            #   treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
+            # }
             daemon = true;
           };
           electron = {
@@ -118,10 +141,13 @@ in
               "1133:49291:Logitech_G502_HERO_SE" = {
                 natural_scroll = "enabled";
               };
-              "1390:268:ELECOM_TrackBall_Mouse_HUGE_TrackBall" = {
-                natural_scroll = "enabled";
-              };
             };
+            startup = [
+              {
+                command = "${ewwDaemon} --restart open bar-home";
+                always = true;
+              }
+            ];
           };
           swaynotificationcenter.enable = true;
           tea = {
@@ -140,10 +166,7 @@ in
             };
           };
           tmux.enable = true;
-          waybar = {
+          waybar.enable = true;
-            enable = true;
-            sway = true;
-          };
           zathura.enable = true;
           zellij = {
             enable = true;
@@ -177,7 +200,6 @@ in
             easyeffects
             element-desktop
             fd
-            freecad
             ffmpeg_5-full
             helvum
             imagemagick
@@ -226,7 +248,6 @@ in
             # winetricks
             wl-clipboard
             zeal
-            zed-editor
           ]
           ++ (with gst_all_1; [
             gstreamer
@@ -240,7 +261,7 @@ in
           ]);
 
         pointerCursor = {
-          name = "catppuccin-mocha-dark-cursors";
+          name = "Catppuccin-Mocha-Dark-Cursors";
           package = pkgs.catppuccin-cursors.mochaDark;
           gtk.enable = true;
           x11.enable = true;