diff --git a/nixos/nixvim/plugins/statusline.nix b/nixos/nixvim/plugins/statusline.nix index 3dd832a..c96ac57 100644 --- a/nixos/nixvim/plugins/statusline.nix +++ b/nixos/nixvim/plugins/statusline.nix @@ -16,16 +16,7 @@ }, right = { 'filetype_lsp', - function(active) - return Slimline.highlights.hl_component( - { primary = '%3l:%-2c', secondary = '%P' }, - Slimline.get_mode().hls, - Slimline.get_sep('mode'), - 'right', - active, - 'fg' - ) - end, + 'progress', }, }, sep = { diff --git a/nixos/nixvim/plugins/telescope.nix b/nixos/nixvim/plugins/telescope.nix index 74fd44f..148022b 100644 --- a/nixos/nixvim/plugins/telescope.nix +++ b/nixos/nixvim/plugins/telescope.nix @@ -1,98 +1,12 @@ { - config, - inputs, - pkgs, - lib, - ... -}: -let - base16 = inputs.stylix.inputs.base16.lib { inherit pkgs lib; }; - scheme = base16.mkSchemeAttrs config.stylix.base16Scheme; - c = scheme.withHashtag; -in -{ - programs.nixvim = { - plugins.telescope = { - enable = true; - settings.defaults = { - winblend = 0; # opaque, otherwise your 0.8 terminal opacity bleeds through + programs.nixvim.plugins.telescope = { + enable = true; + keymaps = { + "ff" = { + action = "find_files"; }; - keymaps = { - "ff".action = "find_files"; - "lg".action = "live_grep"; - }; - }; - - highlightOverride = { - TelescopeNormal = { - fg = c.base05; - bg = c.base01; - }; - TelescopeBorder = { - fg = c.base02; - bg = c.base01; - }; - - TelescopePromptNormal = { - fg = c.base05; - bg = c.base02; - }; - TelescopePromptBorder = { - fg = c.base01; - bg = c.base02; - }; - TelescopePromptTitle = { - fg = c.base01; - bg = c.base0E; - bold = true; - }; - TelescopePromptPrefix = { - fg = c.base0E; - bg = c.base02; - }; - - TelescopeResultsNormal = { - fg = c.base04; - bg = c.base01; - }; - TelescopeResultsBorder = { - fg = c.base00; - bg = c.base01; - }; - TelescopeResultsTitle = { - fg = c.base00; - bg = c.base01; - }; - - TelescopePreviewNormal = { - fg = c.base05; - bg = c.base01; - }; - TelescopePreviewBorder = { - fg = c.base00; - bg = c.base01; - }; - TelescopePreviewTitle = { - fg = c.base00; - bg = c.base0B; - bold = true; - }; - - TelescopeSelection = { - fg = c.base06; - bg = c.base03; - bold = true; - }; - TelescopeSelectionCaret = { - fg = c.base08; - bg = c.base03; - }; - TelescopeMatching = { - fg = c.base0A; - bold = true; - }; - TelescopeMultiSelection = { - fg = c.base0C; + "lg" = { + action = "live_grep"; }; }; };