diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix index ca784f0..03f177e 100644 --- a/home/terminal/fish.nix +++ b/home/terminal/fish.nix @@ -1,9 +1,4 @@ -{ - pkgs, - config, - lib, - ... -}: +{ pkgs, ... }: { home.packages = with pkgs; [ kdePackages.qttools @@ -19,7 +14,6 @@ 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"; @@ -45,18 +39,5 @@ }; }; }; - - 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 2f4fca7..e13d31d 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 $color_accent + set -g color_host yellow else if test (hostname) = alien - set -g color_host $color_accent + set -g color_host yellow else if test (hostname) = vm - set -g color_host $color_accent + set -g color_host yellow set -g color_cwd normal else if test (uname) = Darwin - set -g color_host $color_base0A + set -g color_host yellow end set -l user_host (set_color $color_user)"$USER"(set_color normal)"@"(set_color $color_host)(prompt_hostname)(set_color normal) diff --git a/home/terminal/kitty.nix b/home/terminal/kitty.nix index b6525dc..423ae5c 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 ${config.scheme.withHashtag.${config.colors.accent}} - inactive_border_color ${base01} - bell_border_color ${base12} + active_border_color ${base09} + inactive_border_color ${base03} + bell_border_color ${base0A} # Tab bar colors active_tab_foreground ${base11} - active_tab_background ${config.scheme.withHashtag.${config.colors.accent}} + active_tab_background ${base09} inactive_tab_foreground ${base05} inactive_tab_background ${base10} tab_bar_background ${base11} diff --git a/home/terminal/neovim.nix b/home/terminal/neovim.nix index 65ace66..e1fb124 100644 --- a/home/terminal/neovim.nix +++ b/home/terminal/neovim.nix @@ -45,29 +45,27 @@ 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; # color inside ${} + color3 = base03; # comments color4 = base04; # dark foreground - color5 = config.scheme.withHashtag.${config.colors.accent}; # default foreground, left side of assignments - color6 = base03; # comments + color5 = base05; # default foreground + color6 = base06; # light foreground color7 = base07; # lightest foreground color8 = base05; # variables/tags }; accent.base16_custom = { - 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 + 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 }; state.base16_custom = { diff --git a/system/searxng/default.nix b/system/searxng/default.nix index 75161b5..09337d8 100644 --- a/system/searxng/default.nix +++ b/system/searxng/default.nix @@ -58,9 +58,6 @@ "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;