From 2c9af56ff70fd3496d6b923076d65fbee3a21f92 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 4 Jan 2025 14:08:34 +0000 Subject: [PATCH] t490: set ghostty as the default terminal --- nix/home/opdavies/hosts/t490.nix | 1 + nix/lib/shared/home-manager.nix | 3 ++- nix/modules/nixos/i3.nix | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nix/home/opdavies/hosts/t490.nix b/nix/home/opdavies/hosts/t490.nix index c253023..a0e3faf 100644 --- a/nix/home/opdavies/hosts/t490.nix +++ b/nix/home/opdavies/hosts/t490.nix @@ -12,6 +12,7 @@ discord.enable = true; espanso.enable = true; flameshot.enable = true; + ghostty.enable = true; gtk.enable = true; slack.enable = true; diff --git a/nix/lib/shared/home-manager.nix b/nix/lib/shared/home-manager.nix index 0cae366..5cce1b8 100644 --- a/nix/lib/shared/home-manager.nix +++ b/nix/lib/shared/home-manager.nix @@ -37,7 +37,8 @@ }; desktop = { - alacritty.enable = lib.mkDefault true; + alacritty.enable = lib.mkDefault false; + ghostty.enable = lib.mkDefault true; }; } ]; diff --git a/nix/modules/nixos/i3.nix b/nix/modules/nixos/i3.nix index 19aba38..095078c 100644 --- a/nix/modules/nixos/i3.nix +++ b/nix/modules/nixos/i3.nix @@ -91,13 +91,14 @@ in "XF86AudioRaiseVolume" = "exec pamixer -ui 2 && pamixer --get-volume"; "XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume"; - "XF86AudioMute" = ''exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0''; + "XF86AudioMute" = + ''exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0''; "XF86MonBrightnessDown" = "exec brightnessctl set 5%- | sed -En 's/.*(([0-9]+)%).*/1/p'"; "XF86MonBrightnessUp" = "exec brightnessctl set +5% | sed -En 's/.*(([0-9]+)%).*/1/p'"; }; - terminal = "alacritty"; + terminal = "ghostty"; }; extraConfig = ''