mew

modules/desktop/easyeffects.nix

@@ -0,0 +1,43 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.xyno.desktop.easyeffects;
+in
+{
+  options.xyno.desktop.easyeffects.enable = lib.mkEnableOption "enable easyeffects sound thingy";
+  options.xyno.desktop.easyeffects.wantedBy = lib.mkOption {
+    type = lib.types.str;
+    default = "niri.service";
+  };
+  options.xyno.desktop.easyeffects.package = lib.mkOption {
+    type = lib.types.package;
+    default = pkgs.easyeffects;
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    systemd.user.services.easyeffects = {
+      unitConfig = {
+        Description = "Easyeffects daemon";
+        Requires = [ "dbus.service" ];
+        After = [ cfg.wantedBy ];
+        PartOf = [
+          cfg.wantedBy
+          "pipewire.service"
+        ];
+      };
+
+      wantedBy = [ cfg.wantedBy ];
+
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/easyeffects --gapplication-service";
+        ExecStop = "${cfg.package}/bin/easyeffects --quit";
+        Restart = "on-failure";
+        RestartSec = 5;
+      };
+    };
+  };
+}

modules/desktop/mako.nix

@@ -32,7 +32,7 @@ in
       unitConfig.Requisite = "graphical-session.target";
       serviceConfig.Restart = "on-failure";
       wantedBy = [ cfg.wantedBy ];
-      script = "${cfg.package}/bin/mako -c ${makoConf}";
+      script = "exec ${cfg.package}/bin/mako -c ${makoConf}";
       restartTriggers = [makoConf];
     };
   };

modules/desktop/mate-polkit.nix

@@ -26,7 +26,7 @@ in
       unitConfig.Requisite = "graphical-session.target";
       serviceConfig.Restart = "on-failure";
       wantedBy = [ cfg.wantedBy ];
-      script = "${cfg.package}/libexec/polkit-mate-authentication-agent-1";
+      script = "exec ${cfg.package}/libexec/polkit-mate-authentication-agent-1";
     };
   };
 }

modules/desktop/shikane.nix

@@ -25,7 +25,7 @@ in
       unitConfig.Requisite = "graphical-session.target";
       serviceConfig.Restart = "on-failure";
       wantedBy = [ cfg.wantedBy ];
-      script = "${cfg.package}/bin/shikane";
+      script = "exec ${cfg.package}/bin/shikane";
     };
   };
 }

modules/desktop/swayidle.nix

@@ -39,7 +39,7 @@ in
       unitConfig.Requisite = "graphical-session.target";
       serviceConfig.Restart = "on-failure";
       wantedBy = [ cfg.wantedBy ];
-      script = "${cfg.package}/bin/swayidle -w timeout 310 'niri msg action power-off-monitors' timeout 300 '${cfg.swaylockPackage}/bin/swaylock ${cfg.swaylockArgs}' before-sleep '${cfg.swaylockPackage}/bin/swaylock ${cfg.swaylockArgs}'";
+      script = "exec ${cfg.package}/bin/swayidle -w timeout 310 'niri msg action power-off-monitors' timeout 300 '${cfg.swaylockPackage}/bin/swaylock ${cfg.swaylockArgs}' before-sleep '${cfg.swaylockPackage}/bin/swaylock ${cfg.swaylockArgs}'";
     };
   };
 }

modules/desktop/wpaperd.nix

@@ -32,7 +32,7 @@ in
       unitConfig.Requisite = "graphical-session.target";
       serviceConfig.Restart = "on-failure";
       wantedBy = [ cfg.wantedBy ];
-      script = "${cfg.package}/bin/wpaperd -c ${wpaperdConf}";
+      script = "exec ${cfg.package}/bin/wpaperd -c ${wpaperdConf}";
       restartTriggers = [wpaperdConf];
     };
   };

modules/module-list.nix

@@ -3,6 +3,7 @@
   ./cli/starship.nix
   ./desktop/audio.nix
   ./desktop/common-programs.nix
+  ./desktop/easyeffects.nix
   ./desktop/fcitx5.nix
   ./desktop/foot.nix
   ./desktop/fuzzel.nix

modules/presets/cli.nix

@@ -74,6 +74,7 @@ in
       helix
       lm_sensors
       dig
+      nix-output-monitor
       (pkgs.writeShellScriptBin "sudo" "run0 $@")
     ];
     programs.mosh.enable = true;

modules/presets/gui.nix

@@ -92,7 +92,7 @@ in
 
     # fonts
     fonts.packages = with pkgs; [
-      nerdfonts
+      nerd-fonts.jetbrains-mono
       cantarell-fonts
       dejavu_fonts
       source-code-pro # Default monospace font in 3.32

modules/system/user.nix

@@ -30,6 +30,7 @@ in
         "tape"
         "uucp"
         "wireshark"
+
       ];
 
     };