home: terminal: rename 'default'
It doesn't make the *most* sense as an option name to use `program`.
This commit is contained in:
parent
d4668416af
commit
8b028ce19f
8 changed files with 13 additions and 13 deletions
|
|
@ -25,7 +25,7 @@
|
|||
# Network-Manager applet
|
||||
nm-applet.enable = true;
|
||||
# Terminal
|
||||
terminal.program = "alacritty";
|
||||
terminal.default = "alacritty";
|
||||
# Transmission remote
|
||||
trgui.enable = true;
|
||||
# Zathura document viewer
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
cfg = config.my.home.firefox.tridactyl;
|
||||
|
||||
term = config.my.home.terminal.program;
|
||||
term = config.my.home.terminal.default;
|
||||
|
||||
vimCommandLine = {
|
||||
alacritty = ''-e "vim" "%f" "+normal!%lGzv%c|"'';
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let
|
|||
inherit (config.my.home.terminal) colors;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (cfg.program == "alacritty") {
|
||||
config = lib.mkIf (cfg.default == "alacritty") {
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ in
|
|||
|
||||
options.my.home = with lib; {
|
||||
terminal = {
|
||||
program = mkOption {
|
||||
default = mkOption {
|
||||
type = with types; nullOr (enum [ "alacritty" "termite" ]);
|
||||
default = null;
|
||||
example = "termite";
|
||||
description = "Which terminal to use for home session";
|
||||
description = "Which default terminal to use for home session";
|
||||
};
|
||||
|
||||
colors = {
|
||||
|
|
@ -56,7 +56,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
config.home.sessionVariables = lib.mkIf (cfg.program != null) {
|
||||
TERMINAL = cfg.program;
|
||||
config.home.sessionVariables = lib.mkIf (cfg.default != null) {
|
||||
TERMINAL = cfg.default;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let
|
|||
inherit (config.my.home.terminal) colors;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (cfg.program == "termite") {
|
||||
config = lib.mkIf (cfg.default == "termite") {
|
||||
programs.termite = {
|
||||
enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ in
|
|||
};
|
||||
});
|
||||
|
||||
default = { ${config.my.home.terminal.program} = { }; };
|
||||
default = { ${config.my.home.terminal.default} = { }; };
|
||||
defaultText = literalExpression ''
|
||||
{ ''${config.my.home.terminal.program} = { }; };
|
||||
{ ''${config.my.home.terminal.default} = { }; };
|
||||
'';
|
||||
example = { xterm-256color = { }; };
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ let
|
|||
isEnabled = config.my.home.wm.windowManager == "i3";
|
||||
|
||||
terminal =
|
||||
if config.my.home.terminal.program != null
|
||||
then config.my.home.terminal.program
|
||||
if config.my.home.terminal.default != null
|
||||
then config.my.home.terminal.default
|
||||
else "i3-sensible-terminal";
|
||||
|
||||
alt = "Mod1"; # `Alt` key
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ in
|
|||
programs.rofi = {
|
||||
enable = true;
|
||||
|
||||
terminal = config.my.home.terminal.program; # null by default
|
||||
terminal = config.my.home.terminal.default; # null by default
|
||||
|
||||
package = pkgs.rofi.override {
|
||||
plugins = with pkgs; [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue