Revert "fix(ghostty): add cairo wrapper and make it the default terminal"
This reverts commit 2e58a2d4ad.
This commit is contained in:
parent
2e58a2d4ad
commit
a59facdb0a
5 changed files with 8 additions and 17 deletions
|
|
@ -29,7 +29,7 @@ let
|
||||||
name = "com.mitchellh.ghostty";
|
name = "com.mitchellh.ghostty";
|
||||||
desktopName = "Terminal";
|
desktopName = "Terminal";
|
||||||
genericName = "Terminal Emulator";
|
genericName = "Terminal Emulator";
|
||||||
exec = "ghostty-cairo";
|
exec = "ghostty";
|
||||||
icon = "com.mitchellh.ghostty";
|
icon = "com.mitchellh.ghostty";
|
||||||
categories = [
|
categories = [
|
||||||
"System"
|
"System"
|
||||||
|
|
@ -37,7 +37,7 @@ let
|
||||||
"Utility"
|
"Utility"
|
||||||
];
|
];
|
||||||
terminal = false;
|
terminal = false;
|
||||||
comment = "Terminal (Cairo renderer fallback)";
|
comment = "Fast GPU-accelerated terminal";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ in
|
||||||
|
|
||||||
"org/gnome/shell/extensions/logo-menu" = {
|
"org/gnome/shell/extensions/logo-menu" = {
|
||||||
menu-button-icon-image = lib.gvariant.mkInt32 51;
|
menu-button-icon-image = lib.gvariant.mkInt32 51;
|
||||||
menu-button-terminal = "ghostty-cairo";
|
menu-button-terminal = "ghostty";
|
||||||
menu-button-system-monitor = "missioncenter";
|
menu-button-system-monitor = "missioncenter";
|
||||||
menu-button-extensions-app = "com.mattjakeman.ExtensionManager.desktop";
|
menu-button-extensions-app = "com.mattjakeman.ExtensionManager.desktop";
|
||||||
hide-softwarecentre = true;
|
hide-softwarecentre = true;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,5 @@
|
||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
ghosttyCairo = pkgs.writeShellScriptBin "ghostty-cairo" ''
|
|
||||||
export GSK_RENDERER=cairo
|
|
||||||
exec ghostty "$@"
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
# Baseline system tools available everywhere; users run Home Manager standalone.
|
# Baseline system tools available everywhere; users run Home Manager standalone.
|
||||||
config.environment.systemPackages = lib.mkAfter [
|
config.environment.systemPackages = lib.mkAfter [
|
||||||
|
|
@ -17,7 +11,6 @@ in
|
||||||
pkgs.fastfetch
|
pkgs.fastfetch
|
||||||
pkgs.flatpak
|
pkgs.flatpak
|
||||||
pkgs.ghostty
|
pkgs.ghostty
|
||||||
ghosttyCairo
|
|
||||||
pkgs.git
|
pkgs.git
|
||||||
pkgs.home-manager
|
pkgs.home-manager
|
||||||
pkgs.just
|
pkgs.just
|
||||||
|
|
|
||||||
|
|
@ -24,11 +24,9 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use Ghostty as the default terminal emulator.
|
# Use Ghostty as the default terminal emulator.
|
||||||
# On some machines Ghostty may fail to acquire an OpenGL context; `ghostty-cairo`
|
|
||||||
# forces GTK4's Cairo renderer (CPU) and is more hardware-agnostic.
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
TERMINAL = "ghostty-cairo";
|
TERMINAL = "${pkgs.ghostty}/bin/ghostty";
|
||||||
DEFAULT_TERMINAL = "ghostty-cairo";
|
DEFAULT_TERMINAL = "${pkgs.ghostty}/bin/ghostty";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
|
|
||||||
[no-cd]
|
[no-cd]
|
||||||
switch:
|
switch:
|
||||||
home-manager switch --flake ~/.config/home-manager#$USER
|
home-manager switch --flake ~/.config/home-manager#$USER
|
||||||
|
|
||||||
[no-cd]
|
[no-cd]
|
||||||
rebuild:
|
rebuild:
|
||||||
|
|
@ -111,8 +111,8 @@
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
# you can change the default terminal and editor here
|
# you can change the default terminal and editor here
|
||||||
TERMINAL = "ghostty-cairo";
|
TERMINAL = "${pkgs.ghostty}/bin/ghostty";
|
||||||
DEFAULT_TERMINAL = "ghostty-cairo";
|
DEFAULT_TERMINAL = "${pkgs.ghostty}/bin/ghostty";
|
||||||
EDITOR = "micro";
|
EDITOR = "micro";
|
||||||
DBX_CONTAINER_HOME_PREFIX = "$HOME/distrobox";
|
DBX_CONTAINER_HOME_PREFIX = "$HOME/distrobox";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue