home: Remove commented out emacs override

home-manager/modules/sway/default.nix

@@ -37,6 +37,7 @@ in
     };
     startup = mkOption {
       description = "Commands that should be executed at startup.";
+      default = [ ];
       type = types.listOf (
         types.submodule {
           options = {
@@ -92,14 +93,6 @@ 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,7 +9,11 @@ let
   cfg = config.eboskma.programs.waybar;
 in
 {
-  options.eboskma.programs.waybar.enable = mkEnableOption "Enable waybar";
+  options.eboskma.programs.waybar = {
+    enable = mkEnableOption "Enable waybar";
+    sway = mkEnableOption "sway";
+    river = mkEnableOption "river";
+  };
 
   config = mkIf cfg.enable {
     programs.waybar = {
@@ -22,18 +26,18 @@ in
           position = "top";
           height = 32;
 
-          modules-left = [
+          modules-left =
-            "wlr/workspaces"
+            [ ]
-            "river/tags"
+            ++ lib.optionals cfg.river [
-            "river/mode"
+              "river/tags"
-            "sway/workspaces"
+              "river/mode"
-            "sway/mode"
+            ]
-            "custom/now_playing"
+            ++ lib.optionals cfg.sway [
-          ];
+              "sway/workspaces"
-          modules-center = [
+              "sway/mode"
-            "sway/window"
+            ]
-            "river/window"
+            ++ [ "custom/now_playing" ];
-          ];
+          modules-center = (lib.optional cfg.sway "sway/window") ++ (lib.optional cfg.river "river/window");
           modules-right = [
             "network"
             "memory"

users/erwin/home.nix

@@ -10,26 +10,6 @@ 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 {
@@ -56,9 +36,6 @@ in
           emacs = {
             enable = true;
             package = pkgs.emacs-unstable-pgtk;
-            # .override {
-            #   treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
-            # }
             daemon = true;
           };
           electron = {
@@ -141,13 +118,10 @@ 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 = {
@@ -166,7 +140,10 @@ in
             };
           };
           tmux.enable = true;
-          waybar.enable = true;
+          waybar = {
+            enable = true;
+            sway = true;
+          };
           zathura.enable = true;
           zellij = {
             enable = true;
@@ -200,6 +177,7 @@ in
             easyeffects
             element-desktop
             fd
+            freecad
             ffmpeg_5-full
             helvum
             imagemagick
@@ -248,6 +226,7 @@ in
             # winetricks
             wl-clipboard
             zeal
+            zed-editor
           ]
           ++ (with gst_all_1; [
             gstreamer
@@ -261,7 +240,7 @@ in
           ]);
 
         pointerCursor = {
-          name = "Catppuccin-Mocha-Dark-Cursors";
+          name = "catppuccin-mocha-dark-cursors";
           package = pkgs.catppuccin-cursors.mochaDark;
           gtk.enable = true;
           x11.enable = true;