From 53c2b15454d74ed696a7164a3442f95ca2335ad8 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 16 Jul 2022 17:16:33 +0800 Subject: [PATCH] themes/a-happy-gnome: remove `terminal` option There's not much use for it since custom keyboard shortcuts are not possible to set as a system-wide config. This could easily be added into the list of packages so RIP... :( --- .../nixos/themes/a-happy-gnome/default.nix | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/modules/nixos/themes/a-happy-gnome/default.nix b/modules/nixos/themes/a-happy-gnome/default.nix index 4467eb68..12397fd3 100644 --- a/modules/nixos/themes/a-happy-gnome/default.nix +++ b/modules/nixos/themes/a-happy-gnome/default.nix @@ -3,7 +3,6 @@ let name = "a-happy-gnome"; cfg = config.themes.themes.a-happy-gnome; - terminalCommand = "${cfg.terminal}/bin/${cfg.terminal.meta.mainProgram or cfg.terminal.pname}"; enabledExtensions = pkgs.writeTextFile { name = "a-happy-gnome-extensions"; @@ -13,28 +12,10 @@ let ''; }; - miscConfig = pkgs.writeTextFile { - name = "a-happy-gnome-misc-config"; - text = '' - # Bringing my old habits back when I use standalone window managers. - [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] - binding='Return' - command='${terminalCommand}' - name='Terminal' - - # The equivalent to the newspaper in the morning. - [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1] - binding='r' - command='${terminalCommand} -e nix run nixpkgs#newsboat' - name='News aggregator' - ''; - }; - # We're combining all of the custom dconf database into a package to be installed. dconfConfig = pkgs.runCommand "install-a-happy-gnome-dconf-keyfiles" {} '' install -Dm644 ${./config/dconf}/*.conf -t $out/etc/dconf/db/${name}-conf.d install -Dm644 ${enabledExtensions} $out/etc/dconf/db/${name}-conf.d/enabled-extensions.conf - install -Dm644 ${miscConfig} $out/etc/dconf/db/${name}-conf.d/misc.conf ''; in { @@ -97,18 +78,6 @@ in ''; internal = true; }; - - terminal = lib.mkOption { - type = lib.types.package; - description = '' - The preferred terminal application. This will be used for several - keybindings that involves the terminal. - ''; - default = pkgs.wezterm; - defaultText = "pkgs.wezterm"; - example = lib.literalExpression "pkgs.kitty"; - internal = true; - }; }; config = lib.mkIf cfg.enable { @@ -176,9 +145,6 @@ in }; environment.systemPackages = with pkgs; [ - # The preferred terminal. - cfg.terminal - # The application menu. junction