From ac0ff3bf2f4e9f581080df16f39b0ed225354a53 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 19 Feb 2026 11:08:42 -0500 Subject: [PATCH 1/4] redo neovim theme --- home/terminal/neovim.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/home/terminal/neovim.nix b/home/terminal/neovim.nix index e1fb124..65ace66 100644 --- a/home/terminal/neovim.nix +++ b/home/terminal/neovim.nix @@ -45,27 +45,29 @@ state = "base16_custom"; }; + # this is helpful for figuring out what color is what: + # https://github.com/tinted-theming/schemes/blob/spec-0.11/base24/catppuccin-frappe.yaml custom_palettes = with config.scheme.withHashtag; { main.base16_custom = { color0 = base00; # background color1 = base01; # lighter background color2 = base02; # selection background - color3 = base03; # comments + color3 = base03; # color inside ${} color4 = base04; # dark foreground - color5 = base05; # default foreground - color6 = base06; # light foreground + color5 = config.scheme.withHashtag.${config.colors.accent}; # default foreground, left side of assignments + color6 = base03; # comments color7 = base07; # lightest foreground color8 = base05; # variables/tags }; accent.base16_custom = { - accent0 = config.scheme.withHashtag.${config.colors.accent}; # integers/constants - accent1 = base0A; # classes/search - accent2 = base0B; # strings/inherited - accent3 = base0C; # support/regex - accent4 = base0D; # functions/headings - accent5 = base0E; # keywords/bold - accent6 = base0F; # deprecated/embedded + accent0 = base08; # red, integers/constants + accent1 = base0A; # orange, classes/search + accent2 = base0A; # yellow, strings/inherited + accent3 = base0B; # green, support/regex + accent4 = base0D; # blue, functions/headings + accent5 = base0E; # purple, keywords/bold + accent6 = base07; # lavender, deprecated/embedded }; state.base16_custom = { From 879d391e1a34c193a8110ccc04abe17378a82d5f Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 19 Feb 2026 11:30:42 -0500 Subject: [PATCH 2/4] use base16 for fish --- home/terminal/fish.nix | 21 ++++++++++++++++++- home/terminal/fish_functions/fish-prompt.fish | 10 ++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix index 03f177e..ca784f0 100644 --- a/home/terminal/fish.nix +++ b/home/terminal/fish.nix @@ -1,4 +1,9 @@ -{ pkgs, ... }: +{ + pkgs, + config, + lib, + ... +}: { home.packages = with pkgs; [ kdePackages.qttools @@ -14,6 +19,7 @@ gzip = "pigz"; ls = "eza"; gl = "git log"; + gd = "git diff"; ga = "git add -v ."; gac = "git add -v . && git commit"; gaca = "git add -v . && git commit --amend --no-edit"; @@ -39,5 +45,18 @@ }; }; }; + + home.file.".config/fish/colors.fish" = { + text = lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: "set -g color_${name} ${value}") ( + lib.filterAttrs ( + n: v: builtins.isString v && builtins.match "^base[0-9A-Fa-f]{2}$" n != null + ) config.scheme + ) + ++ [ "set -g color_accent ${config.scheme.${config.colors.accent}}" ] + ); + force = true; + }; + programs.man.generateCaches = false; } diff --git a/home/terminal/fish_functions/fish-prompt.fish b/home/terminal/fish_functions/fish-prompt.fish index e13d31d..2f4fca7 100644 --- a/home/terminal/fish_functions/fish-prompt.fish +++ b/home/terminal/fish_functions/fish-prompt.fish @@ -1,4 +1,4 @@ -# source ~/.config/fish/colors.fish +source ~/.config/fish/colors.fish set -l last_status $status set -l nix_shell_info ( if test -n "$IN_NIX_SHELL" @@ -11,14 +11,14 @@ set -g color_cwd green # Set host color based on hostname if test (hostname) = peach - set -g color_host yellow + set -g color_host $color_accent else if test (hostname) = alien - set -g color_host yellow + set -g color_host $color_accent else if test (hostname) = vm - set -g color_host yellow + set -g color_host $color_accent set -g color_cwd normal else if test (uname) = Darwin - set -g color_host yellow + set -g color_host $color_base0A end set -l user_host (set_color $color_user)"$USER"(set_color normal)"@"(set_color $color_host)(prompt_hostname)(set_color normal) From c031852e71d99300fc0a41b13536ea2db8537ff5 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 19 Feb 2026 11:34:00 -0500 Subject: [PATCH 3/4] update kitty theme --- home/terminal/kitty.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/terminal/kitty.nix b/home/terminal/kitty.nix index 423ae5c..b6525dc 100644 --- a/home/terminal/kitty.nix +++ b/home/terminal/kitty.nix @@ -27,13 +27,13 @@ let url_color ${base06} # Kitty window border colors - active_border_color ${base09} - inactive_border_color ${base03} - bell_border_color ${base0A} + active_border_color ${config.scheme.withHashtag.${config.colors.accent}} + inactive_border_color ${base01} + bell_border_color ${base12} # Tab bar colors active_tab_foreground ${base11} - active_tab_background ${base09} + active_tab_background ${config.scheme.withHashtag.${config.colors.accent}} inactive_tab_foreground ${base05} inactive_tab_background ${base10} tab_bar_background ${base11} From 01c867c33813b4a29bdad275810757dfc46d3f07 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 19 Feb 2026 11:34:13 -0500 Subject: [PATCH 4/4] change searxng weights --- system/searxng/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/searxng/default.nix b/system/searxng/default.nix index 09337d8..75161b5 100644 --- a/system/searxng/default.nix +++ b/system/searxng/default.nix @@ -58,6 +58,9 @@ "duckduckgo".disabled = true; "brave".disabled = true; "bing".disabled = false; + "bing".weight = 0.4; + "startpage".disabled = false; + "startpage".weight = 1.4; "google".disabled = false; "mojeek".disabled = true; "mwmbl".disabled = false;