more updates

This commit is contained in:
Noah Masur
2025-01-31 18:28:24 -05:00
parent e1f987e83b
commit f77f0c2fd6
5 changed files with 104 additions and 32 deletions

View File

@ -1,14 +1,19 @@
{ config, pkgs, ... }:
{
config,
pkgs,
lib,
...
}:
let
rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
rofi = config.programs.rofi.finalPackage;
in
{
# Adapted from:
# A rofi powered menu to execute brightness choices.
config.brightnessCommand = builtins.toString (
config.brightnessCommand = lib.mkIf config.nmasur.presets.programs.rofi.enable builtins.toString (
pkgs.writeShellScript "brightness" ''
dimmer="󰃝"
@ -19,7 +24,7 @@ in
"$dimmer" \
"$medium" \
"$brighter" \
| ${rofi}/bin/rofi \
| ${lib.getExe rofi} \
-theme-str '@import "brightness.rasi"' \
-hover-select \
-me-select-entry ''' \
@ -31,15 +36,15 @@ in
case "$chosen" in
"$dimmer")
${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 25
${lib.getExe pkgs.ddcutil} --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 25
;;
"$medium")
${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 75
${lib.getExe pkgs.ddcutil} --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 75
;;
"$brighter")
${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 100
${lib.getExe pkgs.ddcutil} --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 100
;;
*) exit 1 ;;

View File

@ -11,6 +11,11 @@ in
{
imports = [
./power.nix
./brightness.nix
];
options.nmasur.presets.programs.rofi.enable = lib.mkEnableOption "Rofi quick launcher";
config = lib.mkIf cfg.enable {

View File

@ -1,7 +1,12 @@
{ config, pkgs, ... }:
{
config,
pkgs,
lib,
...
}:
let
rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
rofi = config.programs.rofi.finalPackage;
in
{
@ -9,7 +14,7 @@ in
# https://gitlab.com/vahnrr/rofi-menus/-/blob/b1f0e8a676eda5552e27ef631b0d43e660b23b8e/scripts/rofi-power
# A rofi powered menu to execute power related action.
config.powerCommand = builtins.toString (
config.powerCommand = lib.mkIf config.nmasur.presets.programs.rofi.enable builtins.toString (
pkgs.writeShellScript "powermenu" ''
power_off=''
reboot=''
@ -23,7 +28,7 @@ in
"$lock" \
"$suspend" \
"$log_out" \
| ${rofi}/bin/rofi \
| ${lib.getExe rofi} \
-theme-str '@import "power.rasi"' \
-hover-select \
-me-select-entry "" \
@ -46,7 +51,7 @@ in
;;
"$lock")
${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span
${lib.getExe pkgs.betterlockscreen} --lock --display 1 --blur 0.5 --span
;;
"$suspend")