diff --git a/core/hosts/hades/default.nix b/core/hosts/hades/default.nix index 8356825..b4eeda7 100755 --- a/core/hosts/hades/default.nix +++ b/core/hosts/hades/default.nix @@ -49,8 +49,22 @@ hardware = { - ## Enable bluetooth inside Hades - bluetooth.enable = true; + ## Bluetooth settings for Hades + ## Also see line 100 for blueman service, + ## and home/desktop/waybar.nix for tray applet. + bluetooth = { + enable = true; + ## Turns the bluetooth adapter on at boot + powerOnBoot = true; + settings.General = { + ## Displays battery charge of connected devices + Experimental = true; + ## Uses more power, but hades is a desktop + FastConnectable = true; + }; + ## To fix bluetooth keyboard input + input.General = { UserspaceHID = true; }; + }; ## GPU and graphics graphics = { @@ -81,7 +95,12 @@ }; }; - services = { xserver.videoDrivers = [ "amdgpu" ]; }; + services = { + ## Enables bluetooth service + blueman.enable = true; + ## Sets X to use amdgpy drivers + xserver.videoDrivers = [ "amdgpu" ]; + }; programs = { ## For tweaking system performance diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix index 867a0bd..df84fc5 100755 --- a/home/desktop/waybar.nix +++ b/home/desktop/waybar.nix @@ -1,11 +1,15 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, config, ... }: - home = { - packages = with pkgs; [ waybar ]; - }; +{ + + home = { packages = with pkgs; [ waybar ]; }; services = { - blueman-applet.enable = false; + ## Enables bluetooth tray applet + ## See core/hosts/${hostname}/default.nix for bluetooth config + blueman-applet.enable = true; + ## Enables networking tray applet + ## See core/hosts/${hostname}/network.nix for network config network-manager-applet.enable = true; }; @@ -24,7 +28,7 @@ height = 44; modules-left = [ "custom/logo" "sway/window" ]; modules-center = [ "sway/workspaces" ]; - modules-right = [ "tray" "backlight" "pulseaudio" "battery" "clock" "custom/power" ]; + modules-right = [ "tray" "backlight" "clock" "battery" "custom/power" ]; "wlr/taskbar" = { format = "{icon}"; @@ -58,6 +62,7 @@ "urgent" = "󱓻"; }; "persistent-workspaces" = { + "0" = [ ]; "1" = [ ]; "2" = [ ]; "3" = [ ];