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

nvf finally working well!

Browse source
This commit is contained in:
Vali 2024-07-07 23:45:18 +02:00
commit 9962740d37
24 changed files with 209 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

203
modules/editors/nvf/plugins/extra.nix
View file

@ -4,12 +4,11 @@
...
}: let
inherit (config.modules.other.system) username;
inherit (pkgs.vimPlugins) friendly-snippets aerial-nvim nvim-surround undotree mkdir-nvim ssr-nvim direnv-vim legendary-nvim;
inherit (pkgs.vimPlugins) friendly-snippets aerial-nvim nvim-surround undotree mkdir-nvim ssr-nvim direnv-vim legendary-nvim lazygit-nvim;
inherit (pkgs) fetchFromGitHub;
inherit (pkgs.vimUtils) buildVimPlugin;
pluginSources = {
smart-splits = buildVimPlugin {
name = "smart-splits";
src = fetchFromGitHub {
@ -17,128 +16,127 @@
repo = "smart-splits.nvim";
rev = "95833675cd92538bf9cded1d2d58d1fc271c5428";
hash = "sha256-TsEzHalLTLp9USV0aGRadAObViC/OpIJeuEJ95lJUL8=";
};
};
};
regexplainer = buildVimPlugin {
name = "nvim-regexplainer";
src = fetchFromGitHub {
owner = "bennypowers";
repo = "nvim-regexplainer";
rev = "4250c8f3c1307876384e70eeedde5149249e154f";
hash = "sha256-15DLbKtOgUPq4DcF71jFYu31faDn52k3P1x47GL3+b0=";
};
regexplainer = buildVimPlugin {
name = "nvim-regexplainer";
src = fetchFromGitHub {
owner = "bennypowers";
repo = "nvim-regexplainer";
rev = "4250c8f3c1307876384e70eeedde5149249e154f";
hash = "sha256-15DLbKtOgUPq4DcF71jFYu31faDn52k3P1x47GL3+b0=";
};
};
specs-nvim = buildVimPlugin {
name = "specs.nvim";
src = fetchFromGitHub {
owner = "notashelf";
repo = "specs.nvim";
rev = "0792aaebf8cbac0c8545c43ad648b98deb83af42";
hash = "sha256-doHE/3bRuC8lyYxMk927JmwLfiy7aR22+i+BNefEGJ4=";
};
specs-nvim = buildVimPlugin {
name = "specs.nvim";
src = fetchFromGitHub {
owner = "notashelf";
repo = "specs.nvim";
rev = "0792aaebf8cbac0c8545c43ad648b98deb83af42";
hash = "sha256-doHE/3bRuC8lyYxMk927JmwLfiy7aR22+i+BNefEGJ4=";
};
};
deferred-clipboard = buildVimPlugin {
name = "deferred-clipboard";
src = fetchFromGitHub {
owner = "EtiamNullam";
repo = "deferred-clipboard.nvim";
rev = "810a29d166eaa41afc220cc7cd85eeaa3c43b37f";
hash = "sha256-nanNQEtpjv0YKEkkrPmq/5FPxq+Yj/19cs0Gf7YgKjU=";
};
deferred-clipboard = buildVimPlugin {
name = "deferred-clipboard";
src = fetchFromGitHub {
owner = "EtiamNullam";
repo = "deferred-clipboard.nvim";
rev = "810a29d166eaa41afc220cc7cd85eeaa3c43b37f";
hash = "sha256-nanNQEtpjv0YKEkkrPmq/5FPxq+Yj/19cs0Gf7YgKjU=";
};
/*
data-viewer-nvim = buildVimPlugin {
name = "data-viewer.nvim";
src = fetchFromGitHub {
owner = "VidocqH";
repo = "data-viewer.nvim";
rev = "40ddf37bb7ab6c04ff9e820812d1539afe691668";
hash = "sha256-D5hvLhsYski11H9qiDDL2zlZMtYmbpHgpewiWR6C7rE=";
};
};
/*
data-viewer-nvim = buildVimPlugin {
name = "data-viewer.nvim";
src = fetchFromGitHub {
owner = "VidocqH";
repo = "data-viewer.nvim";
rev = "40ddf37bb7ab6c04ff9e820812d1539afe691668";
hash = "sha256-D5hvLhsYski11H9qiDDL2zlZMtYmbpHgpewiWR6C7rE=";
};
*/
vim-nftables = buildVimPlugin {
name = "vim-nftables";
src = fetchFromGitHub {
owner = "awisse";
repo = "vim-nftables";
rev = "bc29309080b4c7e1888ffb1a830846be16e5b8e7";
hash = "sha256-L1x3Hv95t/DBBrLtPBKrqaTbIPor/NhVuEHVIYo/OaA=";
};
};
*/
vim-nftables = buildVimPlugin {
name = "vim-nftables";
src = fetchFromGitHub {
owner = "awisse";
repo = "vim-nftables";
rev = "bc29309080b4c7e1888ffb1a830846be16e5b8e7";
hash = "sha256-L1x3Hv95t/DBBrLtPBKrqaTbIPor/NhVuEHVIYo/OaA=";
};
};
neotab-nvim = buildVimPlugin {
name = "neotab.nvim";
src = fetchFromGitHub {
owner = "kawre";
repo = "neotab.nvim";
rev = "6c6107dddaa051504e433608f59eca606138269b";
hash = "sha256-bSFKbjj8fJHdfBzYoQ9l3NU0GAYfdfCbESKbwdbLNSw=";
};
neotab-nvim = buildVimPlugin {
name = "neotab.nvim";
src = fetchFromGitHub {
owner = "kawre";
repo = "neotab.nvim";
rev = "6c6107dddaa051504e433608f59eca606138269b";
hash = "sha256-bSFKbjj8fJHdfBzYoQ9l3NU0GAYfdfCbESKbwdbLNSw=";
};
};
};
in {
programs.neovim-flake.settings.vim.extraPlugins = {
# plugins that are pulled from nixpkgs
direnv = {package = direnv-vim;};
friendly-snippets = {package = friendly-snippets;};
mkdir-nvim = {package = mkdir-nvim;};
aerial = {
package = aerial-nvim;
setup = "require('aerial').setup {}";
};
/*
direnv = {package = direnv-vim;};
friendly-snippets = {package = friendly-snippets;};
mkdir-nvim = {package = mkdir-nvim;};
lazygit-nvim = {package = lazygit-nvim;};
aerial = {
package = aerial-nvim;
setup = "require('aerial').setup {}";
};
nvim-surround = {
package = nvim-surround;
setup = "require('nvim-surround').setup {}";
};
nvim-surround = {
package = nvim-surround;
setup = "require('nvim-surround').setup {}";
};
undotree = {
package = undotree;
setup = ''
vim.g.undotree_ShortIndicators = true
vim.g.undotree_TreeVertShape = '│'
'';
};
undotree = {
package = undotree;
setup = ''
vim.g.undotree_ShortIndicators = true
vim.g.undotree_TreeVertShape = '│'
'';
};
ssr-nvim = {
package = ssr-nvim;
setup = "require('ssr').setup {}";
};
ssr-nvim = {
package = ssr-nvim;
setup = "require('ssr').setup {}";
};
legendary = {
package = legendary-nvim;
setup = ''
require('legendary').setup {};
'';
};
legendary = {
package = legendary-nvim;
setup = ''
require('legendary').setup {};
'';
};
# plugins that are built from their sources
regexplainer = {package = pluginSources.regexplainer;};
vim-nftables = {package = pluginSources.vim-nftables;};
/*
data-view = {
package = pluginSources.data-viewer-nvim;
setup = ''
-- open data files in data-viewer.nvim
vim.api.nvim_exec([[
autocmd BufReadPost,BufNewFile *.sqlite,*.csv,*.tsv DataViewer
]], false)
# plugins that are built from their sources
regexplainer = {package = pluginSources.regexplainer;};
vim-nftables = {package = pluginSources.vim-nftables;};
/*
data-view = {
package = pluginSources.data-viewer-nvim;
setup = ''
-- open data files in data-viewer.nvim
vim.api.nvim_exec([[
autocmd BufReadPost,BufNewFile *.sqlite,*.csv,*.tsv DataViewer
]], false)
-- keybinds
vim.api.nvim_set_keymap('n', '<leader>dv', ':DataViewer<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>dvn', ':DataViewerNextTable<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>dvp', ':DataViewerPrevTable<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>dvc', ':DataViewerClose<CR>', {noremap = true})
'';
};
*/
-- keybinds
vim.api.nvim_set_keymap('n', '<leader>dv', ':DataViewer<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>dvn', ':DataViewerNextTable<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>dvp', ':DataViewerPrevTable<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>dvc', ':DataViewerClose<CR>', {noremap = true})
'';
};
smart-splits = {
package = pluginSources.smart-splits;
setup = "require('smart-splits').setup {}";
@ -204,5 +202,6 @@ in {
vim.api.nvim_set_keymap('n', 'N', 'N:lua require("specs").show_specs()<CR>', { noremap = true, silent = true })
'';
};
*/
};
}

4
modules/editors/nvf/plugins/settings/assistant.nix
View file

@ -1,8 +1,8 @@
_:{
programs.neovim-flake.settings.vim = {
assistant.copilot = {
enable = true;
cmp.enable = true;
enable = false;
cmp.enable = false;
};
};
}

2
modules/editors/nvf/plugins/settings/autocomplete.nix
View file

@ -5,7 +5,7 @@ _:{
type = "nvim-cmp";
mappings = {
# close = "<C-e>";
confirm = "<C-y>";
# confirm = "<tab>";
next = "<C-n>";
previous = "<C-p>";
scrollDocsDown = "<C-j>";

4
modules/editors/nvf/plugins/settings/autopairs.nix
View file

@ -1,6 +1,4 @@
{config, ...}: let
inherit (config.modules.other.system) username;
in {
_: {
programs.neovim-flake.settings.vim = {
autopairs.enable = true;
};

2
modules/editors/nvf/plugins/settings/dashboard.nix
View file

@ -3,7 +3,7 @@
in {
programs.neovim-flake.settings.vim = {
dashboard = {
alpha.enable = true;
alpha.enable = false;
};
};
}

5
modules/editors/nvf/plugins/settings/filetree.nix
View file

@ -1,6 +1,4 @@
{config, ...}: let
inherit (config.modules.other.system) username;
in {
_: {
programs.neovim-flake.settings.vim = {
filetree = {
nvimTree = {
@ -9,6 +7,7 @@ in {
mappings = {
#toggle = "<C-w>";
toggle = "<leader>e";
};
setupOpts = {

2
modules/editors/nvf/plugins/settings/git.nix
View file

@ -1,4 +1,4 @@
_:{
_: {
programs.neovim-flake.settings.vim = {
git = {
enable = true;

2
modules/editors/nvf/plugins/settings/languages.nix
View file

@ -1,4 +1,4 @@
_:{
_: {
programs.neovim-flake.settings.vim = {
languages = {
enableLSP = true;

6
modules/editors/nvf/plugins/settings/lsp.nix
View file

@ -1,4 +1,4 @@
_:{
_: {
programs.neovim-flake.settings.vim = {
lsp = {
formatOnSave = true;
@ -8,8 +8,8 @@ _:{
lspsaga.enable = false;
lspSignature.enable = true;
nvimCodeActionMenu.enable = true;
trouble.enable = false;
nvim-docs-view.enable = true;
# trouble.enable = false;
# nvim-docs-view.enable = true;
};
};
}

2
modules/editors/nvf/plugins/settings/notify.nix
View file

@ -3,7 +3,7 @@
in {
programs.neovim-flake.settings.vim = {
notify = {
nvim-notify.enable = true;
nvim-notify.enable = true;
};
};
}

4
modules/editors/nvf/plugins/settings/statusline.nix
View file

@ -1,6 +1,4 @@
{config, ...}: let
inherit (config.modules.other.system) username;
in {
_: {
programs.neovim-flake.settings.vim = {
statusline = {
lualine = {

4
modules/editors/nvf/plugins/settings/tabline.nix
View file

@ -1,6 +1,4 @@
{config, ...}: let
inherit (config.modules.other.system) username;
in {
_: {
programs.neovim-flake.settings.vim = {
tabline = {
nvimBufferline.enable = true;

5
modules/editors/nvf/plugins/settings/terminal.nix
View file

@ -1,8 +1,8 @@
_:{
_: {
programs.neovim-flake.settings.vim = {
terminal = {
toggleterm = {
enable = true;
enable = false;
mappings.open = "<C-t>";
setupOpts = {
@ -10,7 +10,6 @@ _:{
lazygit = {
enable = true;
direction = "tab";
mappings.open = "<leader>gg";
};
};
};

8
modules/editors/nvf/plugins/settings/ui.nix
View file

@ -9,15 +9,15 @@ in {
ui = {
noice.enable = true;
colorizer.enable = true;
modes-nvim.enable = false;
modes-nvim.enable = true;
illuminate.enable = true;
breadcrumbs = {
enable = true;
source = "nvim-navic";
navbuddy.enable = false;
};
smartcolumn = {
enable = true;
setupOpts = {
@ -30,7 +30,7 @@ in {
};
};
};
borders = {
enable = true;
globalStyle = "rounded";

30
modules/editors/nvf/plugins/settings/utility.nix
View file

@ -1,30 +1,24 @@
{
config,
pkgs,
...
}: let
inherit (config.modules.other.system) username;
in {
{pkgs, ...}: {
programs.neovim-flake.settings.vim = {
utility = {
ccc.enable = true;
icon-picker.enable = true;
diffview-nvim.enable = true;
#
vim-wakatime = {
enable = true;
cli-package = pkgs.wakatime-cli;
};
motion = {
hop.enable = true;
leap.enable = false;
};
preview = {
glow.enable = true;
markdownPreview.enable = true;
};
#
# motion = {
# hop.enable = false;
# leap.enable = false;
# };
#
# preview = {
# glow.enable = true;
# markdownPreview.enable = true;
# };
};
};
}

2
modules/editors/nvf/plugins/settings/visuals.nix
View file

@ -5,7 +5,7 @@ in {
visuals = {
enable = true;
nvimWebDevicons.enable = true;
scrollBar.enable = true;
scrollBar.enable = false;
smoothScroll.enable = false;
cellularAutomaton.enable = false;
highlight-undo.enable = true;