diff options
Diffstat (limited to 'home-manager/features/gui/desktops')
3 files changed, 10 insertions, 17 deletions
diff --git a/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix b/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix index 7a370f3..b5fbf86 100644 --- a/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix +++ b/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix @@ -3,7 +3,9 @@ pkgs, lib, ... -}: { +}: let + defaultTerminal = config.default-applications.terminal-emulator; +in { config = lib.mkIf config.features.gui.desktops.niri.parts.niri.enable { programs.niri.settings.binds = let left = "h"; @@ -15,7 +17,7 @@ "Mod+Q".action.spawn = ["foot"]; "Mod+W".action.spawn = ["librewolf"]; "Mod+E".action.spawn = ["neovide"]; - "Mod+Shift+E".action.spawn = ["neovide" "--" "-c" "Calendar"]; + "Mod+Shift+E".action.spawn = [ defaultTerminal.runTuiCommand "ikhal"]; "Mod+N".action.spawn = ["scrap-maker"]; # Reboot to gaming OS diff --git a/home-manager/features/gui/desktops/niri/parts/selectors.nix b/home-manager/features/gui/desktops/niri/parts/selectors.nix index dd09dde..8cfc087 100644 --- a/home-manager/features/gui/desktops/niri/parts/selectors.nix +++ b/home-manager/features/gui/desktops/niri/parts/selectors.nix @@ -6,6 +6,7 @@ }: let cfg = config.features.gui.desktops.niri.parts.selectors; aes = config.aesthetics; + defaultTerminal = config.default-applications.terminal-emulator; in { options.features.gui.desktops.niri.parts.selectors.enable = lib.mkEnableOption "selectors"; config = lib.mkIf cfg.enable { @@ -25,20 +26,20 @@ in { let tools = { "rebuild nixos": { # footclient -H sudo nixos-rebuild switch --flake ($"~/Sync/setup#(hostname)" | path expand) - foot -H os-rebuild-loop + ${defaultTerminal.runCliCommand} os-rebuild-loop } "rebuild home": { # foot -H home-manager switch --flake ($"~/Sync/setup#(whoami)@(hostname)" | path expand) - foot -H home-rebuild-loop + ${defaultTerminal.runCliCommand} home-rebuild-loop } "update flake": { - foot -H nix flake update --flake ($"~/Sync/setup/" | path expand) + ${defaultTerminal.runCliCommand} nix flake update --flake ($"~/Sync/setup/" | path expand) } "manage wifi": { - foot ${pkgs.impala}/bin/impala + ${defaultTerminal.runTuiCommand} ${pkgs.impala}/bin/impala } "manage bluetooth": { - foot ${lib.getExe pkgs.bluetui} + ${defaultTerminal.runTuiCommand} ${lib.getExe pkgs.bluetui} } "manage displays": { ${lib.getExe wdisplays} diff --git a/home-manager/features/gui/desktops/niri/parts/swayosd.nix b/home-manager/features/gui/desktops/niri/parts/swayosd.nix index 6cba218..e43b5b2 100644 --- a/home-manager/features/gui/desktops/niri/parts/swayosd.nix +++ b/home-manager/features/gui/desktops/niri/parts/swayosd.nix @@ -6,20 +6,10 @@ }: let cfg = config.features.gui.desktops.niri.parts.swayosd; aes = config.aesthetics; - - swayosd-patched = pkgs.swayosd.overrideAttrs (old: { - postInstall = '' - mkdir -p $out/share/dbus-1/services - mv $out/share/dbus-1/system-services/org.erikreider.swayosd.service \ - $out/share/dbus-1/services/org.erikreider.swayosd.service - rm -r $out/share/dbus-1/system* - ''; - }); in { options.features.gui.desktops.niri.parts.swayosd.enable = lib.mkEnableOption "swayosd"; config = lib.mkIf cfg.enable { home.packages = [ pkgs.swayosd ]; - dbus.packages = [ swayosd-patched ]; services.swayosd = { enable = true; topMargin = 0.5; |