diff --git a/nixos/nixvim/plugins/statusline.nix b/nixos/nixvim/plugins/statusline.nix index 399d08b..447e5a2 100644 --- a/nixos/nixvim/plugins/statusline.nix +++ b/nixos/nixvim/plugins/statusline.nix @@ -1,65 +1,38 @@ -{ pkgs, ... }: { - programs.nixvim.extraPlugins = [ pkgs.vimPlugins.slimline-nvim ]; - programs.nixvim.extraConfigLua = '' +{ + programs.nixvim.plugins.lualine = { + enable = true; + settings = { + extensions = [ "toggleterm" ]; + options = { + section_separators = { + left = ""; + right = ""; + }; + component_separators = { + left = "::"; + right = "::"; + }; + }; + + sections = { + lualine_a = [ + "mode" + ]; + lualine_b = [ "" ]; + lualine_c = [ + "filename" + "diagnostics" + ]; + + lualine_x = [ + "lsp_status" + ]; + lualine_y = [ "" ]; + lualine_z = [ + "location" + ]; + }; + }; + }; - require('slimline').setup({ - spaces = { - components = " ", - left = "", - right = "", - }, - components = { - left = { - 'mode', - 'path', - 'diagnostics', - }, - right = { - 'filetype_lsp', - function(active) - return Slimline.highlights.hl_component( - { primary = '%3l:%-2c'}, - Slimline.get_mode().hls, - Slimline.get_sep('mode'), - 'right', - active, - 'fg' - ) - end, - }, - }, - sep = { - hide = { - first = true, -- hides the first separator of the line - last = true, -- hides the last separator of the line - }, - left = " ", - right = " ", - }, - style = 'fg', - bold = false, - hl = { - primary = 'StatusLine', - secondary = 'StatusLineNC', - base = 'StatusLine', - base_inactive = 'StatusLineNC', - }, - configs = { - mode = { - verbose = true, - }, - path = { - }, - progress = { - follow = 'mode', - }, - filetype_lsp = { - hl = { - primary = 'String', - secondary = 'Function', - }, - }, - }, - }) - ''; } diff --git a/nixos/stylix/stylix.nix b/nixos/stylix/stylix.nix index 3687324..d6f361a 100644 --- a/nixos/stylix/stylix.nix +++ b/nixos/stylix/stylix.nix @@ -27,7 +27,7 @@ let map (n: "${dir}/${n}/${platform}.nix") ( builtins.filter (n: builtins.pathExists "${dir}/${n}/${platform}.nix") drop ); - palette = "oxocarbon-dark"; + palette = "tokyo-night-dark"; stylixPalette = lib.strings.concatStrings [ "${pkgs.base16-schemes}/share/themes/" "${palette}"