From 0e7d67ed456bdf9f47d57d87cb1e71c18f648d30 Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Fri, 26 Jan 2024 23:25:14 -0700 Subject: [PATCH] Launch pulsemixer in a terminal --- common/users/cameron/home-manager/options.nix | 15 +++++++++++++++ common/users/cameron/home-manager/waybar.nix | 4 ++-- common/users/cameron/home.nix | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 common/users/cameron/home-manager/options.nix diff --git a/common/users/cameron/home-manager/options.nix b/common/users/cameron/home-manager/options.nix new file mode 100644 index 0000000..1f2a1e1 --- /dev/null +++ b/common/users/cameron/home-manager/options.nix @@ -0,0 +1,15 @@ +{ lib, pkgs, ... }: + +with lib; { + options = { + defaultTerminal = mkOption { + default = "kitty"; + type = types.str; + }; + + terminal = mkOption { + default = "${pkgs.kitty}/bin/kitty"; + type = types.path; + }; + }; +} diff --git a/common/users/cameron/home-manager/waybar.nix b/common/users/cameron/home-manager/waybar.nix index 4a68239..aee47e2 100644 --- a/common/users/cameron/home-manager/waybar.nix +++ b/common/users/cameron/home-manager/waybar.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, osConfig, ... }: +{ pkgs, lib, config, osConfig, ... }: { config = lib.mkIf (builtins.elem "hyprland" osConfig.desktop || builtins.elem "sway" osConfig.desktop) @@ -129,7 +129,7 @@ car = ""; default = ["" "" ""]; }; - on-click = "pulsemixer"; + on-click = "${config.terminal} pulsemixer"; }; }; diff --git a/common/users/cameron/home.nix b/common/users/cameron/home.nix index 47f2fce..83cc613 100644 --- a/common/users/cameron/home.nix +++ b/common/users/cameron/home.nix @@ -2,6 +2,8 @@ { imports = [ + ./home-manager/options.nix + ./home-manager/sway.nix ./home-manager/hyprland.nix