From 0c8337c9e48fa1da85274a289055351d94ad49e5 Mon Sep 17 00:00:00 2001 From: Tigor Hutasuhut Date: Wed, 10 Jul 2024 14:49:12 +0700 Subject: [PATCH] wezterm: enabled for castle and fix configurations --- home/default.nix | 1 - home/programs/default.nix | 2 ++ home/{config => programs}/wezterm/default.nix | 2 +- home/{config => programs}/wezterm/keys.lua | 0 home/{config => programs}/wezterm/stylua.toml | 0 home/{config => programs}/wezterm/wezterm.lua | 5 +++-- options/programs.nix | 2 +- profiles/castle.nix | 1 + 8 files changed, 8 insertions(+), 5 deletions(-) rename home/{config => programs}/wezterm/default.nix (87%) rename home/{config => programs}/wezterm/keys.lua (100%) rename home/{config => programs}/wezterm/stylua.toml (100%) rename home/{config => programs}/wezterm/wezterm.lua (95%) diff --git a/home/default.nix b/home/default.nix index 6c53d2c..3d31e56 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,7 +10,6 @@ in ./programs ./modules - ./config/wezterm ./direnv.nix ./config/kitty ./config/ideavim diff --git a/home/programs/default.nix b/home/programs/default.nix index f98e3ba..2462ad8 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -26,6 +26,8 @@ ./whatsapp.nix ./zathura.nix ./zsh.nix + + ./wezterm ]; programs.fzf = { diff --git a/home/config/wezterm/default.nix b/home/programs/wezterm/default.nix similarity index 87% rename from home/config/wezterm/default.nix rename to home/programs/wezterm/default.nix index 456073a..c6673e7 100644 --- a/home/config/wezterm/default.nix +++ b/home/programs/wezterm/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: let - cfg = config.profile.wezterm; + cfg = config.profile.programs.wezterm; in { config = lib.mkIf cfg.enable { diff --git a/home/config/wezterm/keys.lua b/home/programs/wezterm/keys.lua similarity index 100% rename from home/config/wezterm/keys.lua rename to home/programs/wezterm/keys.lua diff --git a/home/config/wezterm/stylua.toml b/home/programs/wezterm/stylua.toml similarity index 100% rename from home/config/wezterm/stylua.toml rename to home/programs/wezterm/stylua.toml diff --git a/home/config/wezterm/wezterm.lua b/home/programs/wezterm/wezterm.lua similarity index 95% rename from home/config/wezterm/wezterm.lua rename to home/programs/wezterm/wezterm.lua index 2658df6..a4d530c 100644 --- a/home/config/wezterm/wezterm.lua +++ b/home/programs/wezterm/wezterm.lua @@ -3,6 +3,7 @@ local wezterm = require('wezterm') local shortcuts = require('keys') return { + enable_wayland = false, font = wezterm.font_with_fallback({ -- 'Comic Code Ligatures', 'JetBrainsMono Nerd Font Mono', @@ -21,8 +22,8 @@ return { ssh_domains = { { name = 'home', - remote_address = 'home', - username = 'tigor', + remote_address = 'vpn.tigor.web.id', + username = 'homeserver', ssh_option = { identityfile = wezterm.home_dir .. '/.ssh/id_ed25519.pub', }, diff --git a/options/programs.nix b/options/programs.nix index 555fb58..2db691b 100644 --- a/options/programs.nix +++ b/options/programs.nix @@ -32,7 +32,6 @@ obs.enable = lib.mkEnableOption "obs"; - wezterm.enable = lib.mkEnableOption "wezterm"; neovide.enable = lib.mkEnableOption "neovide"; ideavim.enable = lib.mkEnableOption "ideavim"; kitty.enable = lib.mkEnableOption "kitty"; @@ -83,6 +82,7 @@ default = true; }; easyeffects.enable = lib.mkEnableOption "easyeffects"; + wezterm.enable = lib.mkEnableOption "wezterm"; }; }; } diff --git a/profiles/castle.nix b/profiles/castle.nix index a70be08..3384ab4 100644 --- a/profiles/castle.nix +++ b/profiles/castle.nix @@ -81,5 +81,6 @@ in zathura.enable = true; }; programs.easyeffects.enable = true; + programs.wezterm.enable = true; }; }