matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(nvim): move to homeManagerModules
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-11-22 02:48:41 -05:00
parent 303122dfc8
commit 11adcacd6f
35 changed files with 524 additions and 415 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/home/default.nix
View file

@ -3,7 +3,6 @@
./bash
./direnv
./git
./neovim
./nix-index
./tmux
];

116
common/home/neovim/default.nix
View file

@ -1,116 +0,0 @@
{
config,
pkgs,
...
}: {
imports = [
./git.nix
./langs
./theme.nix
./treesitter.nix
];
programs = {
neovim = {
enable = true;
extraLuaConfig =
# lua
''
-- by default, the indent is 2 spaces.
vim.opt.smartindent = true;
vim.opt.expandtab = true;
vim.opt.shiftwidth = 2;
vim.opt.softtabstop = 2;
vim.opt.tabstop = 2;
vim.opt.number = true;
vim.opt.relativenumber = true;
vim.opt.undofile = true;
vim.opt.undodir = '${config.xdg.cacheHome}/nvim/';
-- Always show the signcolumn, otherwise it would shift
-- the text each time diagnostics appear/become resolved
vim.opt.signcolumn = 'yes';
-- remove highlight on words
vim.keymap.set('n', '<esc>', ':noh<cr><esc>', {
noremap = true,
silent = true,
});
-- Get rid of deprecated messages
vim.tbl_add_reverse_lookup = function(tbl)
for k, v in pairs(tbl) do
tbl[v] = k;
end
end;
vim.tbl_islist = function(tbl)
return vim.islist(tbl);
end;
vim.diagnostic.is_disabled = function()
return not vim.diagnostic.is_enabled();
end;
vim.lsp.buf_get_clients = function()
return vim.lsp.get_clients();
end;
vim.lsp.get_active_clients = function()
return vim.lsp.get_clients();
end;
'';
plugins = [
pkgs.vimPlugins.fzfWrapper
pkgs.vimPlugins.fzf-vim
{
plugin = pkgs.vimPlugins.todo-comments-nvim;
type = "lua";
config =
# lua
''
require('todo-comments').setup();
'';
}
{
plugin = pkgs.vimPlugins.mini-nvim;
type = "lua";
config =
# lua
''
-- TODO: see how this works
local ts_input = require('mini.surround').gen_spec.input.treesitter;
require('mini.surround').setup({
custom_surroundings = {
-- Use tree-sitter to search for function call
f = {
input = ts_input({
outer = '@call.outer',
inner = '@call.inner',
});
},
},
});
'';
}
{
plugin = pkgs.vimPlugins.nvim-config-local;
type = "lua";
config =
# lua
''
require('config-local').setup({
config_files = { '.nvim.lua', '.nvimrc', '.exrc' },
-- Where the plugin keeps files data
hashfile = '${config.xdg.cacheHome}/nvim/config-local',
});
'';
}
];
};
};
}

31
common/home/neovim/git.nix
View file

@ -1,31 +0,0 @@
{pkgs, ...}: {
programs = {
neovim = {
plugins = [
pkgs.vimPlugins.fugitive
{
plugin = pkgs.vimPlugins.gitsigns-nvim;
type = "lua";
config =
# lua
''
local gitsigns = require("gitsigns");
local function visual_stage()
local first_line = vim.fn.line('v');
local last_line = vim.fn.getpos('.')[2];
gitsigns.stage_hunk({ first_line, last_line });
end
vim.keymap.set("v", "gs", function()
visual_stage()
end);
gitsigns.setup();
'';
}
];
};
};
}

179
common/home/neovim/theme.nix
View file

@ -1,179 +0,0 @@
{
config,
pkgs,
lib,
nvim-theme-src,
...
}: let
inherit (lib) fileContents optionals;
inherit (config.vars) neovimIde;
in {
programs = {
neovim = {
extraPackages = builtins.attrValues {
inherit (pkgs) bat;
};
plugins =
[
{
plugin = pkgs.vimPlugins.dracula-nvim.overrideAttrs {
src = nvim-theme-src;
};
type = "lua";
config =
# lua
''
-- set dot icon in place of trailing whitespaces
vim.opt.listchars = {
tab = '→ ',
trail = '•',
extends = '⟩',
precedes = '⟨',
nbsp = '␣',
};
vim.opt.list = true;
-- Add visual indicator for trailing whitespaces
vim.opt.fillchars = { eob = " " };
vim.fn.matchadd('errorMsg', [[\s\+$]]);
vim.cmd.colorscheme('dracula');
'';
}
{
plugin = pkgs.vimPlugins.indent-blankline-nvim;
type = "lua";
config =
# lua
''
--
local highlight = {
"RainbowRed",
"RainbowYellow",
"RainbowBlue",
"RainbowOrange",
"RainbowGreen",
"RainbowViolet",
"RainbowCyan",
};
local hooks = require('ibl.hooks');
hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" });
vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" });
vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" });
vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" });
vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" });
vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" });
vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" });
end);
require('ibl').setup({
indent = {
highlight = highlight,
char = "▏",
},
});
'';
}
{
plugin = pkgs.vimPlugins.nvim-highlight-colors;
type = "lua";
config =
# lua
''
-- Ensure termguicolors is enabled if not already
vim.opt.termguicolors = true;
require('nvim-highlight-colors').setup({});
'';
}
# Deps of heirline config
pkgs.vimPlugins.nvim-web-devicons
{
plugin = pkgs.vimPlugins.heirline-nvim;
type = "lua";
config = fileContents ./plugins/heirline.lua;
}
]
++ optionals neovimIde [
{
plugin = pkgs.vimPlugins.neo-tree-nvim;
type = "lua";
config = fileContents ./plugins/neotree.lua;
}
{
plugin = pkgs.vimPlugins.codewindow-nvim;
type = "lua";
config =
# lua
''
--
local codewindow = require('codewindow');
codewindow.setup({
auto_enable = false,
minimap_width = 8,
relative = 'editor',
window_border = 'none',
exclude_filetypes = { 'help' },
});
vim.api.nvim_create_autocmd({ 'VimEnter', 'VimResized' }, {
pattern = '*',
callback = function()
if vim.api.nvim_win_get_width(0) < 88 then
codewindow.close_minimap();
else
codewindow.open_minimap();
end
end,
});
'';
}
{
plugin = pkgs.vimPlugins.transparent-nvim;
type = "lua";
config =
# lua
''
require('transparent').setup({
groups = {
'Normal',
'NormalNC',
'Comment',
'Constant',
'Special',
'Identifier',
'Statement',
'PreProc',
'Type',
'Underlined',
'Todo',
'String',
'Function',
'Conditional',
'Repeat',
'Operator',
'Structure',
'LineNr',
'NonText',
'SignColumn',
'CursorLine',
'CursorLineNr',
'StatusLine',
'StatusLineNC',
'EndOfBuffer',
},
extra_groups = {},
exclude_groups = {},
});
'';
}
];
};
};
}

2
common/nix-on-droid.nix
View file

@ -1,6 +1,7 @@
{
config,
lib,
self,
...
}: {
imports = [
@ -41,6 +42,7 @@
}
./home
self.homeManagerModules.neovim
{
programs.bash.sessionVariables = {

5
common/vars/default.nix
View file

@ -39,11 +39,6 @@ in {
};
};
};
neovimIde = mkOption {
type = types.bool;
default = true;
};
};
config = {

5
devices/android/default.nix
View file

@ -4,10 +4,7 @@
pkgs,
...
}: {
vars = {
mainUser = "nix-on-droid";
neovimIde = false;
};
vars.mainUser = "nix-on-droid";
environment.variables.FLAKE = "/data/data/com.termux.nix/files/home/.nix";

19
devices/binto/default.nix
View file

@ -19,9 +19,22 @@ in {
self.nixosModules.server
];
home-manager.users.${mainUser}.imports = [
self.homeManagerModules.firefox
];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.firefox
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE
system.stateVersion = "23.11";

16
devices/cluster/default.nix
View file

@ -19,6 +19,22 @@ in {
self.nixosModules.server
];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE
system.stateVersion = "24.05";

16
devices/homie/default.nix
View file

@ -18,6 +18,22 @@ in {
self.nixosModules.server
];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE
system.stateVersion = "24.11";

16
devices/nos/default.nix
View file

@ -18,6 +18,22 @@ in {
self.nixosModules.server
];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE
system.stateVersion = "24.05";

16
devices/servivi/default.nix
View file

@ -18,6 +18,22 @@ in {
self.nixosModules.server
];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE
system.stateVersion = "24.05";

19
devices/wim/default.nix
View file

@ -22,9 +22,22 @@ in {
self.nixosModules.server
];
home-manager.users.${mainUser}.imports = [
self.homeManagerModules.firefox
];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.firefox
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE
system.stateVersion = "23.05";

1
homeManagerModules/default.nix
View file

@ -1,3 +1,4 @@
self: {
firefox = import ./firefox self;
neovim = import ./neovim self;
}

0
common/home/neovim/.editorconfig → homeManagerModules/neovim/.editorconfig
View file

128
homeManagerModules/neovim/default.nix Normal file
View file

@ -0,0 +1,128 @@
self: {
config,
lib,
pkgs,
...
}: let
inherit (lib) mkOption types;
in {
imports = [
./git.nix
./treesitter.nix
(import ./langs self)
(import ./theme.nix self)
];
options.programs.neovim = {
user = mkOption {
type = types.str;
};
enableIde = mkOption {
type = types.bool;
default = false;
};
};
config.programs.neovim = {
extraLuaConfig =
# lua
''
-- by default, the indent is 2 spaces.
vim.opt.smartindent = true;
vim.opt.expandtab = true;
vim.opt.shiftwidth = 2;
vim.opt.softtabstop = 2;
vim.opt.tabstop = 2;
vim.opt.number = true;
vim.opt.relativenumber = true;
vim.opt.undofile = true;
vim.opt.undodir = '${config.xdg.cacheHome}/nvim/';
-- Always show the signcolumn, otherwise it would shift
-- the text each time diagnostics appear/become resolved
vim.opt.signcolumn = 'yes';
-- remove highlight on words
vim.keymap.set('n', '<esc>', ':noh<cr><esc>', {
noremap = true,
silent = true,
});
-- Get rid of deprecated messages
vim.tbl_add_reverse_lookup = function(tbl)
for k, v in pairs(tbl) do
tbl[v] = k;
end
end;
vim.tbl_islist = function(tbl)
return vim.islist(tbl);
end;
vim.diagnostic.is_disabled = function()
return not vim.diagnostic.is_enabled();
end;
vim.lsp.buf_get_clients = function()
return vim.lsp.get_clients();
end;
vim.lsp.get_active_clients = function()
return vim.lsp.get_clients();
end;
'';
plugins = [
pkgs.vimPlugins.fzfWrapper
pkgs.vimPlugins.fzf-vim
{
plugin = pkgs.vimPlugins.todo-comments-nvim;
type = "lua";
config =
# lua
''
require('todo-comments').setup();
'';
}
{
plugin = pkgs.vimPlugins.mini-nvim;
type = "lua";
config =
# lua
''
-- TODO: see how this works
local ts_input = require('mini.surround').gen_spec.input.treesitter;
require('mini.surround').setup({
custom_surroundings = {
-- Use tree-sitter to search for function call
f = {
input = ts_input({
outer = '@call.outer',
inner = '@call.inner',
});
},
},
});
'';
}
{
plugin = pkgs.vimPlugins.nvim-config-local;
type = "lua";
config =
# lua
''
require('config-local').setup({
config_files = { '.nvim.lua', '.nvimrc', '.exrc' },
-- Where the plugin keeps files data
hashfile = '${config.xdg.cacheHome}/nvim/config-local',
});
'';
}
];
};
# For accurate stack trace
_file = ./default.nix;
}

27
homeManagerModules/neovim/git.nix Normal file
View file

@ -0,0 +1,27 @@
{pkgs, ...}: {
programs.neovim.plugins = [
pkgs.vimPlugins.fugitive
{
plugin = pkgs.vimPlugins.gitsigns-nvim;
type = "lua";
config =
# lua
''
local gitsigns = require("gitsigns");
local function visual_stage()
local first_line = vim.fn.line('v');
local last_line = vim.fn.getpos('.')[2];
gitsigns.stage_hunk({ first_line, last_line });
end
vim.keymap.set("v", "gs", function()
visual_stage()
end);
gitsigns.setup();
'';
}
];
}

11
common/home/neovim/langs/bash.nix → homeManagerModules/neovim/langs/bash.nix
View file

@ -1,13 +1,14 @@
{
config,
pkgs,
lib,
pkgs,
...
}: let
inherit (lib) getExe mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
in {
programs = {
programs = mkIf cfg.enable {
# I love doing typos
bash.shellAliases = {
nivm = "nvim";
@ -19,13 +20,13 @@ in {
viAlias = true;
vimAlias = true;
extraPackages = mkIf neovimIde [
extraPackages = mkIf cfg.enableIde [
pkgs.nodePackages.bash-language-server
pkgs.shellcheck
];
extraLuaConfig =
mkIf neovimIde
mkIf cfg.enableIde
# lua
''
vim.api.nvim_create_autocmd('FileType', {

7
common/home/neovim/langs/clang.nix → homeManagerModules/neovim/langs/clang.nix
View file

@ -1,13 +1,14 @@
{
config,
pkgs,
lib,
pkgs,
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
in
mkIf neovimIde {
mkIf cfg.enableIde {
programs = {
neovim = {
extraPackages = builtins.attrValues {

7
common/home/neovim/langs/csharp.nix → homeManagerModules/neovim/langs/csharp.nix
View file

@ -1,13 +1,14 @@
{
config,
pkgs,
lib,
pkgs,
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
in
mkIf neovimIde {
mkIf cfg.enableIde {
programs = {
neovim = {
extraPackages = builtins.attrValues {

26
common/home/neovim/langs/default.nix → homeManagerModules/neovim/langs/default.nix
View file

@ -1,11 +1,12 @@
{
self: {
config,
lib,
pkgs,
...
}: let
inherit (lib) fileContents mkBefore mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
in {
imports = [
./bash.nix
@ -15,29 +16,19 @@ in {
./java.nix
./json.nix
./lua.nix
./markdown.nix
./nix.nix
./python.nix
./rust.nix
./web.nix
(import ./markdown.nix self)
(import ./nix.nix self)
(import ./web.nix self)
];
programs = mkIf neovimIde {
config.programs = mkIf cfg.enableIde {
neovim = {
extraLuaConfig =
mkBefore
# lua
''
-- Start completion / snippet stuff
vim.g.coq_settings = {
auto_start = 'shut-up',
keymap = {
recommended = false,
},
-- https://github.com/NixOS/nixpkgs/issues/168928#issuecomment-1109581739
xdg = true,
};
-- Add formatting cmd
vim.api.nvim_create_user_command(
'Format',
@ -101,4 +92,7 @@ in {
];
};
};
# For accurate stack trace
_file = ./default.nix;
}

5
common/home/neovim/langs/hyprlang.nix → homeManagerModules/neovim/langs/hyprlang.nix
View file

@ -4,9 +4,10 @@
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
in
mkIf neovimIde {
mkIf cfg.enableIde {
programs = {
neovim = {
extraLuaConfig =

5
common/home/neovim/langs/java.nix → homeManagerModules/neovim/langs/java.nix
View file

@ -5,12 +5,13 @@
...
}: let
inherit (lib) getExe mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
javaSdk = pkgs.temurin-bin-17;
javaPkgs = builtins.attrValues {inherit (pkgs) gradle maven;};
in
mkIf neovimIde {
mkIf cfg.enableIde {
home.packages = javaPkgs;
xdg.dataFile.".gradle/gradle.properties".text = ''

5
common/home/neovim/langs/json.nix → homeManagerModules/neovim/langs/json.nix
View file

@ -5,9 +5,10 @@
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
in
mkIf neovimIde {
mkIf cfg.enableIde {
programs = {
neovim = {
extraPackages = builtins.attrValues {

7
common/home/neovim/langs/lua.nix → homeManagerModules/neovim/langs/lua.nix
View file

@ -1,15 +1,16 @@
{
config,
pkgs,
lib,
pkgs,
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
flakeEnv = config.programs.bash.sessionVariables.FLAKE;
in
mkIf neovimIde {
mkIf cfg.enableIde {
programs = {
neovim = {
extraPackages = builtins.attrValues {

21
common/home/neovim/langs/markdown.nix → homeManagerModules/neovim/langs/markdown.nix
View file

@ -1,17 +1,18 @@
{
self: {
config,
lib,
pkgs,
self,
vimplugin-easytables-src,
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
inherit (self.inputs) vimplugin-easytables-src;
inherit (self.lib.${pkgs.system}) buildPlugin;
in
mkIf neovimIde {
inherit (lib) mkIf;
cfg = config.programs.neovim;
in {
config = mkIf cfg.enableIde {
programs = {
neovim = {
extraPackages = builtins.attrValues {
@ -125,4 +126,8 @@ in
];
};
};
}
};
# For accurate stack trace
_file = ./markdown.nix;
}

29
common/home/neovim/langs/nix.nix → homeManagerModules/neovim/langs/nix.nix
View file

@ -1,30 +1,29 @@
{
self: {
config,
lib,
osConfig,
pkgs,
lib,
nixd,
self,
...
}: let
inherit (lib) getExe hasPrefix mkIf removePrefix;
inherit (config.vars) mainUser neovimIde;
inherit (osConfig.networking) hostName;
cfg = config.programs.neovim;
defaultFormatter = self.formatter.${pkgs.system};
nixdPkg = nixd.packages.${pkgs.system}.default;
nixdPkg = self.inputs.nixd.packages.${pkgs.system}.default;
flakeEnv = config.programs.bash.sessionVariables.FLAKE;
flakeDir = "${removePrefix "/home/${mainUser}/" flakeEnv}";
in
mkIf neovimIde {
flakeDir = "${removePrefix "/home/${cfg.user}/" flakeEnv}";
in {
config = mkIf cfg.enableIde {
assertions = [
{
assertion =
neovimIde
&& hasPrefix "/home/${mainUser}/" flakeEnv
|| !neovimIde;
cfg.enableIde
&& hasPrefix "/home/${cfg.user}/" flakeEnv
|| !cfg.enableIde;
message = ''
Your $FLAKE environment variable needs to point to a directory in
the main users' home to use the neovim module.
@ -74,4 +73,8 @@ in
'';
};
};
}
};
# For accurate stack trace
_file = ./nix.nix;
}

5
common/home/neovim/langs/python.nix → homeManagerModules/neovim/langs/python.nix
View file

@ -5,9 +5,10 @@
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
cfg = config.programs.neovim;
in
mkIf neovimIde {
mkIf cfg.enableIde {
programs = {
neovim = {
withPython3 = true;

11
common/home/neovim/langs/rust.nix → homeManagerModules/neovim/langs/rust.nix
View file

@ -1,16 +1,17 @@
{
config,
pkgs,
lib,
pkgs,
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
inherit (lib) attrValues mkIf;
cfg = config.programs.neovim;
in
mkIf neovimIde {
mkIf cfg.enableIde {
programs = {
neovim = {
extraPackages = builtins.attrValues {
extraPackages = attrValues {
inherit
(pkgs)
cargo

22
common/home/neovim/langs/web.nix → homeManagerModules/neovim/langs/web.nix
View file

@ -1,17 +1,17 @@
{
self: {
config,
lib,
pkgs,
self,
vimplugin-ts-error-translator-src,
...
}: let
inherit (lib) mkIf;
inherit (config.vars) neovimIde;
inherit (self.inputs) vimplugin-ts-error-translator-src;
inherit (self.lib.${pkgs.system}) buildPlugin;
in
mkIf neovimIde {
inherit (lib) mkIf;
cfg = config.programs.neovim;
in {
config = mkIf cfg.enableIde {
programs = {
neovim = {
withNodeJs = true;
@ -197,4 +197,8 @@ in
];
};
};
}
};
# For accurate stack trace
_file = ./web.nix;
}

0
common/home/neovim/plugins/cmp.lua → homeManagerModules/neovim/plugins/cmp.lua
View file

0
common/home/neovim/plugins/heirline.lua → homeManagerModules/neovim/plugins/heirline.lua
View file

0
common/home/neovim/plugins/neotree.lua → homeManagerModules/neovim/plugins/neotree.lua
View file

181
homeManagerModules/neovim/theme.nix Normal file
View file

@ -0,0 +1,181 @@
self: {
config,
pkgs,
lib,
...
}: let
inherit (self.inputs) nvim-theme-src;
inherit (lib) attrValues fileContents optionals;
cfg = config.programs.neovim;
in {
config.programs.neovim = {
extraPackages = attrValues {
inherit (pkgs) bat;
};
plugins =
[
{
plugin = pkgs.vimPlugins.dracula-nvim.overrideAttrs {
src = nvim-theme-src;
};
type = "lua";
config =
# lua
''
-- set dot icon in place of trailing whitespaces
vim.opt.listchars = {
tab = '→ ',
trail = '•',
extends = '⟩',
precedes = '⟨',
nbsp = '␣',
};
vim.opt.list = true;
-- Add visual indicator for trailing whitespaces
vim.opt.fillchars = { eob = " " };
vim.fn.matchadd('errorMsg', [[\s\+$]]);
vim.cmd.colorscheme('dracula');
'';
}
{
plugin = pkgs.vimPlugins.indent-blankline-nvim;
type = "lua";
config =
# lua
''
--
local highlight = {
"RainbowRed",
"RainbowYellow",
"RainbowBlue",
"RainbowOrange",
"RainbowGreen",
"RainbowViolet",
"RainbowCyan",
};
local hooks = require('ibl.hooks');
hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" });
vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" });
vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" });
vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" });
vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" });
vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" });
vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" });
end);
require('ibl').setup({
indent = {
highlight = highlight,
char = "▏",
},
});
'';
}
{
plugin = pkgs.vimPlugins.nvim-highlight-colors;
type = "lua";
config =
# lua
''
-- Ensure termguicolors is enabled if not already
vim.opt.termguicolors = true;
require('nvim-highlight-colors').setup({});
'';
}
# Deps of heirline config
pkgs.vimPlugins.nvim-web-devicons
{
plugin = pkgs.vimPlugins.heirline-nvim;
type = "lua";
config = fileContents ./plugins/heirline.lua;
}
]
++ optionals cfg.enableIde [
{
plugin = pkgs.vimPlugins.neo-tree-nvim;
type = "lua";
config = fileContents ./plugins/neotree.lua;
}
{
plugin = pkgs.vimPlugins.codewindow-nvim;
type = "lua";
config =
# lua
''
--
local codewindow = require('codewindow');
codewindow.setup({
auto_enable = false,
minimap_width = 8,
relative = 'editor',
window_border = 'none',
exclude_filetypes = { 'help' },
});
vim.api.nvim_create_autocmd({ 'VimEnter', 'VimResized' }, {
pattern = '*',
callback = function()
if vim.api.nvim_win_get_width(0) < 88 then
codewindow.close_minimap();
else
codewindow.open_minimap();
end
end,
});
'';
}
{
plugin = pkgs.vimPlugins.transparent-nvim;
type = "lua";
config =
# lua
''
require('transparent').setup({
groups = {
'Normal',
'NormalNC',
'Comment',
'Constant',
'Special',
'Identifier',
'Statement',
'PreProc',
'Type',
'Underlined',
'Todo',
'String',
'Function',
'Conditional',
'Repeat',
'Operator',
'Structure',
'LineNr',
'NonText',
'SignColumn',
'CursorLine',
'CursorLineNr',
'StatusLine',
'StatusLineNC',
'EndOfBuffer',
},
extra_groups = {},
exclude_groups = {},
});
'';
}
];
};
# For accurate stack trace
_file = ./theme.nix;
}

0
common/home/neovim/treesitter.nix → homeManagerModules/neovim/treesitter.nix
View file