From fea17cb5c155d7e3f68c04f4eb2d14a6c6c22da7 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 7 Jul 2024 23:45:18 +0200 Subject: [PATCH] nvf finally working well! --- hosts/vali/hermit/configuration.nix | 9 +- hosts/vali/hermit/programs.nix | 2 +- modules/editors/default.nix | 2 +- modules/editors/nvf/default.nix | 33 ++- modules/editors/nvf/mappings/normal.nix | 12 +- modules/editors/nvf/{nvf.nix => nvf.bak} | 0 modules/editors/nvf/plugins/extra.nix | 203 +++++++++--------- .../nvf/plugins/settings/assistant.nix | 4 +- .../nvf/plugins/settings/autocomplete.nix | 2 +- .../nvf/plugins/settings/autopairs.nix | 4 +- .../nvf/plugins/settings/dashboard.nix | 2 +- .../editors/nvf/plugins/settings/filetree.nix | 5 +- modules/editors/nvf/plugins/settings/git.nix | 2 +- .../nvf/plugins/settings/languages.nix | 2 +- modules/editors/nvf/plugins/settings/lsp.nix | 6 +- .../editors/nvf/plugins/settings/notify.nix | 2 +- .../nvf/plugins/settings/statusline.nix | 4 +- .../editors/nvf/plugins/settings/tabline.nix | 4 +- .../editors/nvf/plugins/settings/terminal.nix | 5 +- modules/editors/nvf/plugins/settings/ui.nix | 8 +- .../editors/nvf/plugins/settings/utility.nix | 30 ++- .../editors/nvf/plugins/settings/visuals.nix | 2 +- modules/editors/nvf/settings.nix | 53 ++--- modules/tui/default.nix | 2 +- 24 files changed, 209 insertions(+), 189 deletions(-) rename modules/editors/nvf/{nvf.nix => nvf.bak} (100%) diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix index 3f5f710..f676c71 100644 --- a/hosts/vali/hermit/configuration.nix +++ b/hosts/vali/hermit/configuration.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { # allow unfree packages nixpkgs.config.allowUnfree = true; # Time Zone @@ -12,6 +16,7 @@ trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; + trusted-users = ["root" "${config.modules.other.system.username}"]; # enable flakes experimental-features = ["nix-command" "flakes"]; # reduce file size used & automatic garbage collector @@ -81,7 +86,7 @@ }; helix.enable = true; kakoune.enable = true; - nixvim.enable = false; # broken at the moment + # nixvim.enable = false; # broken at the moment neovim.enable = true; }; services = { diff --git a/hosts/vali/hermit/programs.nix b/hosts/vali/hermit/programs.nix index e0a765e..ca137d7 100644 --- a/hosts/vali/hermit/programs.nix +++ b/hosts/vali/hermit/programs.nix @@ -14,6 +14,7 @@ in { bluetuith bluez bun + cachix cmake difftastic dig @@ -45,7 +46,6 @@ in { gnome.nautilus ncmpcpp neofetch - neovim networkmanagerapplet nextcloud-client nicotine-plus diff --git a/modules/editors/default.nix b/modules/editors/default.nix index 96daa3e..4ae6df9 100644 --- a/modules/editors/default.nix +++ b/modules/editors/default.nix @@ -1 +1 @@ -_: {imports = [./emacs.nix ./helix.nix ./kakoune.nix ./nixvim/nixvim.nix ./nvf];} +_: {imports = [./emacs.nix ./helix.nix ./kakoune.nix ./nvf];} diff --git a/modules/editors/nvf/default.nix b/modules/editors/nvf/default.nix index 9cbeccc..22fe562 100644 --- a/modules/editors/nvf/default.nix +++ b/modules/editors/nvf/default.nix @@ -1,4 +1,5 @@ { + pkgs, config, lib, inputs, @@ -11,20 +12,44 @@ mkNeovimModule = { path, - ingoredPaths ? [./nvf.nix ./plugins/sources/default.nix], + ignoredPaths ? [./nvf.nix ./plugins/sources/default.nix ./plugins], }: filter (hasSuffix ".nix") ( map toString ( - filter (path: path != ./default.nix && !elem path ingoredPaths) (listFilesRecursive path) + filter (path: path != ./default.nix && !elem path ignoredPaths) (listFilesRecursive path) ) ); nvf = inputs.neovim-flake; in { -imports = concatLists [ + environment.systemPackages = with pkgs; [ + typstyle + ]; + imports = concatLists [ # neovim-flake home-manager module [nvf.nixosModules.default] - + # [./plugins/settings/ui.nix] + # [./plugins/settings/filetree.nix] + # [ + # ./plugins/settings/autocomplete.nix + # ./plugins/settings/visuals.nix + # ./plugins/settings/autopairs.nix + # ./plugins/settings/binds.nix + # ./plugins/settings/comments.nix + # ./plugins/settings/dashboard.nix + # ./plugins/settings/debugger.nix + # ./plugins/settings/languages.nix + # ./plugins/settings/lsp.nix + # ./plugins/settings/telescope.nix + # ./plugins/settings/notes.nix + # ./plugins/settings/notify.nix + # ./plugins/settings/projects.nix + # ./plugins/settings/statusline.nix + # ./plugins/settings/tabline.nix + # ./plugins/settings/theme.nix + # ./plugins/settings/treesitter.nix + # ./plugins/settings/utility.nix + # ./plugins/settings/git.nix # construct this entore directory as a module # which means all default.nix files will be imported automtically (mkNeovimModule {path = ./.;}) diff --git a/modules/editors/nvf/mappings/normal.nix b/modules/editors/nvf/mappings/normal.nix index 947b800..2b2b585 100644 --- a/modules/editors/nvf/mappings/normal.nix +++ b/modules/editors/nvf/mappings/normal.nix @@ -1,13 +1,14 @@ { programs.neovim-flake.settings.vim.maps = { normal = { + /* # General "fd".action = ":lua vim.g.formatsave = not vim.g.formatsave"; "zt".action = ":let g:default_terminal = v:count1"; - "e".action = ":NvimTreeToggle"; - "ld".action = ":lua vim.diagnostic.setqflist({open = true})"; - "lf".action = ":lua vim.lsp.buf.format()"; - "li".action = ":lua vim.lsp.buf.implementation()"; + #"e".action = ":NvimTreeToggle"; + # "ld".action = ":lua vim.diagnostic.setqflist({open = true})"; + # "lf".action = ":lua vim.lsp.buf.format()"; + # "li".action = ":lua vim.lsp.buf.implementation()"; ";".action = "A;"; # Append # # Diffview @@ -44,9 +45,11 @@ # vsnip #"".action = "(vsnip-jump-next)"; #"".action = "(vsnip-jump-prev)"; + */ }; normalVisualOp = { + /* "gs".action = ":Gitsigns stage_hunk"; "gr".action = ":Gitsigns reset_hunk"; "lr".action = "lua vim.lsp.buf.references()"; @@ -60,6 +63,7 @@ action = "':ToggleTermSendVisualLines ' . v:count == 0 ? g:default_terminal : v:count"; expr = true; }; + */ }; }; } diff --git a/modules/editors/nvf/nvf.nix b/modules/editors/nvf/nvf.bak similarity index 100% rename from modules/editors/nvf/nvf.nix rename to modules/editors/nvf/nvf.bak diff --git a/modules/editors/nvf/plugins/extra.nix b/modules/editors/nvf/plugins/extra.nix index c504fe0..cde7908 100644 --- a/modules/editors/nvf/plugins/extra.nix +++ b/modules/editors/nvf/plugins/extra.nix @@ -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', 'dv', ':DataViewer', {noremap = true}) - vim.api.nvim_set_keymap('n', 'dvn', ':DataViewerNextTable', {noremap = true}) - vim.api.nvim_set_keymap('n', 'dvp', ':DataViewerPrevTable', {noremap = true}) - vim.api.nvim_set_keymap('n', 'dvc', ':DataViewerClose', {noremap = true}) - ''; - }; -*/ - + -- keybinds + vim.api.nvim_set_keymap('n', 'dv', ':DataViewer', {noremap = true}) + vim.api.nvim_set_keymap('n', 'dvn', ':DataViewerNextTable', {noremap = true}) + vim.api.nvim_set_keymap('n', 'dvp', ':DataViewerPrevTable', {noremap = true}) + vim.api.nvim_set_keymap('n', 'dvc', ':DataViewerClose', {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()', { noremap = true, silent = true }) ''; }; + */ }; } diff --git a/modules/editors/nvf/plugins/settings/assistant.nix b/modules/editors/nvf/plugins/settings/assistant.nix index 8b7fca6..2ea44c6 100644 --- a/modules/editors/nvf/plugins/settings/assistant.nix +++ b/modules/editors/nvf/plugins/settings/assistant.nix @@ -1,8 +1,8 @@ _:{ programs.neovim-flake.settings.vim = { assistant.copilot = { - enable = true; - cmp.enable = true; + enable = false; + cmp.enable = false; }; }; } diff --git a/modules/editors/nvf/plugins/settings/autocomplete.nix b/modules/editors/nvf/plugins/settings/autocomplete.nix index 9bb0f6f..223a6a5 100644 --- a/modules/editors/nvf/plugins/settings/autocomplete.nix +++ b/modules/editors/nvf/plugins/settings/autocomplete.nix @@ -5,7 +5,7 @@ _:{ type = "nvim-cmp"; mappings = { # close = ""; - confirm = ""; + # confirm = ""; next = ""; previous = ""; scrollDocsDown = ""; diff --git a/modules/editors/nvf/plugins/settings/autopairs.nix b/modules/editors/nvf/plugins/settings/autopairs.nix index 6b84dab..58e927d 100644 --- a/modules/editors/nvf/plugins/settings/autopairs.nix +++ b/modules/editors/nvf/plugins/settings/autopairs.nix @@ -1,6 +1,4 @@ -{config, ...}: let - inherit (config.modules.other.system) username; -in { +_: { programs.neovim-flake.settings.vim = { autopairs.enable = true; }; diff --git a/modules/editors/nvf/plugins/settings/dashboard.nix b/modules/editors/nvf/plugins/settings/dashboard.nix index 85d9824..6f041e6 100644 --- a/modules/editors/nvf/plugins/settings/dashboard.nix +++ b/modules/editors/nvf/plugins/settings/dashboard.nix @@ -3,7 +3,7 @@ in { programs.neovim-flake.settings.vim = { dashboard = { - alpha.enable = true; + alpha.enable = false; }; }; } diff --git a/modules/editors/nvf/plugins/settings/filetree.nix b/modules/editors/nvf/plugins/settings/filetree.nix index b66dfa5..364c98e 100644 --- a/modules/editors/nvf/plugins/settings/filetree.nix +++ b/modules/editors/nvf/plugins/settings/filetree.nix @@ -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 = ""; + toggle = "e"; }; setupOpts = { diff --git a/modules/editors/nvf/plugins/settings/git.nix b/modules/editors/nvf/plugins/settings/git.nix index 3fb84d4..566460b 100644 --- a/modules/editors/nvf/plugins/settings/git.nix +++ b/modules/editors/nvf/plugins/settings/git.nix @@ -1,4 +1,4 @@ -_:{ +_: { programs.neovim-flake.settings.vim = { git = { enable = true; diff --git a/modules/editors/nvf/plugins/settings/languages.nix b/modules/editors/nvf/plugins/settings/languages.nix index 776934e..2ecb54f 100644 --- a/modules/editors/nvf/plugins/settings/languages.nix +++ b/modules/editors/nvf/plugins/settings/languages.nix @@ -1,4 +1,4 @@ -_:{ +_: { programs.neovim-flake.settings.vim = { languages = { enableLSP = true; diff --git a/modules/editors/nvf/plugins/settings/lsp.nix b/modules/editors/nvf/plugins/settings/lsp.nix index cfd45b1..34ded6c 100644 --- a/modules/editors/nvf/plugins/settings/lsp.nix +++ b/modules/editors/nvf/plugins/settings/lsp.nix @@ -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; }; }; } diff --git a/modules/editors/nvf/plugins/settings/notify.nix b/modules/editors/nvf/plugins/settings/notify.nix index eb19037..add20a2 100644 --- a/modules/editors/nvf/plugins/settings/notify.nix +++ b/modules/editors/nvf/plugins/settings/notify.nix @@ -3,7 +3,7 @@ in { programs.neovim-flake.settings.vim = { notify = { - nvim-notify.enable = true; + nvim-notify.enable = true; }; }; } diff --git a/modules/editors/nvf/plugins/settings/statusline.nix b/modules/editors/nvf/plugins/settings/statusline.nix index 20c9ff9..75bcbfc 100644 --- a/modules/editors/nvf/plugins/settings/statusline.nix +++ b/modules/editors/nvf/plugins/settings/statusline.nix @@ -1,6 +1,4 @@ -{config, ...}: let - inherit (config.modules.other.system) username; -in { +_: { programs.neovim-flake.settings.vim = { statusline = { lualine = { diff --git a/modules/editors/nvf/plugins/settings/tabline.nix b/modules/editors/nvf/plugins/settings/tabline.nix index 43d1aba..111c391 100644 --- a/modules/editors/nvf/plugins/settings/tabline.nix +++ b/modules/editors/nvf/plugins/settings/tabline.nix @@ -1,6 +1,4 @@ -{config, ...}: let - inherit (config.modules.other.system) username; -in { +_: { programs.neovim-flake.settings.vim = { tabline = { nvimBufferline.enable = true; diff --git a/modules/editors/nvf/plugins/settings/terminal.nix b/modules/editors/nvf/plugins/settings/terminal.nix index 17f6bec..875f075 100644 --- a/modules/editors/nvf/plugins/settings/terminal.nix +++ b/modules/editors/nvf/plugins/settings/terminal.nix @@ -1,8 +1,8 @@ -_:{ +_: { programs.neovim-flake.settings.vim = { terminal = { toggleterm = { - enable = true; + enable = false; mappings.open = ""; setupOpts = { @@ -10,7 +10,6 @@ _:{ lazygit = { enable = true; direction = "tab"; - mappings.open = "gg"; }; }; }; diff --git a/modules/editors/nvf/plugins/settings/ui.nix b/modules/editors/nvf/plugins/settings/ui.nix index af157c1..b321846 100644 --- a/modules/editors/nvf/plugins/settings/ui.nix +++ b/modules/editors/nvf/plugins/settings/ui.nix @@ -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"; diff --git a/modules/editors/nvf/plugins/settings/utility.nix b/modules/editors/nvf/plugins/settings/utility.nix index f84616e..4d51fbd 100644 --- a/modules/editors/nvf/plugins/settings/utility.nix +++ b/modules/editors/nvf/plugins/settings/utility.nix @@ -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; + # }; }; }; } diff --git a/modules/editors/nvf/plugins/settings/visuals.nix b/modules/editors/nvf/plugins/settings/visuals.nix index ca853c9..2635023 100644 --- a/modules/editors/nvf/plugins/settings/visuals.nix +++ b/modules/editors/nvf/plugins/settings/visuals.nix @@ -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; diff --git a/modules/editors/nvf/settings.nix b/modules/editors/nvf/settings.nix index 70d9eb6..bd75f22 100644 --- a/modules/editors/nvf/settings.nix +++ b/modules/editors/nvf/settings.nix @@ -38,7 +38,7 @@ in { # alternatively, neovim-nightly from the neovim-nightly overlay # via inputs.neovim-nightly.packages.${pkgs.stdenv.system}.neovim package = pkgs.neovim-unwrapped; - + /* viAlias = true; vimAlias = true; @@ -51,49 +51,50 @@ in { spellcheck = { enable = true; # TODO add de - languages = ["en"]; + languages = ["en" "de"]; }; enableLuaLoader = true; enableEditorconfig = true; - debugMode = { - enable = false; - logFile = "/tmp/nvim.log"; - }; + debugMode = { + enable = false; + logFile = "/tmp/nvim.log"; + }; - additionalRuntimePaths = [ - (mkRuntimeDir "after") - (mkRuntimeDir "spell") - ]; + additionalRuntimePaths = [ + (mkRuntimeDir "after") + (mkRuntimeDir "spell") + ]; # while I should be doing this in luaConfigRC below # I have come to realise that spellfile contents are # actually **not** loaded when luaConfigRC is used. # as spellfile is a vim thing, this should be fine - configRC.spellfile = entryAnywhere '' - set spellfile=${toString ./spell/runtime/en.utf-8.add} " toString sanitizes the path - ''; + # configRC.spellfile = entryAnywhere '' + # set spellfile=${toString ./spell/runtime/en.utf-8.add} " toString sanitizes the path + # ''; # additional lua configuration that I can append # or, to be more precise, randomly inject into # the lua configuration of my Neovim configuration # wrapper. this is recursively read from the lua # directory, so we do not need to use require - luaConfigRC = let - # get the name of each lua file in the lua directory, where setting files reside - # and import them recursively - configPaths = filter (hasSuffix ".lua") (map toString (listFilesRecursive ./lua)); + luaConfigRC = let + # get the name of each lua file in the lua directory, where setting files reside + # and import them recursively + configPaths = filter (hasSuffix ".lua") (map toString (listFilesRecursive ./lua)); - # generates a key-value pair that looks roughly as follows: - # ` = entryAnywhere ''''` - # which is expected by neovim-flake's modified DAG library - luaConfig = genAttrs configPaths (file: - entryBefore ["luaScript"] '' - ${fileContents "${file}"} - ''); - in - luaConfig; + # generates a key-value pair that looks roughly as follows: + # ` = entryAnywhere ''''` + # which is expected by neovim-flake's modified DAG library + luaConfig = genAttrs configPaths (file: + entryBefore ["luaScript"] '' + ${fileContents "${file}"} + ''); + in + luaConfig; + */ }; }; }; diff --git a/modules/tui/default.nix b/modules/tui/default.nix index 41054a3..080930f 100644 --- a/modules/tui/default.nix +++ b/modules/tui/default.nix @@ -1,3 +1,3 @@ _: { - imports = [./btop.nix ./neovim.nix ./newsboat.nix ./ncmpcpp.nix ./yazi.nix]; + imports = [./btop.nix ./newsboat.nix ./ncmpcpp.nix ./yazi.nix]; }