diff --git a/modules/connectivity/bluetooth/default.nix b/modules/connectivity/bluetooth/default.nix new file mode 100644 index 0000000..a3e3df6 --- /dev/null +++ b/modules/connectivity/bluetooth/default.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + options = { + bluetooth = { + enable = lib.mkEnableOption "enable bluetooth"; + }; + }; + config = lib.mkIf config.bluetooth.enable { + home.packages = with pkgs; [ + bluez + bluetuith + ]; + }; +} diff --git a/modules/internet/browser/default.nix b/modules/connectivity/browser/default.nix similarity index 100% rename from modules/internet/browser/default.nix rename to modules/connectivity/browser/default.nix diff --git a/modules/internet/browser/librewolf.nix b/modules/connectivity/browser/librewolf.nix similarity index 100% rename from modules/internet/browser/librewolf.nix rename to modules/connectivity/browser/librewolf.nix diff --git a/modules/internet/browser/zen-browser.nix b/modules/connectivity/browser/zen-browser.nix similarity index 100% rename from modules/internet/browser/zen-browser.nix rename to modules/connectivity/browser/zen-browser.nix diff --git a/modules/internet/default.nix b/modules/connectivity/default.nix similarity index 82% rename from modules/internet/default.nix rename to modules/connectivity/default.nix index bc5b7cb..0e25115 100644 --- a/modules/internet/default.nix +++ b/modules/connectivity/default.nix @@ -8,6 +8,6 @@ { imports = [ ./browser - + ./bluetooth ]; } diff --git a/modules/default.nix b/modules/default.nix index 477ac19..6347ec1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,7 +13,7 @@ ./desktop ./misc ./gaming - ./internet + ./connectivity ./media ]; } diff --git a/modules/defaults/desktop.nix b/modules/defaults/desktop.nix index 9d2038f..2b5f8fc 100644 --- a/modules/defaults/desktop.nix +++ b/modules/defaults/desktop.nix @@ -23,6 +23,7 @@ walker.enable = true; wallpaper.enable = true; grimblast.enable = true; + audio.enable = true; }; internet = lib.mkDefault { browsers = { @@ -31,6 +32,7 @@ }; }; }; + bluetooth.enable = true; media = { images.enable = true; video.enable = true; diff --git a/modules/defaults/laptop.nix b/modules/defaults/laptop.nix index 8b8355d..64c659f 100644 --- a/modules/defaults/laptop.nix +++ b/modules/defaults/laptop.nix @@ -25,6 +25,7 @@ walker.enable = true; wallpaper.enable = true; grimblast.enable = true; + audio.enable = true; }; internet = lib.mkDefault { browsers = { @@ -33,6 +34,7 @@ }; }; }; + bluetooth.enable = true; media = { images.nomacs.enable = true; video.mpv.enable = true; diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix index 30e5b08..e58e072 100644 --- a/modules/desktop/audio.nix +++ b/modules/desktop/audio.nix @@ -16,6 +16,7 @@ config = lib.mkIf config.desktop.audio.enable { home.packages = with pkgs; [ pavucontrol + playerctl ]; }; } diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 67971b8..aa22821 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -13,6 +13,7 @@ ./rofi.nix ./wallpaper.nix ./grimblast.nix + ./audio.nix ]; home.packages = with pkgs; [ wl-clipboard diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index c627fa0..5532232 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -119,11 +119,9 @@ "$mod, mouse:272, movewindow" "$mod, mouse:273, resizewindow" ]; - binde = [ + bindel = [ ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" - ]; - bindl = [ - ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ]; input = { kb_layout = "de";