From e738e44c6a0875e17e69e3959fa2ecd4e57608c7 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 3 Feb 2023 18:54:14 +0300 Subject: [PATCH] refactor: move lualine files into their own dir --- modules/statusline/default.nix | 3 +- modules/statusline/{ => lualine}/config.nix | 0 modules/statusline/lualine/config.nix.old | 87 +++++++++++++++++++ modules/statusline/lualine/default.nix | 6 ++ modules/statusline/{ => lualine}/lualine.nix | 2 +- .../supported_themes.nix} | 0 6 files changed, 95 insertions(+), 3 deletions(-) rename modules/statusline/{ => lualine}/config.nix (100%) create mode 100644 modules/statusline/lualine/config.nix.old create mode 100644 modules/statusline/lualine/default.nix rename modules/statusline/{ => lualine}/lualine.nix (98%) rename modules/statusline/{supported_lualine_themes.nix => lualine/supported_themes.nix} (100%) diff --git a/modules/statusline/default.nix b/modules/statusline/default.nix index 5d638c9..643832b 100644 --- a/modules/statusline/default.nix +++ b/modules/statusline/default.nix @@ -5,7 +5,6 @@ ... }: { imports = [ - ./lualine.nix - ./config.nix + ./lualine ]; } diff --git a/modules/statusline/config.nix b/modules/statusline/lualine/config.nix similarity index 100% rename from modules/statusline/config.nix rename to modules/statusline/lualine/config.nix diff --git a/modules/statusline/lualine/config.nix.old b/modules/statusline/lualine/config.nix.old new file mode 100644 index 0000000..3c98b3b --- /dev/null +++ b/modules/statusline/lualine/config.nix.old @@ -0,0 +1,87 @@ +{ + pkgs, + config, + lib, + ... +}: +with lib; { + config = { + vim.statusline.lualine = { + enable = mkDefault false; + icons = mkDefault true; + theme = mkDefault "auto"; + sectionSeparator = { + left = mkDefault ""; + right = mkDefault ""; + }; + + componentSeparator = { + left = mkDefault "⏽"; + right = mkDefault "⏽"; + }; + + activeSection = { + a = mkDefault "{'mode'}"; + b = mkDefault '' + { + { + "filename", + color = {bg='none'} + }, + } + ''; + c = mkDefault '' + { + { + "branch", + icon = '' + }, + } + ''; + x = mkDefault '' + { + { + "diagnostics", + sources = {'nvim_lsp'}, + separator = '', + symbols = {error = '', warn = '', info = '', hint = ''} + }, + } + ''; + y = mkDefault '' + { + { + "fileformat", + color = {bg='none'} + }, + }, + ''; + z = mkDefault '' + { + { + "progress", + color = {bg='none'} + }, + "location", + { + "filetype", + color = { + bg='none', + fg='lavender' + }, + }, + } + ''; + }; + + inactiveSection = { + a = mkDefault "{}"; + b = mkDefault "{}"; + c = mkDefault "{'filename'}"; + x = mkDefault "{'location'}"; + y = mkDefault "{}"; + z = mkDefault "{}"; + }; + }; + }; +} diff --git a/modules/statusline/lualine/default.nix b/modules/statusline/lualine/default.nix new file mode 100644 index 0000000..879e72f --- /dev/null +++ b/modules/statusline/lualine/default.nix @@ -0,0 +1,6 @@ +_: { + imports = [ + ./lualine.nix + ./config.nix + ]; +} diff --git a/modules/statusline/lualine.nix b/modules/statusline/lualine/lualine.nix similarity index 98% rename from modules/statusline/lualine.nix rename to modules/statusline/lualine/lualine.nix index aba8466..3911607 100644 --- a/modules/statusline/lualine.nix +++ b/modules/statusline/lualine/lualine.nix @@ -7,7 +7,7 @@ with lib; with builtins; let cfg = config.vim.statusline.lualine; - supported_themes = import ./supported_lualine_themes.nix; + supported_themes = import ./supported_themes.nix; in { options.vim.statusline.lualine = { enable = mkOption { diff --git a/modules/statusline/supported_lualine_themes.nix b/modules/statusline/lualine/supported_themes.nix similarity index 100% rename from modules/statusline/supported_lualine_themes.nix rename to modules/statusline/lualine/supported_themes.nix