From 86aaaabfd153a1710b6773f17925d2e5191bf522 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar <54011232+arpitchakladar@users.noreply.github.com> Date: Wed, 25 Sep 2024 23:51:51 +0530 Subject: Changed polybar bspwm workspace tab config. --- modules/tools/editor/neovim/plugins/base16.lua | 6 -- .../editor/neovim/plugins/base16.mustache.lua | 12 +++ modules/tools/editor/neovim/plugins/default.nix | 4 +- modules/tools/viewer/bat/default.nix | 10 +- modules/tools/viewer/bat/theme.mustache.tmTheme | 120 +++++++++++++++++++++ modules/tools/viewer/bat/theme.tmTheme.mustache | 120 --------------------- 6 files changed, 142 insertions(+), 130 deletions(-) delete mode 100644 modules/tools/editor/neovim/plugins/base16.lua create mode 100644 modules/tools/editor/neovim/plugins/base16.mustache.lua create mode 100644 modules/tools/viewer/bat/theme.mustache.tmTheme delete mode 100644 modules/tools/viewer/bat/theme.tmTheme.mustache (limited to 'modules/tools') diff --git a/modules/tools/editor/neovim/plugins/base16.lua b/modules/tools/editor/neovim/plugins/base16.lua deleted file mode 100644 index 9843b76..0000000 --- a/modules/tools/editor/neovim/plugins/base16.lua +++ /dev/null @@ -1,6 +0,0 @@ -vim.o.termguicolors = true; -vim.opt.termguicolors = true; -vim.o.background = "dark"; -vim.g.base16colorspace = 256 -vim.cmd.colorscheme("base16-scheme"); -vim.api.nvim_set_hl(0, "LineNr", { link = "Normal" }); -- disable the background of line numbers diff --git a/modules/tools/editor/neovim/plugins/base16.mustache.lua b/modules/tools/editor/neovim/plugins/base16.mustache.lua new file mode 100644 index 0000000..3c13fcc --- /dev/null +++ b/modules/tools/editor/neovim/plugins/base16.mustache.lua @@ -0,0 +1,12 @@ +vim.o.termguicolors = true; +vim.opt.termguicolors = true; +vim.o.background = "dark"; +vim.g.base16colorspace = 256 +vim.cmd.colorscheme("base16-scheme"); + +-- Overrides +-- disable the background of line numbers +vim.api.nvim_set_hl(0, "LineNr", { link = "Normal" }); + +-- change the color of the pane separator +vim.api.nvim_set_hl(0, "WinSeparator", { fg = "#{{base02-hex}}", bg = "None" }); diff --git a/modules/tools/editor/neovim/plugins/default.nix b/modules/tools/editor/neovim/plugins/default.nix index 2df4e4a..ace5379 100644 --- a/modules/tools/editor/neovim/plugins/default.nix +++ b/modules/tools/editor/neovim/plugins/default.nix @@ -4,6 +4,8 @@ ${builtins.readFile ./comment.lua} ${builtins.readFile ./lualine.lua} ${import ./treesitter.nix { inherit config; }} -${builtins.readFile ./base16.lua} +${builtins.readFile (config.scheme { + template = builtins.readFile ./base16.mustache.lua; +})} ${builtins.readFile ./nvim-tree.lua} '' diff --git a/modules/tools/viewer/bat/default.nix b/modules/tools/viewer/bat/default.nix index 73bdefd..ec68eb7 100644 --- a/modules/tools/viewer/bat/default.nix +++ b/modules/tools/viewer/bat/default.nix @@ -7,12 +7,16 @@ config = lib.mkIf config.tools.viewer.bat.enable { programs.bat.enable = true; - programs.bat.config.theme = "custom-theme"; - shell.alias."cbat" = "${pkgs.bat}/bin/bat -pp"; + programs.bat.config = { + tabs = "4"; + theme = "custom-theme"; + }; + shell.alias."bc" = "${pkgs.bat}/bin/bat -pp"; + shell.alias."bp" = "${pkgs.bat}/bin/bat --paging always"; home.sessionVariables."PAGER" = "${pkgs.bat}/bin/bat --paging always"; xdg.configFile."bat/themes/custom-theme.tmTheme".source = config.scheme { - template = builtins.readFile ./theme.tmTheme.mustache; + template = builtins.readFile ./theme.mustache.tmTheme; }; }; } diff --git a/modules/tools/viewer/bat/theme.mustache.tmTheme b/modules/tools/viewer/bat/theme.mustache.tmTheme new file mode 100644 index 0000000..844b80d --- /dev/null +++ b/modules/tools/viewer/bat/theme.mustache.tmTheme @@ -0,0 +1,120 @@ + + + + name + customTheme + settings + + + + settings + + background + #{{base00-hex}} + foreground + #{{base05-hex}} + caret + #{{base07-hex}} + invisibles + #{{base03-hex}} + lineHighlight + #{{base02-hex}} + selection + #{{base03-hex}} + + + + + + scope + comment + settings + + foreground + #{{base04-hex}} + + + + + scope + string + settings + + foreground + #{{base0A-hex}} + + + + + scope + constant.numeric + settings + + foreground + #{{base09-hex}} + + + + + scope + variable + settings + + foreground + #{{base08-hex}} + + + + + scope + keyword + settings + + foreground + #{{base0D-hex}} + + + + + scope + support.function + settings + + foreground + #{{base0E-hex}} + + + + + scope + constant.language + settings + + foreground + #{{base0B-hex}} + + + + + scope + entity.name.tag + settings + + foreground + #{{base0C-hex}} + + + + + scope + invalid + settings + + foreground + #{{base0F-hex}} + + + + + + diff --git a/modules/tools/viewer/bat/theme.tmTheme.mustache b/modules/tools/viewer/bat/theme.tmTheme.mustache deleted file mode 100644 index 844b80d..0000000 --- a/modules/tools/viewer/bat/theme.tmTheme.mustache +++ /dev/null @@ -1,120 +0,0 @@ - - - - name - customTheme - settings - - - - settings - - background - #{{base00-hex}} - foreground - #{{base05-hex}} - caret - #{{base07-hex}} - invisibles - #{{base03-hex}} - lineHighlight - #{{base02-hex}} - selection - #{{base03-hex}} - - - - - - scope - comment - settings - - foreground - #{{base04-hex}} - - - - - scope - string - settings - - foreground - #{{base0A-hex}} - - - - - scope - constant.numeric - settings - - foreground - #{{base09-hex}} - - - - - scope - variable - settings - - foreground - #{{base08-hex}} - - - - - scope - keyword - settings - - foreground - #{{base0D-hex}} - - - - - scope - support.function - settings - - foreground - #{{base0E-hex}} - - - - - scope - constant.language - settings - - foreground - #{{base0B-hex}} - - - - - scope - entity.name.tag - settings - - foreground - #{{base0C-hex}} - - - - - scope - invalid - settings - - foreground - #{{base0F-hex}} - - - - - - -- cgit v1.2.3