faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

working NixVim!

Browse source
This commit is contained in:
Charlie Root 2024-05-22 14:04:58 +02:00
commit 6513d61fa3
42 changed files with 774 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/editors/nixvim/colors/aquarium.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base01 = "#2c2e3e";
base00 = "#20202A";
base02 = "#3D4059";
base03 = "#313449";
base04 = "#63718b";
base05 = "#ced4df";
base06 = "#414560";
base07 = "#63718b";
base08 = "#ebb9b9";
base09 = "#e8cca7";
base0A = "#e6dfb8";
base0B = "#b1dba4";
base0C = "#b8dceb";
base0D = "#a3b8ef";
base0E = "#f6bbe7";
base0F = "#eAc1c1";
}

18
modules/editors/nixvim/colors/decay.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#171B20";
base01 = "#21262e";
base02 = "#2b323b";
base03 = "#3c4453";
base04 = "#485263";
base05 = "#b6beca";
base06 = "#dee1e6";
base07 = "#dee1e6";
base08 = "#70A5EB";
base09 = "#e9a180";
base0A = "#f1cf8a";
base0B = "#78DBA9";
base0C = "#e26c7c";
base0D = "#86aaec";
base0E = "#c68aee";
base0F = "#9cd1ff";
}

18
modules/editors/nixvim/colors/everblush.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#101618";
base01 = "#232a2d";
base02 = "#2d3437";
base03 = "#404749";
base04 = "#4f5658";
base05 = "#cacaca";
base06 = "#d2d2d2";
base07 = "#dadada";
base08 = "#e57474";
base09 = "#e19d5c";
base0A = "#e5c76b";
base0B = "#8ccf7e";
base0C = "#71baf2";
base0D = "#67cbe7";
base0E = "#c47fd5";
base0F = "#ef7d7d";
}

18
modules/editors/nixvim/colors/everforest.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#2b3339";
base01 = "#323c41";
base02 = "#3a4248";
base03 = "#868d80";
base04 = "#d3c6aa";
base05 = "#d3c6aa";
base06 = "#e9e8d2";
base07 = "#fff9e8";
base08 = "#7fbbb3";
base09 = "#d699b6";
base0A = "#83c092";
base0B = "#dbbc7f";
base0C = "#e69875";
base0D = "#a7c080";
base0E = "#e67e80";
base0F = "#d699b6";
}

18
modules/editors/nixvim/colors/gruvbox.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#1e2122";
base01 = "#2c2f30";
base02 = "#36393a";
base03 = "#404344";
base04 = "#d4be98";
base05 = "#c0b196";
base06 = "#c3b499";
base07 = "#c7b89d";
base08 = "#ec6b64";
base09 = "#e78a4e";
base0A = "#e0c080";
base0B = "#a9b665";
base0C = "#86b17f";
base0D = "#7daea3";
base0E = "#d3869b";
base0F = "#d65d0e";
}

18
modules/editors/nixvim/colors/jellybeans.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#151515";
base01 = "#1c1c1c";
base02 = "#404040";
base03 = "#888888";
base04 = "#ddddbf";
base05 = "#e8e8d3";
base06 = "#eeeede";
base07 = "#f1f1e5";
base08 = "#cf6a4c";
base09 = "#d8ad4c";
base0A = "#d8ad4c";
base0B = "#99ad6a";
base0C = "#71b9f8";
base0D = "#597bc5";
base0E = "#c6b6ee";
base0F = "#d8ad4c";
}

18
modules/editors/nixvim/colors/mountain.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#0f0f0f";
base01 = "#151515";
base02 = "#191919";
base03 = "#323232";
base04 = "#535353";
base05 = "#f0f0f0";
base06 = "#d8d8d8";
base07 = "#414141";
base08 = "#ac8a8c";
base09 = "#d3d0ad";
base0A = "#ACA98A";
base0B = "#8aac8b";
base0C = "#9EC3C4";
base0D = "#8fb4b5";
base0E = "#C49EC4";
base0F = "#9d9a7b";
}

18
modules/editors/nixvim/colors/paradise.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#151515";
base01 = "#1F1F1F";
base02 = "#2E2E2E";
base03 = "#424242";
base04 = "#BBB6B6";
base05 = "#E8E3E3";
base06 = "#E8E3E3";
base07 = "#E8E3E3";
base08 = "#B66467";
base09 = "#D9BC8C";
base0A = "#D9BC8C";
base0B = "#8C977D";
base0C = "#8AA6A2";
base0D = "#8DA3B9";
base0E = "#A988B0";
base0F = "#BBB6B6";
}

18
modules/editors/nixvim/colors/tokyonight.nix Normal file
View file

@ -0,0 +1,18 @@
_: {
base00 = "#1A1B26";
base01 = "#3b4261";
base02 = "#3b4261";
base03 = "#545c7e";
base04 = "#565c64";
base05 = "#a9b1d6";
base06 = "#bbc5f0";
base07 = "#c0caf5";
base08 = "#f7768e";
base09 = "#ff9e64";
base0A = "#e0af68";
base0B = "#9ece6a";
base0C = "#2ac3de";
base0D = "#7aa2f7";
base0E = "#9d7cd8";
base0F = "#9abdf5";
}

4
modules/editors/nixvim/default.nix
View file

@ -1,3 +1,3 @@
_:{
imports = [./nixvim.nix ];
_: {
imports = [./nixvim.nix];
}

121
modules/editors/nixvim/highlight.nix Normal file
View file

@ -0,0 +1,121 @@
{
config,
lib,
...
}: let
colors = import ./colors/${config.theme}.nix {};
in {
config = lib.mkIf config.colorschemes.base16.enable {
highlight = {
CursorLine = {
fg = "none";
bg = "none";
};
CursorLineNr = {
fg = "none";
bg = "none";
};
AlphaHeader = {
fg = colors.base0E;
bg = "none";
};
StatusNormal = {
bg = "none";
fg = "none";
};
TelescopePromptBorder = {
fg = colors.base01;
bg = colors.base01;
};
TelescopePromptNormal = {
fg = "none";
bg = colors.base01;
};
TelescopePromptPrefix = {
fg = colors.base08;
bg = colors.base01;
};
TelescopeSelection = {
fg = "none";
bg = colors.base01;
};
Pmenu = {
fg = "none";
bg = colors.base01;
};
PmenuSbar = {
fg = "none";
bg = colors.base01;
};
PmenuThumb = {
fg = "none";
bg = colors.base01;
};
PmenuSel = {
fg = "none";
bg = colors.base02;
};
CmpItemAbbrMatch = {
fg = colors.base05;
bg = "none";
};
CmpItemAbbrMatchFuzzy = {
fg = colors.base05;
bg = "none";
};
CmpItemAbbr = {
fg = colors.base03;
bg = "none";
};
CmpItemKind = {
fg = colors.base0E;
bg = "none";
};
CmpItemMenu = {
fg = colors.base0E;
bg = "none";
};
CmpItemKindSnippet = {
fg = colors.base0E;
bg = "none";
};
VertSplit = {
fg = colors.base01;
bg = "none";
};
FloatBorder = {
fg = colors.base01;
bg = colors.base01;
};
NormalFloat = {
fg = "none";
bg = colors.base01;
};
LineNr = {
fg = colors.base03;
bg = "none";
};
NoiceCmdlinePopup = {
fg = colors.base04;
bg = colors.base01;
};
NoiceCmdlinePopupBorder = {
fg = colors.base01;
bg = colors.base01;
};
NoiceCmdlinePopupBorderSearch = {
fg = colors.base01;
bg = colors.base01;
};
};
};
}

716
modules/editors/nixvim/keys.nix
View file

@ -1,408 +1,408 @@
{
programs.nixvim = {
globals.mapleader = " ";
programs.nixvim = {
globals.mapleader = " ";
keymaps = [
{
mode = "n";
key = "<leader>f";
action = "+find/file";
desc = "Find a file";
}
{
mode = "n";
key = "<leader>s";
action = "+search";
desc = "Search in your file";
}
keymaps = [
{
mode = "n";
key = "<leader>f";
action = "+find/file";
options.desc = "Find a file";
}
{
mode = "n";
key = "<leader>s";
action = "+search";
options.desc = "Search in your file";
}
{
mode = "n";
key = "<leader>q";
action = "+quit/session";
desc = "Quit the current session";
}
{
mode = "n";
key = "<leader>q";
action = "+quit/session";
options.desc = "Quit the current session";
}
{
mode = ["n" "v"];
key = "<leader>g";
action = "+git";
}
{
mode = ["n" "v"];
key = "<leader>g";
action = "+git";
}
{
mode = "n";
key = "<leader>u";
action = "+ui";
}
{
mode = "n";
key = "<leader>u";
action = "+ui";
}
{
mode = "n";
key = "<leader>w";
action = "+windows";
}
{
mode = "n";
key = "<leader>w";
action = "+windows";
}
{
mode = "n";
key = "<leader><Tab>";
action = "+tab";
}
{
mode = "n";
key = "<leader><Tab>";
action = "+tab";
}
{
mode = ["n" "v"];
key = "<leader>d";
action = "+debug";
}
{
mode = ["n" "v"];
key = "<leader>d";
action = "+debug";
}
{
mode = ["n" "v"];
key = "<leader>c";
action = "+code";
}
{
mode = ["n" "v"];
key = "<leader>c";
action = "+code";
}
{
mode = ["n" "v"];
key = "<leader>t";
action = "+test";
}
{
mode = ["n" "v"];
key = "<leader>t";
action = "+test";
}
# Tabs
{
mode = "n";
key = "<leader><tab><tab>";
action = "<cmd>tabnew<cr>";
options = {
silent = true;
desc = "New Tab";
};
}
# Tabs
{
mode = "n";
key = "<leader><tab><tab>";
action = "<cmd>tabnew<cr>";
options = {
silent = true;
desc = "New Tab";
};
}
{
mode = "n";
key = "<leader><tab>d";
action = "<cmd>tabclose<cr>";
options = {
silent = true;
desc = "Close tab";
};
}
{
mode = "n";
key = "<leader><tab>d";
action = "<cmd>tabclose<cr>";
options = {
silent = true;
desc = "Close tab";
};
}
# Windows
{
mode = "n";
key = "<leader>ww";
action = "<C-W>p";
options = {
silent = true;
desc = "Other window";
};
}
# Windows
{
mode = "n";
key = "<leader>ww";
action = "<C-W>p";
options = {
silent = true;
desc = "Other window";
};
}
{
mode = "n";
key = "<leader>wd";
action = "<C-W>c";
options = {
silent = true;
desc = "Delete window";
};
}
{
mode = "n";
key = "<leader>wd";
action = "<C-W>c";
options = {
silent = true;
desc = "Delete window";
};
}
{
mode = "n";
key = "<leader>w-";
action = "<C-W>s";
options = {
silent = true;
desc = "Split window below";
};
}
{
mode = "n";
key = "<leader>w-";
action = "<C-W>s";
options = {
silent = true;
desc = "Split window below";
};
}
{
mode = "n";
key = "<leader>w|";
action = "<C-W>v";
options = {
silent = true;
desc = "Split window right";
};
}
{
mode = "n";
key = "<leader>w|";
action = "<C-W>v";
options = {
silent = true;
desc = "Split window right";
};
}
{
mode = "n";
key = "<C-h>";
action = "<C-W>h";
options = {
silent = true;
desc = "Move to window left";
};
}
{
mode = "n";
key = "<C-h>";
action = "<C-W>h";
options = {
silent = true;
desc = "Move to window left";
};
}
{
mode = "n";
key = "<C-l>";
action = "<C-W>l";
options = {
silent = true;
desc = "Move to window right";
};
}
{
mode = "n";
key = "<C-l>";
action = "<C-W>l";
options = {
silent = true;
desc = "Move to window right";
};
}
{
mode = "n";
key = "<C-k>";
action = "<C-W>k";
options = {
silent = true;
desc = "Move to window over";
};
}
{
mode = "n";
key = "<C-k>";
action = "<C-W>k";
options = {
silent = true;
desc = "Move to window over";
};
}
{
mode = "n";
key = "<C-j>";
action = "<C-W>j";
options = {
silent = true;
desc = "Move to window bellow";
};
}
{
mode = "n";
key = "<C-j>";
action = "<C-W>j";
options = {
silent = true;
desc = "Move to window bellow";
};
}
{
mode = "n";
key = "<C-s>";
action = "<cmd>w<cr><esc>";
options = {
silent = true;
desc = "Save file";
};
}
{
mode = "n";
key = "<C-s>";
action = "<cmd>w<cr><esc>";
options = {
silent = true;
desc = "Save file";
};
}
# Quit/Session
{
mode = "n";
key = "<leader>qq";
action = "<cmd>quitall<cr><esc>";
options = {
silent = true;
desc = "Quit all";
};
}
# Quit/Session
{
mode = "n";
key = "<leader>qq";
action = "<cmd>quitall<cr><esc>";
options = {
silent = true;
desc = "Quit all";
};
}
{
mode = "n";
key = "<leader>ul";
action = ":lua ToggleLineNumber()<cr>";
options = {
silent = true;
desc = "Toggle Line Numbers";
};
}
{
mode = "n";
key = "<leader>ul";
action = ":lua ToggleLineNumber()<cr>";
options = {
silent = true;
desc = "Toggle Line Numbers";
};
}
{
mode = "n";
key = "<leader>uL";
action = ":lua ToggleRelativeLineNumber()<cr>";
options = {
silent = true;
desc = "Toggle Relative Line Numbers";
};
}
{
mode = "n";
key = "<leader>uL";
action = ":lua ToggleRelativeLineNumber()<cr>";
options = {
silent = true;
desc = "Toggle Relative Line Numbers";
};
}
{
mode = "n";
key = "<leader>uw";
action = ":lua ToggleWrap()<cr>";
options = {
silent = true;
desc = "Toggle Line Wrap";
};
}
{
mode = "n";
key = "<leader>uw";
action = ":lua ToggleWrap()<cr>";
options = {
silent = true;
desc = "Toggle Line Wrap";
};
}
{
mode = "v";
key = "J";
action = ":m '>+1<CR>gv=gv";
options = {desc = "Use move command when line is highlighted ";};
}
{
mode = "v";
key = "J";
action = ":m '>+1<CR>gv=gv";
options = {desc = "Use move command when line is highlighted ";};
}
{
mode = "v";
key = "K";
action = ":m '>-2<CR>gv=gv";
options = {desc = "Use move command when line is highlighted ";};
}
{
mode = "v";
key = "K";
action = ":m '>-2<CR>gv=gv";
options = {desc = "Use move command when line is highlighted ";};
}
{
mode = "n";
key = "J";
action = "mzJ`z";
options = {
desc = "Allow cursor to stay in the same place after appending to current line ";
};
}
{
mode = "n";
key = "J";
action = "mzJ`z";
options = {
desc = "Allow cursor to stay in the same place after appending to current line ";
};
}
{
mode = "n";
key = "<C-d>";
action = "<C-d>zz";
options = {
desc = "Allow C-d and C-u to keep the cursor in the middle";
};
}
{
mode = "n";
key = "<C-d>";
action = "<C-d>zz";
options = {
desc = "Allow C-d and C-u to keep the cursor in the middle";
};
}
{
mode = "n";
key = "<C-u>";
action = "<C-u>zz";
options = {
desc = "Allow C-d and C-u to keep the cursor in the middle";
};
}
{
mode = "n";
key = "<C-u>";
action = "<C-u>zz";
options = {
desc = "Allow C-d and C-u to keep the cursor in the middle";
};
}
{
mode = "n";
key = "n";
action = "nzzzv";
options = {desc = "Allow search terms to stay in the middle ";};
}
{
mode = "n";
key = "n";
action = "nzzzv";
options = {desc = "Allow search terms to stay in the middle ";};
}
{
mode = "n";
key = "N";
action = "Nzzzv";
options = {desc = "Allow search terms to stay in the middle ";};
}
{
mode = "n";
key = "N";
action = "Nzzzv";
options = {desc = "Allow search terms to stay in the middle ";};
}
# Paste stuff without saving the deleted word into the buffer
{
mode = "x";
key = "<leader>p";
action = ''"_dP'';
options = {desc = "Deletes to void register and paste over";};
}
# Paste stuff without saving the deleted word into the buffer
{
mode = "x";
key = "<leader>p";
action = ''"_dP'';
options = {desc = "Deletes to void register and paste over";};
}
# Copy stuff to system clipboard with <leader> + y or just y to have it just in vim
{
mode = ["n" "v"];
key = "<leader>y";
action = ''"+y'';
options = {desc = "Copy to system clipboard";};
}
# Copy stuff to system clipboard with <leader> + y or just y to have it just in vim
{
mode = ["n" "v"];
key = "<leader>y";
action = ''"+y'';
options = {desc = "Copy to system clipboard";};
}
{
mode = ["n" "v"];
key = "<leader>Y";
action = ''"+Y'';
options = {desc = "Copy to system clipboard";};
}
{
mode = ["n" "v"];
key = "<leader>Y";
action = ''"+Y'';
options = {desc = "Copy to system clipboard";};
}
# Delete to void register
{
mode = ["n" "v"];
key = "<leader>D";
action = ''"_d'';
options = {desc = "Delete to void register";};
}
# Delete to void register
{
mode = ["n" "v"];
key = "<leader>D";
action = ''"_d'';
options = {desc = "Delete to void register";};
}
# <C-c> instead of pressing esc just because
{
mode = "i";
key = "<C-c>";
action = "<Esc>";
}
# <C-c> instead of pressing esc just because
{
mode = "i";
key = "<C-c>";
action = "<Esc>";
}
{
mode = "n";
key = "<leader>zz";
action = "<CMD> ZenMode | Pencil<CR>";
options = {desc = "Toggle writting mode";};
}
{
mode = "n";
key = "<leader>zz";
action = "<CMD> ZenMode | Pencil<CR>";
options = {desc = "Toggle writting mode";};
}
{
mode = "n";
key = "<leader>m";
action = "<CMD> Grapple toggle <CR>";
options = {desc = "Grapple Toggle tag";};
}
{
mode = "n";
key = "<leader>m";
action = "<CMD> Grapple toggle <CR>";
options = {desc = "Grapple Toggle tag";};
}
{
mode = "n";
key = "<leader>k";
action = "<CMD> Grapple toggle_tags <CR>";
options = {desc = "Grapple Toggle tag";};
}
{
mode = "n";
key = "<leader>k";
action = "<CMD> Grapple toggle_tags <CR>";
options = {desc = "Grapple Toggle tag";};
}
{
mode = "n";
key = "<leader>K";
action = "<CMD> Grapple toggle_scopes <CR>";
options = {desc = "Grapple Toggle scopes";};
}
{
mode = "n";
key = "<leader>K";
action = "<CMD> Grapple toggle_scopes <CR>";
options = {desc = "Grapple Toggle scopes";};
}
{
mode = "n";
key = "<leader>j";
action = "<CMD> Grapple cycle forward <CR>";
options = {desc = "Grapple Cycle forward";};
}
{
mode = "n";
key = "<leader>j";
action = "<CMD> Grapple cycle forward <CR>";
options = {desc = "Grapple Cycle forward";};
}
{
mode = "n";
key = "<leader>J";
action = "<CMD> Grapple cycle backward <CR>";
options = {desc = "Grapple Cycle backward";};
}
{
mode = "n";
key = "<leader>J";
action = "<CMD> Grapple cycle backward <CR>";
options = {desc = "Grapple Cycle backward";};
}
{
mode = "n";
key = "<leader>1";
action = "<CMD> Grapple select index=1<CR>";
options = {desc = "Grapple Select 1";};
}
{
mode = "n";
key = "<leader>1";
action = "<CMD> Grapple select index=1<CR>";
options = {desc = "Grapple Select 1";};
}
{
mode = "n";
key = "<leader>2";
action = "<CMD> Grapple select index=2<CR>";
options = {desc = "Grapple Select 2";};
}
{
mode = "n";
key = "<leader>2";
action = "<CMD> Grapple select index=2<CR>";
options = {desc = "Grapple Select 2";};
}
{
mode = "n";
key = "<leader>3";
action = "<CMD> Grapple select index=3<CR>";
options = {desc = "Grapple Select 3";};
}
{
mode = "n";
key = "<leader>3";
action = "<CMD> Grapple select index=3<CR>";
options = {desc = "Grapple Select 3";};
}
{
mode = "n";
key = "<leader>4";
action = "<CMD> Grapple select index=4<CR>";
options = {desc = "Grapple Select 4";};
}
];
extraConfigLua = ''
function ToggleLineNumber()
if vim.wo.number then
vim.wo.number = false
else
vim.wo.number = true
vim.wo.relativenumber = false
end
end
function ToggleRelativeLineNumber()
if vim.wo.relativenumber then
{
mode = "n";
key = "<leader>4";
action = "<CMD> Grapple select index=4<CR>";
options = {desc = "Grapple Select 4";};
}
];
extraConfigLua = ''
function ToggleLineNumber()
if vim.wo.number then
vim.wo.number = false
else
vim.wo.number = true
vim.wo.relativenumber = false
else
vim.wo.relativenumber = true
vim.wo.number = false
end
end
end
end
function ToggleWrap()
vim.wo.wrap = not vim.wo.wrap
end
'';
};
function ToggleRelativeLineNumber()
if vim.wo.relativenumber then
vim.wo.relativenumber = false
else
vim.wo.relativenumber = true
vim.wo.number = false
end
end
function ToggleWrap()
vim.wo.wrap = not vim.wo.wrap
end
'';
};
}

33
modules/editors/nixvim/nixvim.nix
View file

@ -1,9 +1,13 @@
{ config, lib, ... }:
let cfg = config.modules.editors.nixvim;
{
config,
lib,
...
}: let
cfg = config.modules.editors.nixvim;
in {
options.modules.editors.nixvim.enable = lib.mkEnableOption "nixvim";
imports = [
#./keys.nix
./keys.nix
./settings.nix
./plug/completion/cmp.nix
#./plug/completion/copilot-cmp.nix
@ -30,7 +34,7 @@ in {
./plug/treesitter/treesitter-textobjects.nix
./plug/treesitter/treesitter.nix
#./plug/ui/alpha.nix
./plug/ui/alpha.nix
./plug/ui/btw.nix
./plug/ui/bufferline.nix
./plug/ui/noice.nix
@ -38,7 +42,7 @@ in {
./plug/ui/telescope.nix
./plug/utils/comment.nix
./plug/utils/copilot.nix
#./plug/utils/copilot.nix
./plug/utils/flash.nix
./plug/utils/hardtime.nix
#./plug/utils/harpoon.nix
@ -49,15 +53,18 @@ in {
./plug/utils/undotree.nix
./plug/utils/ufo.nix
./plug/utils/whichkey.nix
];
config = lib.mkIf cfg.enable {
programs.nixvim = {
enable = true;
colorschemes.gruvbox = {
enable = true;
settings.transparent_mode = true;
};
options = {
theme = lib.mkOption {
default = "gruvbox";
type = lib.types.enum ["paradise" "decay" "mountain" "tokyonight" "everforest" "everblush" "jellybeans" "aquarium" "gruvbox"];
};
};
config = lib.mkIf cfg.enable {
programs.nixvim.enable = true;
theme = "gruvbox";
programs.nixvim.extraConfigLua = ''
_G.theme = "${config.theme}"
'';
};
}

4
modules/editors/nixvim/plug/completion/cmp.nix
View file

@ -1,5 +1,6 @@
{
programs.nixvim.plugins = {
programs.nixvim = {
plugins = {
cmp-emoji = {enable = true;};
cmp = {
enable = true;
@ -117,4 +118,5 @@
-- end
-- }
}) '';
};
}

4
modules/editors/nixvim/plug/git/gitsigns.nix
View file

@ -1,5 +1,6 @@
{
programs.nixvim.plugins.gitsigns = {
programs.nixvim = {
plugins.gitsigns = {
enable = true;
settings = {
trouble = true;
@ -73,4 +74,5 @@
};
}
];
};
}

2
modules/editors/nixvim/plug/lsp/none-ls.nix
View file

@ -1,4 +1,5 @@
{
programs.nixvim = {
plugins.none-ls = {
enable = true;
enableLspFormat = true;
@ -47,4 +48,5 @@
};
}
];
};
}

2
modules/editors/nixvim/plug/lsp/trouble.nix
View file

@ -1,5 +1,5 @@
{
plugins.trouble = {
programs.nixvim.plugins.trouble = {
enable = true;
};
}

2
modules/editors/nixvim/plug/snippets/luasnip.nix
View file

@ -1,5 +1,5 @@
{pkgs, ...}: {
plugins.luasnip = {
programs.nixvim.plugins.luasnip = {
enable = true;
extraConfig = {
enable_autosnippets = true;

42
modules/editors/nixvim/plug/statusline/lualine.nix
View file

@ -1,30 +1,30 @@
{
plugins.lualine = {
programs.nixvim.plugins.lualine = {
enable = true;
globalstatus = true;
disabledFiletypes = {
statusline = ["dashboard" "alpha" "starter"];
};
theme = {
normal = {
a = {
bg = "#b4befe";
fg = "#1c1d21";
};
b = {
bg = "nil";
};
c = {
bg = "nil";
};
z = {
bg = "nil";
};
y = {
bg = "nil";
};
};
};
# theme = {
# normal = {
# a = {
# bg = "#b4befe";
# fg = "#1c1d21";
# };
# b = {
# bg = "nil";
# };
# c = {
# bg = "nil";
# };
# z = {
# bg = "nil";
# };
# y = {
# bg = "nil";
# };
# };
# };
sections = {
lualine_a = [
{

2
modules/editors/nixvim/plug/treesitter/treesitter-context.nix
View file

@ -1,5 +1,5 @@
{
plugins.treesitter-context = {
programs.nixvim.plugins.treesitter-context = {
enable = true;
};
}

2
modules/editors/nixvim/plug/treesitter/treesitter-textobjects.nix
View file

@ -1,5 +1,5 @@
{
plugins.treesitter-textobjects = {
programs.nixvim.plugins.treesitter-textobjects = {
enable = false;
select = {
enable = true;

2
modules/editors/nixvim/plug/treesitter/treesitter.nix
View file

@ -10,6 +10,7 @@
};
};
in {
programs.nixvim = {
filetype.extension.liq = "liquidsoap";
filetype.extension.nu = "nu";
@ -41,4 +42,5 @@ in {
filetype = "nu",
}
'';
};
}

30
modules/editors/nixvim/plug/ui/alpha.nix
View file

@ -1,19 +1,22 @@
{
programs.nixvim = {
plugins.alpha = let
nixFlake = [
" "
" ▓█████ ██▓ ▓██ ██▓▄▄▄█████▓ ██░ ██ "
" ▓█ ▀ ▓██▒ ▒██ ██▒▓ ██▒ ▓▒▓██░ ██▒ "
" ▒███ ▒██░ ▒██ ██░▒ ▓██░ ▒░▒██▀▀██░ "
" ▒▓█ ▄ ▒██░ ░ ▐██▓░░ ▓██▓ ░ ░▓█ ░██ "
" ░▒████▒░██████▒ ░ ██▒▓░ ▒██▒ ░ ░▓█▒░██▓ "
" ░░ ▒░ ░░ ▒░▓ ░ ██▒▒▒ ▒ ░░ ▒ ░░▒░▒ "
" ░ ░ ░░ ░ ▒ ░▓██ ░▒░ ░ ▒ ░▒░ ░ "
" ░ ░ ░ ▒ ▒ ░░ ░ ░ ░░ ░ "
" ░ ░ ░ ░░ ░ ░ ░ ░ "
" ░ ░ "
" "
" git@github.com:elythh "
"⠄⠄⠄⢰⣧⣼⣯⠄⣸⣠⣶⣶⣦⣾⠄⠄⠄⠄⡀⠄⢀⣿⣿⠄⠄⠄⢸⡇⠄⠄"
"⠄⠄⠄⣾⣿⠿⠿⠶⠿⢿⣿⣿⣿⣿⣦⣤⣄⢀⡅⢠⣾⣛⡉⠄⠄⠄⠸⢀⣿⠄"
"⠄⠄⢀⡋⣡⣴⣶⣶⡀⠄⠄⠙⢿⣿⣿⣿⣿⣿⣴⣿⣿⣿⢃⣤⣄⣀⣥⣿⣿⠄"
"⠄⠄⢸⣇⠻⣿⣿⣿⣧⣀⢀⣠⡌⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⠿⣿⣿⣿⠄"
"⠄⢀⢸⣿⣷⣤⣤⣤⣬⣙⣛⢿⣿⣿⣿⣿⣿⣿⡿⣿⣿⡍⠄⠄⢀⣤⣄⠉⠋⣰"
"⠄⣼⣖⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⢇⣿⣿⡷⠶⠶⢿⣿⣿⠇⢀⣤"
"⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣽⣿⣿⣿⡇⣿⣿⣿⣿⣿⣿⣷⣶⣥⣴⣿⡗"
"⢀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠄"
"⢸⣿⣦⣌⣛⣻⣿⣿⣧⠙⠛⠛⡭⠅⠒⠦⠭⣭⡻⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠄"
"⠘⣿⣿⣿⣿⣿⣿⣿⣿⡆⠄⠄⠄⠄⠄⠄⠄⠄⠹⠈⢋⣽⣿⣿⣿⣿⣵⣾⠃⠄"
"⠄⠘⣿⣿⣿⣿⣿⣿⣿⣿⠄⣴⣿⣶⣄⠄⣴⣶⠄⢀⣾⣿⣿⣿⣿⣿⣿⠃⠄⠄"
"⠄⠄⠈⠻⣿⣿⣿⣿⣿⣿⡄⢻⣿⣿⣿⠄⣿⣿⡀⣾⣿⣿⣿⣿⣛⠛⠁⠄⠄⠄"
"⠄⠄⠄⠄⠈⠛⢿⣿⣿⣿⠁⠞⢿⣿⣿⡄⢿⣿⡇⣸⣿⣿⠿⠛⠁⠄⠄⠄⠄⠄"
"⠄⠄⠄⠄⠄⠄⠄⠉⠻⣿⣿⣾⣦⡙⠻⣷⣾⣿⠃⠿⠋⠁⠄⠄⠄⠄⠄⢀⣠⣴"
"⣿⣿⣿⣶⣶⣮⣥⣒⠲⢮⣝⡿⣿⣿⡆⣿⡿⠃⠄⠄⠄⠄⠄⠄⠄⣠⣴⣿⣿⣿"
];
in {
enable = true;
@ -86,4 +89,5 @@
}
];
};
};
}

2
modules/editors/nixvim/plug/ui/btw.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
programs.nixvim = {
extraPlugins = with pkgs.vimUtils; [
(buildVimPlugin {
pname = "btw.nvim";
@ -17,4 +18,5 @@
text = "I use Neovim (and NixOS, BTW)",
})
'';
};
}

4
modules/editors/nixvim/plug/ui/bufferline.nix
View file

@ -5,11 +5,12 @@
}: let
colors = import ../../colors/${config.theme}.nix {};
in {
programs.nixvim = {
plugins = {
bufferline = {
enable = true;
separatorStyle = "thick"; # “slant”, “padded_slant”, “slope”, “padded_slope”, “thick”, “thin”
highlights = lib.mkIf config.colorschemes.base16.enable {
highlights = {
fill = {
fg = colors.base00;
bg = colors.base00;
@ -172,4 +173,5 @@ in {
};
}
];
};
}

2
modules/editors/nixvim/plug/ui/noice.nix
View file

@ -1,5 +1,5 @@
{
plugins.noice = {
programs.nixvim.plugins.noice = {
enable = true;
notify = {
enabled = false;

2
modules/editors/nixvim/plug/ui/nvim-notify.nix
View file

@ -1,4 +1,5 @@
{
programs.nixvim = {
plugins.notify = {
enable = true;
backgroundColour = "#000000";
@ -42,4 +43,5 @@
return notify(message, level, merged_opts)
end
'';
};
}

2
modules/editors/nixvim/plug/ui/telescope.nix
View file

@ -1,4 +1,5 @@
{
programs.nixvim = {
plugins.telescope = {
enable = true;
extensions = {
@ -207,4 +208,5 @@
}
}
'';
};
}

2
modules/editors/nixvim/plug/utils/comment.nix
View file

@ -1,5 +1,5 @@
{
plugins.comment = {
programs.nixvim.plugins.comment = {
enable = true;
};
}

2
modules/editors/nixvim/plug/utils/copilot.nix
View file

@ -10,6 +10,7 @@
hash = "sha256-Q+g81BQVQTY5J2c2ZWB7bjJLuNSdI0PAan+75YJ7mI0=";
};
in {
programs.nixvim = {
extraPlugins = with pkgs.vimUtils; [
(buildVimPlugin {
pname = "copilotchat";
@ -53,4 +54,5 @@ in {
action = "<cmd>CopilotChatCommit<cr>";
}
];
};
}

2
modules/editors/nixvim/plug/utils/flash.nix
View file

@ -1,4 +1,5 @@
{
programs.nixvim = {
plugins.flash = {
enable = true;
labels = "asdfghjklqwertyuiopzxcvbnm";
@ -53,4 +54,5 @@
};
}
];
};
}

2
modules/editors/nixvim/plug/utils/grapple.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
programs.nixvim = {
extraPlugins = with pkgs.vimUtils; [
(buildVimPlugin {
pname = "grapple.nvim";
@ -17,4 +18,5 @@
scope = "git_branch",
})
'';
};
}

2
modules/editors/nixvim/plug/utils/hardtime.nix
View file

@ -1,5 +1,5 @@
{
plugins.hardtime = {
programs.nixvim.plugins.hardtime = {
enable = true;
enabled = true;
disableMouse = true;

2
modules/editors/nixvim/plug/utils/harpoon.nix
View file

@ -1,5 +1,5 @@
{
plugins.harpoon = {
programs.nixvim.plugins.harpoon = {
enable = true;
enableTelescope = true;
keymapsSilent = true;

2
modules/editors/nixvim/plug/utils/illuminate.nix
View file

@ -1,5 +1,5 @@
{
plugins.illuminate = {
programs.nixvim.plugins.illuminate = {
enable = true;
underCursor = false;
filetypesDenylist = [

2
modules/editors/nixvim/plug/utils/nvim-autopairs.nix
View file

@ -1,5 +1,5 @@
{
plugins.nvim-autopairs = {
programs.nixvim.plugins.nvim-autopairs = {
enable = true;
};
}

2
modules/editors/nixvim/plug/utils/oil.nix
View file

@ -1,4 +1,5 @@
{
programs.nixvim = {
plugins.oil = {
enable = true;
settings = {
@ -47,4 +48,5 @@
};
}
];
};
}

2
modules/editors/nixvim/plug/utils/ufo.nix
View file

@ -1,5 +1,5 @@
{
plugins.nvim-ufo = {
programs.nixvim.plugins.nvim-ufo = {
enable = true;
};
}

2
modules/editors/nixvim/plug/utils/undotree.nix
View file

@ -1,4 +1,5 @@
{
programs.nixvim = {
plugins.undotree = {
enable = true;
settings = {
@ -17,4 +18,5 @@
};
}
];
};
}

2
modules/editors/nixvim/plug/utils/whichkey.nix
View file

@ -1,5 +1,5 @@
{
plugins.which-key = {
programs.nixvim.plugins.which-key = {
enable = true;
};
}

2
modules/gui/stylix.nix
View file

@ -36,7 +36,7 @@ in {
applications = 0.9;
popups = 0.9;
desktop = 0.9;
terminal = 0.9;
terminal = 0.85;
};
cursor = {
package = pkgs.bibata-cursors;