-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove individual temrinal options and configure them using programs.…
… Also define a defualt one for shortcuts and etc.
- Loading branch information
Showing
8 changed files
with
139 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,34 @@ | ||
| { | ||
| lib, | ||
| config, | ||
| ... | ||
| }: | ||
| { | ||
| options.terminals.alacritty.enable = lib.mkEnableOption "Enable alacritty config"; | ||
|
|
||
| config = lib.mkIf config.terminals.alacritty.enable { | ||
| programs.alacritty = { | ||
| enable = true; | ||
| settings = { | ||
| terminal.shell = { | ||
| program = config.shell.main; | ||
| }; | ||
| window = { | ||
| decorations = "full"; | ||
| dimensions = { | ||
| columns = config.terminals.width; | ||
| lines = config.terminals.height; | ||
| }; | ||
| # opacity = 1; | ||
| # blur = true; | ||
| programs.alacritty = { | ||
| settings = { | ||
| terminal.shell = { | ||
| program = config.shell.main; | ||
| }; | ||
| window = { | ||
| decorations = "full"; | ||
| dimensions = { | ||
| columns = config.terminals.width; | ||
| lines = config.terminals.height; | ||
| }; | ||
| # font = { | ||
| # size = 12; | ||
| # offset = { | ||
| # y = 0; | ||
| # x = 0; | ||
| # }; | ||
| # glyph_offset = { | ||
| # y = 0; | ||
| # x = 0; | ||
| # }; | ||
| # }; | ||
| # opacity = 1; | ||
| # blur = true; | ||
| }; | ||
| # font = { | ||
| # size = 12; | ||
| # offset = { | ||
| # y = 0; | ||
| # x = 0; | ||
| # }; | ||
| # glyph_offset = { | ||
| # y = 0; | ||
| # x = 0; | ||
| # }; | ||
| # }; | ||
| }; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,39 @@ | ||
| { | ||
| config, | ||
| lib, | ||
| pkgs, | ||
| inputs, | ||
| osConfig, | ||
| # lib, | ||
| # pkgs, | ||
| # inputs, | ||
| ... | ||
| }@args: | ||
| { | ||
| options.terminals.wezterm.enable = lib.mkEnableOption "Enable wezterm terminal"; | ||
|
|
||
| config = lib.mkIf config.terminals.wezterm.enable { | ||
| programs.wezterm = { | ||
| enable = true; | ||
| enableZshIntegration = config.programs.zsh.enable; | ||
| extraConfig = '' | ||
| local wezterm = require 'wezterm' | ||
| local config = {} | ||
| config.audible_bell = "Disabled" | ||
| config.enable_wayland = false | ||
| -- config.front_end = "WebGpu" | ||
| -- config.enable_wayland = true | ||
| config.front_end = "${ | ||
| # if ((args ? nixosConfig) && (!osConfig.hosts.nvidia.enable)) then "OpenGL" else "WebGpu" | ||
| if ((args ? nixosConfig) && (osConfig.networking.hostName == "madara")) then "OpenGL" else "WebGpu" | ||
| }" | ||
| config.hide_tab_bar_if_only_one_tab = true | ||
| -- config.window_decorations = 'TITLE | RESIZE' | ||
| config.window_decorations = 'RESIZE' | ||
| config.initial_rows = ${builtins.toString config.terminals.height} | ||
| config.initial_cols = ${builtins.toString config.terminals.width} | ||
| config.warn_about_missing_glyphs = false | ||
| return config | ||
| ''; | ||
| }; | ||
| # // lib.optionalAttrs (args ? nixosConfig) { | ||
| # package = | ||
| # if osConfig.hosts.nvidia.enable then | ||
| # inputs.wezterm.packages.${pkgs.system}.default | ||
| # else | ||
| # pkgs.wezterm; | ||
| # }; | ||
| programs.wezterm = { | ||
| enableZshIntegration = config.programs.zsh.enable; | ||
| extraConfig = '' | ||
| local wezterm = require 'wezterm' | ||
| local config = {} | ||
| config.audible_bell = "Disabled" | ||
| config.enable_wayland = false | ||
| -- config.front_end = "WebGpu" | ||
| -- config.enable_wayland = true | ||
| config.front_end = "${ | ||
| # if ((args ? nixosConfig) && (!osConfig.hosts.nvidia.enable)) then "OpenGL" else "WebGpu" | ||
| if ((args ? nixosConfig) && (osConfig.networking.hostName == "madara")) then "OpenGL" else "WebGpu" | ||
| }" | ||
| config.hide_tab_bar_if_only_one_tab = true | ||
| -- config.window_decorations = 'TITLE | RESIZE' | ||
| config.window_decorations = 'RESIZE' | ||
| config.initial_rows = ${builtins.toString config.terminals.height} | ||
| config.initial_cols = ${builtins.toString config.terminals.width} | ||
| config.warn_about_missing_glyphs = false | ||
| return config | ||
| ''; | ||
| }; | ||
| # // lib.optionalAttrs (args ? nixosConfig) { | ||
| # package = | ||
| # if osConfig.hosts.nvidia.enable then | ||
| # inputs.wezterm.packages.${pkgs.system}.default | ||
| # else | ||
| # pkgs.wezterm; | ||
| # }; | ||
| } |