diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc index efd5169..6a2ffe0 100644 --- a/configs/waybar/config.jsonc +++ b/configs/waybar/config.jsonc @@ -10,9 +10,8 @@ "group/hardware" ], "modules-right": [ - // "backlight", - // "pulseaudio", - "battery" + "group/sound", + "group/right-side" ], "hyprland/workspaces": { "format": "{icon}", @@ -61,6 +60,11 @@ "scroll-step": 1, "on-click": "pavucontrol" }, + "pulseaudio/slider": { + "min": 0, + "max": 100, + "orientation": "horizontal" + }, "network": { "format": "{ifname}", "format-wifi": "{essid}", @@ -69,6 +73,29 @@ "tooltip": false, "on-click": "nm-connection-editor" }, + "group/sound": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "transition-left-to-right": false + }, + "modules": [ + "pulseaudio", + "pulseaudio/slider" + ] + }, + "group/right-side": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "transition-left-to-right": false + }, + "modules": [ + "battery", + "backlight", + "custom/quit" + ] + }, "battery": { "states": { "warning": 30, @@ -98,6 +125,9 @@ "temperature" ] }, + "bluetooth": { + "on-click": "blueman-manager" + }, "cpu": { "interval": 1, "format": "{icon}cpu", diff --git a/configs/waybar/style.css b/configs/waybar/style.css index d2ba667..aadb088 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -4,7 +4,7 @@ font-family: 'Fira Code', 'Symbols Nerd Font Mono'; font-size: 16px; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; - min-height: 25px; + /* min-height: 25px; */ } window#waybar { @@ -35,3 +35,19 @@ widget > * { margin-left: 10px; } +#pulseaudio-slider scale { + padding: 0; +} +/* #pulseaudio-slider scale contents { + min-height: 0px; +} */ +#pulseaudio-slider trough { + background-color: #cdd6f4; +} +#pulseaudio-slider highlight { + background-color: green; + min-height: 16px; +} +#pulseaudio-slider trough, #backlight-slider trough { + min-width: 100px; +} diff --git a/modules/os/services.nix b/modules/os/services.nix index db176ce..855347a 100644 --- a/modules/os/services.nix +++ b/modules/os/services.nix @@ -10,17 +10,45 @@ }; # Advance Power Management + powerManagement.powertop.enable = true; + powerManagement.enable = true; + services.thermald.enable = true; services.power-profiles-daemon.enable = false; services.tlp = { enable = true; settings = { + TLP_DEFAULT_MODE = "BAT"; + TLP_PERSISTENT_DEFAULT = 1; + CPU_BOOST_ON_BAT = 0; - CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave"; - START_CHARGE_THRESH_BAT0 = 90; - STOP_CHARGE_THRESH_BAT0 = 97; RUNTIME_PM_ON_BAT = "auto"; PLATFORM_PROFILE_ON_AC = "balanced"; PLATFORM_PROFILE_ON_BAT = "low-power"; + + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 20; + + START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge + STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging + }; + }; + services.auto-cpufreq.enable = true; + services.auto-cpufreq.settings = { + battery = { + governor = "powersave"; + turbo = "never"; + }; + charger = { + governor = "performance"; + turbo = "auto"; }; }; @@ -37,6 +65,11 @@ # Enable CUPS to print documents. services.printing.enable = true; + # enables support for Bluetooth + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + services.blueman.enable = true; + # Yubikey services.yubikey-agent.enable = true;