From 605695e41b0a6c4ba77235e12bfee33cff1604d7 Mon Sep 17 00:00:00 2001
From: soraefir <github@helcel.net>
Date: Thu, 10 Sep 2026 23:53:36 +0200
Subject: [PATCH] Tweaks

---
 flake.lock                               | 45 +-----------------------
 flake.nix                                |  5 ---
 modules/home/wayland/hyprland/config.nix |  7 ++--
 3 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/flake.lock b/flake.lock
index 08f76c8..94dd210 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,27 +54,6 @@
       }
     },
     "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
@@ -246,27 +225,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1788454318,
-        "narHash": "sha256-V5n7WPkYZdGIeLWuWBStoNQoVJ6TWjwjL5Fr9Oo58Kg=",
-        "owner": "nix-community",
-        "repo": "nur",
-        "rev": "6b6a6dcd145617dbfae7d69f98cecca52e6d5e8d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nur",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "darwin": "darwin",
@@ -276,7 +234,6 @@
         "nixUnstable": "nixUnstable",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2",
-        "nur": "nur",
         "sops-nix": "sops-nix",
         "vscode-server": "vscode-server"
       }
@@ -303,7 +260,7 @@
     },
     "vscode-server": {
       "inputs": {
-        "flake-parts": "flake-parts_2"
+        "flake-parts": "flake-parts"
       },
       "locked": {
         "lastModified": 1784312229,
diff --git a/flake.nix b/flake.nix
index 8f78a00..65007f4 100755
--- a/flake.nix
+++ b/flake.nix
@@ -5,11 +5,6 @@
     nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     hardware.url = "github:nixos/nixos-hardware";
-    nur = {
-      url = "github:nix-community/nur";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     home-manager = {
       url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/home/wayland/hyprland/config.nix b/modules/home/wayland/hyprland/config.nix
index 9412ad3..7ffd466 100644
--- a/modules/home/wayland/hyprland/config.nix
+++ b/modules/home/wayland/hyprland/config.nix
@@ -303,9 +303,10 @@ in {
           (bind "XF86AudioPlay" (dsp.exec "${lib.getExe pkgs.playerctl} play-pause"))
           (bind "XF86AudioPrev" (dsp.exec "${lib.getExe pkgs.playerctl} previous"))
           (bind "XF86AudioNext" (dsp.exec "${lib.getExe pkgs.playerctl} next"))
-          (bindOpts "XF86AudioRaiseVolume" (dsp.exec "amixer -q sset 'Master' 5%+") { locked = true; repeating = true; })
-          (bindOpts "XF86AudioLowerVolume" (dsp.exec "amixer -q sset 'Master' 5%-") { locked = true; repeating = true; })
-          (bindOpts "XF86AudioMute" (dsp.exec "amixer -q sset 'Master' toggle") { locked = true; })
+          (bindOpts "XF86AudioRaiseVolume" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+") { locked = true; repeating = true; })
+          (bindOpts "XF86AudioLowerVolume" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") { locked = true; repeating = true; })
+          (bindOpts "XF86AudioMute" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle") { locked = true; })
+          (bindOpts "XF86AudioMicMute" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle") { locked = true; })
           (bindOpts "XF86MonBrightnessUp" (dsp.exec "${lib.getExe pkgs.brightnessctl} s 5%+") { locked = true; repeating = true; })
           (bindOpts "XF86MonBrightnessDown" (dsp.exec "${lib.getExe pkgs.brightnessctl} s 5%-") { locked = true; repeating = true; })
           (bindOpts "SUPER + mouse:272" dsp.drag { mouse = true; })