From ac43ef6548b172bcc3c82540049048bb164c7332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Thu, 20 Jun 2024 16:47:58 +0200 Subject: [PATCH] More stuff for cranberry --- hm/brightness/default.nix | 13 +++++++++---- hm/desktop/audio/default.nix | 2 +- hm/extra.nix | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hm/brightness/default.nix b/hm/brightness/default.nix index 7b73fd8..34a0af2 100644 --- a/hm/brightness/default.nix +++ b/hm/brightness/default.nix @@ -6,10 +6,11 @@ let { command = "crepuscule"; specialisation = "dark"; } { command = "nuit"; specialisation = "dark"; } ]; + mod = config.xsession.windowManager.i3.config.modifier; in { config = { - home.packages = map + home.packages = (map (phase: (pkgs.writeShellScriptBin phase.command '' switch="/nix/var/nix/profiles/system${lib.strings.optionalString (phase.specialisation != null) "/specialisation/${phase.specialisation}"}/bin/switch-to-configuration" if [ -x "$switch" ] @@ -19,10 +20,14 @@ in fi ${builtins.getAttr phase.command config.frogeye.desktop.phasesCommands} '')) - phases; + phases) ++ (with pkgs; [ + brightnessctl + ]); xsession.windowManager.i3.config.keybindings = { - "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%"; - "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"; + XF86MonBrightnessUp = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%"; + XF86MonBrightnessDown = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"; + "${mod}+F6" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 1%-"; + "${mod}+F7" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +1%"; }; }; } diff --git a/hm/desktop/audio/default.nix b/hm/desktop/audio/default.nix index 1691540..8a27adb 100644 --- a/hm/desktop/audio/default.nix +++ b/hm/desktop/audio/default.nix @@ -29,7 +29,7 @@ in "XF86AudioRaiseVolume" = "${pactl} set-sink-mute @DEFAULT_SINK@ false; ${pactl} set-sink-volume @DEFAULT_SINK@ +5%"; "XF86AudioLowerVolume" = "${pactl} set-sink-mute @DEFAULT_SINK@ false; ${pactl} set-sink-volume @DEFAULT_SINK@ -5%"; "XF86AudioMute" = "${pactl} set-sink-mute @DEFAULT_SINK@ true"; - "${mod}+F7" = "${pactl} suspend-sink @DEFAULT_SINK@ 1; ${pactl} suspend-sink @DEFAULT_SINK@ 0"; # Re-synchronize bluetooth headset + "${mod}+F8" = "${pactl} suspend-sink @DEFAULT_SINK@ 1; ${pactl} suspend-sink @DEFAULT_SINK@ 0"; # Re-synchronize bluetooth headset "${mod}+F11" = "exec ${pkgs.pavucontrol}/bin/pavucontrol"; "${mod}+F12" = "exec ${pkgs.pavucontrol}/bin/pavucontrol"; # TODO Find pacmixer? diff --git a/hm/extra.nix b/hm/extra.nix index e520d33..d793f0e 100644 --- a/hm/extra.nix +++ b/hm/extra.nix @@ -41,11 +41,11 @@ ] ++ lib.optionals config.frogeye.desktop.xorg [ # multimedia editors - gimp - inkscape darktable puddletag audacity + xournalpp + krita # downloading transmission-qt