switch from pavucontrol to pwvucontrol, update and switch to rmenu

common/sound.nix

@@ -16,7 +16,8 @@ in {
     };
 
     environment.systemPackages = with pkgs; [
-      pavucontrol
+      (callPackage ../custom/pwvucontrol/package.nix {})
+      # pwvucontrol
       playerctl
       pulseaudio
     ];

common/toolchains.nix

@@ -99,7 +99,17 @@ in {
       };
     };
 
-    programs.xonsh.enable = true;
+    programs.xonsh = {
+      enable = true;
+      package = pkgs.xonsh.override {
+        extraPackages = ps: with ps; [ 
+          requests
+          matplotlib
+          numpy
+          scipy
+        ];
+      };
+    };
     programs.ssh.startAgent = true;
     programs.thefuck.enable = true;
   };

custom/pwvucontrol/package.nix

@@ -0,0 +1,84 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchFromGitLab
+, cargo
+, desktop-file-utils
+, meson
+, ninja
+, pkg-config
+, rustPlatform
+, rustc
+, wrapGAppsHook4
+, cairo
+, gdk-pixbuf
+, glib
+, gtk4
+, libadwaita
+, pango
+, pipewire
+, wireplumber
+}:
+
+let
+  wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
+    version = "0.4.17";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "pipewire";
+      repo = "wireplumber";
+      rev = version;
+      hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
+    };
+  });
+in
+stdenv.mkDerivation rec {
+  pname = "pwvucontrol";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "saivert";
+    repo = "pwvucontrol";
+    rev = version;
+    hash = "sha256-t4JUpKtuO1JgrdsNbl0M/SwPmoqu7WxsaD74vlJeVhY=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "wireplumber-0.1.0" = "sha256-+LZ8xKok2AOegW8WvfrfZGXuQB4xHrLNshcTOHab+xQ=";
+    };
+  };
+
+  nativeBuildInputs = [
+    cargo
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    cairo
+    gdk-pixbuf
+    glib
+    gtk4
+    libadwaita
+    pango
+    pipewire
+    wireplumber_0_4
+  ];
+
+  meta = with lib; {
+    description = "Pipewire Volume Control";
+    homepage = "https://github.com/saivert/pwvucontrol";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "pwvucontrol";
+    platforms = platforms.linux;
+  };
+}

flake.lock

@@ -78,11 +78,11 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1711620834,
+        "lastModified": 1711734846,
-        "narHash": "sha256-ACc91o5k7rlNbX6wQmV6tiOF4pQr/nV2ulQ3JHoYH/E=",
+        "narHash": "sha256-EFrsJPOKrXp9h/C22ayBx3PwLMr3/FKEuCW8lQ/LpSc=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "bec5e460d3fcfccac029088c395f4f629c800957",
+        "rev": "7cc6282416833f2dea96f97f516aceadbf406404",
         "type": "github"
       },
       "original": {
@@ -357,11 +357,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1711497966,
+        "lastModified": 1711707302,
-        "narHash": "sha256-riUI0kKAPlx0IueXm6cn2jjAnorwumLSN2kFbVvDwT8=",
+        "narHash": "sha256-lJ3HdKjT3rQhul+PXW7Fh3iAE8GrddKjRM13GrHhQ/0=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "423a2a54463471e525a04959c9e79e3f4a206f4a",
+        "rev": "f83d1a840e0a9b23737c31191ca46d6277cf9569",
         "type": "github"
       },
       "original": {
@@ -394,11 +394,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711518378,
+        "lastModified": 1711707808,
-        "narHash": "sha256-+wOdvNOEtkb5sGeJBXK5CpUPx+NWeVwVH6y4NdVH2os=",
+        "narHash": "sha256-n+WRrXW5aMYB/AyJtpZniPC+KhOMh1tRIvHlf2Ql+pA=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "e276c906bf4bea27dc8173815ff373d04c20caaf",
+        "rev": "ab228165212a7fc1911044bcf9a1f1d84cdaf5a3",
         "type": "github"
       },
       "original": {
@@ -430,11 +430,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711501815,
+        "lastModified": 1711847810,
-        "narHash": "sha256-mHtxlnqdIZAPAAXT0em6O5n9yW/6ri937i0NWAvEErU=",
+        "narHash": "sha256-gLeUuU3hQ2ErboVIyzDNes2bywdTYDidvi6wG5+tnQ8=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "63ded1ffc0846c259f9cd0f62aa2ea9f7f804f56",
+        "rev": "4ec1bf4262e913af85e3f699f564769ec2f23cff",
         "type": "github"
       },
       "original": {
@@ -468,11 +468,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711523803,
+        "lastModified": 1711703276,
-        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
         "type": "github"
       },
       "original": {
@@ -516,12 +516,33 @@
         "type": "github"
       }
     },
+    "rmenu": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711942514,
+        "narHash": "sha256-bml15AL/xdMQnlB8d812ufoN049Pm96B9tmcLoyDhW0=",
+        "owner": "imgurbot12",
+        "repo": "rmenu",
+        "rev": "aed276b104e4fa67341ea88465f452df4c886d6d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "imgurbot12",
+        "repo": "rmenu",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "chaotic": "chaotic",
         "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs",
+        "rmenu": "rmenu",
         "swaymux": "swaymux"
       }
     },

flake.nix

@@ -21,9 +21,14 @@
       url = "git+https://git.grimmauld.de/Grimmauld/swaymux";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    rmenu = {
+      # url = "git+file:///home/grimmauld/rmenu";
+      url = "github:imgurbot12/rmenu";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs @ { self, swaymux, nix-gaming, agenix, nixpkgs, chaotic, ... }: let
+  outputs = inputs @ { self, swaymux, rmenu, nix-gaming, agenix, nixpkgs, chaotic, ... }: let
     system = "x86_64-linux";
   in {
     nixosConfigurations = {
@@ -33,7 +38,8 @@
         modules = [
           agenix.nixosModules.default
           chaotic.nixosModules.default
-          inputs.nix-gaming.nixosModules.pipewireLowLatency
+          nix-gaming.nixosModules.pipewireLowLatency
+          rmenu.nixosModules.default
           ./load_common.nix
           ./specific/grimm-nixos-laptop/configuration.nix
 

sway/bar/config

@@ -106,7 +106,7 @@
             "car": "",
             "default": ["", "", ""]
         },
-        "on-click": "pavucontrol"
+        "on-click": "pwvucontrol"
     },
     "custom/media": {
         "return-type": "json",

sway/sway-conf.nix

@@ -23,7 +23,7 @@ in {
         up = "k";
         right = "l";
         term = "alacritty";
-        menu = "dmenu_path | dmenu | xargs swaymsg exec --";
+        menu = "rmenu -r drun | xargs swaymsg exec --";
 
         primecol = "#8800FF";
         accentcol = "#5700a0";
@@ -161,6 +161,7 @@ input * {
 }
 
 for_window [app_id="swaymux"] floating enable
+for_window [app_id="rmenu"] floating enable
 
 mode "resize" {
     # left will shrink the containers width