diff --git a/flake.nix b/flake.nix index b5c881b..3da06bf 100644 --- a/flake.nix +++ b/flake.nix @@ -26,12 +26,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Terminal Emulator - wezterm = { - url = "github:wez/wezterm/main?dir=nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # Our personal flakes nixvim.url = "git+https://git.sajenim.dev/jasmine/nvim.nix.git"; xmonad-config.url = "git+https://git.sajenim.dev/jasmine/xmonad-config.git"; diff --git a/home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_medium.toml b/home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_medium.toml deleted file mode 100644 index 88ab103..0000000 --- a/home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_medium.toml +++ /dev/null @@ -1,37 +0,0 @@ -[colors] -background = '#282828' # bg0 -foreground = '#d4be98' # fg0 - -selection_bg = '#3c3836' # bg_current_word -selection_fg = '#a89984' # grey2 - -cursor_fg = '#3c3836' # bg_current_word -cursor_bg = '#a89984' # grey2 -cursor_border = '#a89984' # grey2 - -ansi = [ - '#282828', # bg0 - '#ea6962', # red - '#a9b665', # green - '#d8a657', # yellow - '#7daea3', # blue - '#d3869b', # purple - '#89b482', # aqua - '#d4be98', # fg0 -] - -brights = [ - '#7c6f64', # grey0 - '#ea6962', # red - '#a9b665', # green - '#d8a657', # yellow - '#7daea3', # blue - '#d3869b', # purple - '#89b482', # aqua - '#ddc7a1', # fg1 -] - -[colors.indexed] - -[metadata] -name = 'gruvbox_material_dark_medium' diff --git a/home-manager/sajenim/features/desktop/wezterm/default.nix b/home-manager/sajenim/features/desktop/wezterm/default.nix index 6b9f97b..eee8209 100644 --- a/home-manager/sajenim/features/desktop/wezterm/default.nix +++ b/home-manager/sajenim/features/desktop/wezterm/default.nix @@ -1,16 +1,50 @@ -{ - inputs, - pkgs, - ... -}: { - home.packages = [ - inputs.wezterm.packages.${pkgs.system}.default - ]; +{pkgs, ...}: { + programs.wezterm = { + enable = true; + package = pkgs.unstable.wezterm; - xdg.configFile = { - wezterm = { - source = ./config; - recursive = true; + # Enable our shell integrations + enableZshIntegration = true; + + # Install our theme + colorSchemes = { + gruvbox_material_dark_medium = { + background = "#282828"; # bg0 + foreground = "#D4BE98"; # fg0 + + selection_bg = "#3C3836"; # bg_current_word + selection_fg = "#A89984"; # grey2 + + cursor_bg = "#A89984"; # bg_current_word + cursor_fg = "#3C3836"; # grey2 + cursor_border = "#A89984"; # grey2 + + ansi = [ + "#282828" # bg0 + "#EA6962" # red + "#A9B665" # green + "#D8A657" # yellow + "#7DAEA3" # blue + "#D3869B" # purple + "#89B482" # aqua + "#D4BE98" # fg0 + ]; + + brights = [ + "#7C6F65" # grey0 + "#EA6962" # red + "#A9B665" # green + "#D8A657" # yellow + "#7DAEA3" # blue + "#D3869B" # purple + "#89B482" # aqua + "#DDC7A1" # fg1 + ]; + }; + # https://github.com/sainnhe/gruvbox-material }; + + # Load our wezterm configuration + extraConfig = builtins.readFile ./wezterm.lua; }; } diff --git a/home-manager/sajenim/features/desktop/wezterm/config/wezterm.lua b/home-manager/sajenim/features/desktop/wezterm/wezterm.lua similarity index 100% rename from home-manager/sajenim/features/desktop/wezterm/config/wezterm.lua rename to home-manager/sajenim/features/desktop/wezterm/wezterm.lua