mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-26 07:15:37 +00:00
replace kitty with wezterm on linux (tempest)
This commit is contained in:
parent
cf19085158
commit
2f39eb2ceb
@ -112,6 +112,7 @@ inputs.nixpkgs.lib.nixosSystem {
|
|||||||
mullvad.enable = false;
|
mullvad.enable = false;
|
||||||
rust.enable = true;
|
rust.enable = true;
|
||||||
terraform.enable = true;
|
terraform.enable = true;
|
||||||
|
wezterm.enable = true;
|
||||||
yt-dlp.enable = true;
|
yt-dlp.enable = true;
|
||||||
gaming = {
|
gaming = {
|
||||||
dwarf-fortress.enable = true;
|
dwarf-fortress.enable = true;
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
environment =
|
environment =
|
||||||
{ }
|
{ }
|
||||||
// lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
|
// lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
|
||||||
sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
|
sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
@ -31,7 +31,7 @@
|
|||||||
xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
|
xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
|
||||||
|
|
||||||
# Set the Rofi terminal for running programs
|
# Set the Rofi terminal for running programs
|
||||||
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
|
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
|
||||||
|
|
||||||
# Display images in the terminal
|
# Display images in the terminal
|
||||||
programs.fish.shellAliases = {
|
programs.fish.shellAliases = {
|
||||||
|
@ -15,7 +15,11 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf (config.gui.enable && config.wezterm.enable) {
|
config =
|
||||||
|
let
|
||||||
|
font = config.home-manager.users.${config.user}.programs.kitty.font.name;
|
||||||
|
in
|
||||||
|
lib.mkIf (config.gui.enable && config.wezterm.enable) {
|
||||||
|
|
||||||
# Set the Rofi-Systemd terminal for viewing logs
|
# Set the Rofi-Systemd terminal for viewing logs
|
||||||
# Using optionalAttrs because only available in NixOS
|
# Using optionalAttrs because only available in NixOS
|
||||||
@ -112,13 +116,13 @@
|
|||||||
bottom = 0,
|
bottom = 0,
|
||||||
},
|
},
|
||||||
|
|
||||||
font = wezterm.font 'VictorMono Nerd Font',
|
font = wezterm.font '${font}',
|
||||||
font_size = 18.0,
|
font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
|
||||||
|
|
||||||
-- Tab Bar
|
-- Tab Bar
|
||||||
window_frame = {
|
window_frame = {
|
||||||
font = wezterm.font 'VictorMono Nerd Font',
|
font = wezterm.font 'VictorMono Nerd Font',
|
||||||
font_size = 16.0,
|
font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
|
||||||
},
|
},
|
||||||
|
|
||||||
colors = {
|
colors = {
|
||||||
|
@ -9,6 +9,7 @@ let
|
|||||||
|
|
||||||
lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
|
lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
|
||||||
lockUpdate = "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
|
lockUpdate = "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
|
||||||
|
terminal = "wezterm";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -47,9 +48,10 @@ in
|
|||||||
assigns = {
|
assigns = {
|
||||||
"${ws1}" = [ { class = "Firefox"; } ];
|
"${ws1}" = [ { class = "Firefox"; } ];
|
||||||
"${ws2}" = [
|
"${ws2}" = [
|
||||||
{ class = "kitty"; }
|
|
||||||
{ class = "aerc"; }
|
{ class = "aerc"; }
|
||||||
|
{ class = "kitty"; }
|
||||||
{ class = "obsidian"; }
|
{ class = "obsidian"; }
|
||||||
|
{ class = "wezterm"; }
|
||||||
];
|
];
|
||||||
"${ws3}" = [ { class = "discord"; } ];
|
"${ws3}" = [ { class = "discord"; } ];
|
||||||
"${ws4}" = [
|
"${ws4}" = [
|
||||||
@ -126,7 +128,9 @@ in
|
|||||||
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||||
|
|
||||||
# Launchers
|
# Launchers
|
||||||
"${modifier}+Return" = "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
|
"${modifier}+Return" = "exec --no-startup-id ${
|
||||||
|
config.home-manager.users.${config.user}.programs.rofi.terminal
|
||||||
|
}; workspace ${ws2}; layout tabbed";
|
||||||
"${modifier}+space" = "exec --no-startup-id ${config.launcherCommand}";
|
"${modifier}+space" = "exec --no-startup-id ${config.launcherCommand}";
|
||||||
"${modifier}+Shift+s" = "exec --no-startup-id ${config.systemdSearch}";
|
"${modifier}+Shift+s" = "exec --no-startup-id ${config.systemdSearch}";
|
||||||
"${modifier}+Shift+a" = "exec --no-startup-id ${config.audioSwitchCommand}";
|
"${modifier}+Shift+a" = "exec --no-startup-id ${config.audioSwitchCommand}";
|
||||||
@ -138,8 +142,12 @@ in
|
|||||||
"${modifier}+Shift+r" = "restart";
|
"${modifier}+Shift+r" = "restart";
|
||||||
"${modifier}+Shift+q" = ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
|
"${modifier}+Shift+q" = ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
|
||||||
"${modifier}+Shift+x" = "exec ${lockCmd}";
|
"${modifier}+Shift+x" = "exec ${lockCmd}";
|
||||||
"${modifier}+Mod1+h" = "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
|
"${modifier}+Mod1+h" = "exec --no-startup-id ${
|
||||||
"${modifier}+Mod1+r" = "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
|
config.home-manager.users.${config.user}.programs.rofi.terminal
|
||||||
|
} -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
|
||||||
|
"${modifier}+Mod1+r" = "exec --no-startup-id ${
|
||||||
|
config.home-manager.users.${config.user}.programs.rofi.terminal
|
||||||
|
} -e sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
|
||||||
|
|
||||||
# Window options
|
# Window options
|
||||||
"${modifier}+q" = "kill";
|
"${modifier}+q" = "kill";
|
||||||
|
@ -18,9 +18,6 @@ in
|
|||||||
|
|
||||||
config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
|
config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
|
||||||
|
|
||||||
# Set the Rofi-Systemd terminal for viewing logs
|
|
||||||
environment.sessionVariables.ROFI_SYSTEMD_TERM = lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
|
|
||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
Loading…
Reference in New Issue
Block a user