From 6f64253c4b5c9af88f22daf4bce9adf4c36cc99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Fri, 3 Apr 2026 18:09:20 +0200 Subject: [PATCH 1/3] permissions correct permissions of the scripts --- flake.lock | 42 +++++++++---------- home/programs/eww/src/scripts/audio.sh | 0 home/programs/eww/src/scripts/battery.sh | 0 home/programs/eww/src/scripts/cpu.sh | 0 home/programs/eww/src/scripts/memory.sh | 0 home/programs/eww/src/scripts/network.sh | 0 home/programs/eww/src/scripts/powermenu.sh | 0 home/programs/eww/src/scripts/ristate.sh | 0 home/programs/eww/src/scripts/ristate_read.sh | 0 home/programs/nixvim/plugins/aerial.nix | 7 ++++ home/programs/nixvim/plugins/default.nix | 1 + home/programs/river/src/lock.sh | 0 home/programs/river/src/logout.sh | 0 home/programs/river/src/startEww.sh | 0 14 files changed, 29 insertions(+), 21 deletions(-) mode change 100644 => 100755 home/programs/eww/src/scripts/audio.sh mode change 100644 => 100755 home/programs/eww/src/scripts/battery.sh mode change 100644 => 100755 home/programs/eww/src/scripts/cpu.sh mode change 100644 => 100755 home/programs/eww/src/scripts/memory.sh mode change 100644 => 100755 home/programs/eww/src/scripts/network.sh mode change 100644 => 100755 home/programs/eww/src/scripts/powermenu.sh mode change 100644 => 100755 home/programs/eww/src/scripts/ristate.sh mode change 100644 => 100755 home/programs/eww/src/scripts/ristate_read.sh create mode 100644 home/programs/nixvim/plugins/aerial.nix mode change 100644 => 100755 home/programs/river/src/lock.sh mode change 100644 => 100755 home/programs/river/src/logout.sh mode change 100644 => 100755 home/programs/river/src/startEww.sh diff --git a/flake.lock b/flake.lock index 6a5a741..a911c32 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1774898676, - "narHash": "sha256-0Utnqo+FbB+0CVUi0MI3oonF0Kuzy9VcgRkxl53Euvk=", + "lastModified": 1775143651, + "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a184bd2f8426087bae93f203403cd4b86c99e57d", + "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1774915815, - "narHash": "sha256-LocQzkSjVS4G0AKMBiEIVdBKCNTMZXQFjQMWFId4Jpg=", + "lastModified": 1775138742, + "narHash": "sha256-cyipL9p0VzyZT0wa+3KkeJYvtEYzyI1PjBOnGU8z3gI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9001416dc5d0ca24c8e4b5a44bfe7cd6fbeb1dd1", + "rev": "0fff256cfbc6978e711c43555df210d46940e943", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774925891, - "narHash": "sha256-8QGLGZJGnjPXFkWncYI9IXfUJEaPshX81W9LCJyQbGE=", + "lastModified": 1775098553, + "narHash": "sha256-OFWIVY1vzAbPE73ksKAMsFh11AXZ3MjIymRQ90Butnc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "01dbb479b5f70a18feaa6398077c3babba0d4ba9", + "rev": "361b17a5b2f4536a119c794a367a29b07691f941", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1774945141, - "narHash": "sha256-7k5Q/I5a1kyj/SmIFU4XIuKFqERi9IghJMSND6axHaI=", + "lastModified": 1775159663, + "narHash": "sha256-KES+OClaN0Vy/BkjW60UFo3dnQWpjkd1vIKEoynnlk0=", "owner": "nix-community", "repo": "NUR", - "rev": "17e9cbee8a24c796b9ea363d37417829b6af5131", + "rev": "008b7b102054965988abf26ea261314a2e6672d5", "type": "github" }, "original": { @@ -387,11 +387,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774925412, - "narHash": "sha256-z2QvGBCrVlSJZgQ/aTf9TdHJYbsFNUt4cG/cZ57X+bA=", + "lastModified": 1775132067, + "narHash": "sha256-JFcGvXwV9O55bUDY9MilD2+/qUPqYg9IHsdH6oJzCGw=", "owner": "sxyazi", "repo": "yazi", - "rev": "2514725e56c1b008911a2aee228b88783d27cdb0", + "rev": "86b8f0779ca5406fb6fead8c248d3ab23c9b1db0", "type": "github" }, "original": { diff --git a/home/programs/eww/src/scripts/audio.sh b/home/programs/eww/src/scripts/audio.sh old mode 100644 new mode 100755 diff --git a/home/programs/eww/src/scripts/battery.sh b/home/programs/eww/src/scripts/battery.sh old mode 100644 new mode 100755 diff --git a/home/programs/eww/src/scripts/cpu.sh b/home/programs/eww/src/scripts/cpu.sh old mode 100644 new mode 100755 diff --git a/home/programs/eww/src/scripts/memory.sh b/home/programs/eww/src/scripts/memory.sh old mode 100644 new mode 100755 diff --git a/home/programs/eww/src/scripts/network.sh b/home/programs/eww/src/scripts/network.sh old mode 100644 new mode 100755 diff --git a/home/programs/eww/src/scripts/powermenu.sh b/home/programs/eww/src/scripts/powermenu.sh old mode 100644 new mode 100755 diff --git a/home/programs/eww/src/scripts/ristate.sh b/home/programs/eww/src/scripts/ristate.sh old mode 100644 new mode 100755 diff --git a/home/programs/eww/src/scripts/ristate_read.sh b/home/programs/eww/src/scripts/ristate_read.sh old mode 100644 new mode 100755 diff --git a/home/programs/nixvim/plugins/aerial.nix b/home/programs/nixvim/plugins/aerial.nix new file mode 100644 index 0000000..b460d0f --- /dev/null +++ b/home/programs/nixvim/plugins/aerial.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + programs.nixvim.plugins = { + aerial.enable = true; + }; +} diff --git a/home/programs/nixvim/plugins/default.nix b/home/programs/nixvim/plugins/default.nix index 71053f7..56f491c 100644 --- a/home/programs/nixvim/plugins/default.nix +++ b/home/programs/nixvim/plugins/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./aerial.nix ./autopairs.nix ./barbar.nix ./bullets.nix diff --git a/home/programs/river/src/lock.sh b/home/programs/river/src/lock.sh old mode 100644 new mode 100755 diff --git a/home/programs/river/src/logout.sh b/home/programs/river/src/logout.sh old mode 100644 new mode 100755 diff --git a/home/programs/river/src/startEww.sh b/home/programs/river/src/startEww.sh old mode 100644 new mode 100755 From d7b58e22160fc65dc8dfe16a8b405bd03164bfa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Wed, 8 Apr 2026 10:13:11 +0200 Subject: [PATCH 2/3] nixvim install initial nixvim --- home/programs/nixvim-old/default.nix | 21 ++++ .../{nixvim => nixvim-old}/plugins/aerial.nix | 0 .../plugins/autopairs.nix | 0 .../{nixvim => nixvim-old}/plugins/barbar.nix | 0 .../plugins/bullets.nix | 0 .../{nixvim => nixvim-old}/plugins/cmp.nix | 0 .../plugins/comment-box.nix | 0 .../plugins/comment.nix | 0 .../plugins/conform.nix | 0 .../{nixvim => nixvim-old}/plugins/dap.nix | 0 home/programs/nixvim-old/plugins/default.nix | 54 ++++++++++ .../plugins/dynomark.nix | 0 .../{nixvim => nixvim-old}/plugins/edgy.nix | 0 .../plugins/gitsigns.nix | 0 .../plugins/haskell-tools.nix | 0 .../{nixvim => nixvim-old}/plugins/knap.nix | 0 .../{nixvim => nixvim-old}/plugins/leap.nix | 0 .../{nixvim => nixvim-old}/plugins/lsp.nix | 0 .../plugins/ltex-extra.nix | 0 .../plugins/lualine.nix | 0 .../plugins/markdown-preview.nix | 0 .../plugins/mkdnflow.nix | 0 .../plugins/neoscroll.nix | 0 .../plugins/neotree.nix | 0 .../{nixvim => nixvim-old}/plugins/noice.nix | 0 .../{nixvim => nixvim-old}/plugins/notify.nix | 0 .../{nixvim => nixvim-old}/plugins/oil.nix | 0 .../plugins/openscad.nix | 0 .../{nixvim => nixvim-old}/plugins/otter.nix | 0 .../{nixvim => nixvim-old}/plugins/papis.nix | 0 .../nixvim-old/plugins/render-markdown.nix | 29 +++++ .../plugins/smart-splits.nix | 0 .../plugins/snippets.nix | 0 .../plugins/sniprun.nix | 0 .../plugins/startup.nix | 0 .../plugins/surround.nix | 0 .../plugins/telescope.nix | 0 .../plugins/texpresso.nix | 0 .../plugins/todo-comments.nix | 0 .../plugins/treesitter.nix | 0 .../plugins/typst-preview.nix | 0 .../plugins/typst-vim.nix | 0 home/programs/nixvim-old/plugins/vimtex.nix | 40 +++++++ home/programs/nixvim/default.nix | 48 ++++----- home/programs/nixvim/plugins/css-color.nix | 8 ++ home/programs/nixvim/plugins/default.nix | 57 +++------- home/programs/nixvim/plugins/diffview.nix | 12 --- home/programs/nixvim/plugins/img-clip.nix | 22 ++++ home/programs/nixvim/plugins/lz-n.nix | 7 ++ home/programs/nixvim/plugins/peek.nix | 12 --- home/programs/nixvim/plugins/rainbow.nix | 100 ++++++++++++++++++ .../nixvim/plugins/render-markdown.nix | 46 ++++---- home/programs/nixvim/plugins/rustaceanvim.nix | 52 +++++++++ home/programs/nixvim/plugins/toggleterm.nix | 20 +++- home/programs/nixvim/plugins/trouble.nix | 2 + home/programs/nixvim/plugins/undotree.nix | 31 ++++++ home/programs/nixvim/plugins/unified.nix | 32 ++++++ home/programs/nixvim/plugins/web-devicons.nix | 10 +- home/programs/nixvim/plugins/which-key.nix | 10 +- home/programs/nixvim/plugins/wilder.nix | 51 +++++++++ home/programs/nixvim/plugins/yanky.nix | 69 ------------ home/programs/nixvim/plugins/yazi.nix | 40 +++++++ home/programs/nixvim/plugins/yuck.nix | 10 ++ home/programs/nixvim/plugins/zk.nix | 95 ----------------- 64 files changed, 592 insertions(+), 286 deletions(-) create mode 100644 home/programs/nixvim-old/default.nix rename home/programs/{nixvim => nixvim-old}/plugins/aerial.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/autopairs.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/barbar.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/bullets.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/cmp.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/comment-box.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/comment.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/conform.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/dap.nix (100%) create mode 100644 home/programs/nixvim-old/plugins/default.nix rename home/programs/{nixvim => nixvim-old}/plugins/dynomark.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/edgy.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/gitsigns.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/haskell-tools.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/knap.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/leap.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/lsp.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/ltex-extra.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/lualine.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/markdown-preview.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/mkdnflow.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/neoscroll.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/neotree.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/noice.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/notify.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/oil.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/openscad.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/otter.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/papis.nix (100%) create mode 100644 home/programs/nixvim-old/plugins/render-markdown.nix rename home/programs/{nixvim => nixvim-old}/plugins/smart-splits.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/snippets.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/sniprun.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/startup.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/surround.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/telescope.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/texpresso.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/todo-comments.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/treesitter.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/typst-preview.nix (100%) rename home/programs/{nixvim => nixvim-old}/plugins/typst-vim.nix (100%) create mode 100644 home/programs/nixvim-old/plugins/vimtex.nix create mode 100644 home/programs/nixvim/plugins/css-color.nix delete mode 100644 home/programs/nixvim/plugins/diffview.nix create mode 100644 home/programs/nixvim/plugins/img-clip.nix create mode 100644 home/programs/nixvim/plugins/lz-n.nix delete mode 100644 home/programs/nixvim/plugins/peek.nix create mode 100644 home/programs/nixvim/plugins/rainbow.nix create mode 100644 home/programs/nixvim/plugins/rustaceanvim.nix create mode 100644 home/programs/nixvim/plugins/unified.nix create mode 100644 home/programs/nixvim/plugins/wilder.nix delete mode 100644 home/programs/nixvim/plugins/yanky.nix create mode 100644 home/programs/nixvim/plugins/yazi.nix create mode 100644 home/programs/nixvim/plugins/yuck.nix delete mode 100644 home/programs/nixvim/plugins/zk.nix diff --git a/home/programs/nixvim-old/default.nix b/home/programs/nixvim-old/default.nix new file mode 100644 index 0000000..02ef072 --- /dev/null +++ b/home/programs/nixvim-old/default.nix @@ -0,0 +1,21 @@ +{ inputs, pkgs, ... }: + +{ + imports = [ + ./plugins + ]; + + programs.nixvim = { + extraPackages = with pkgs; [ + texliveFull + texlivePackages.standalone + texlivePackages.relsize # needed for BA + # papis-nvim + ]; + extraConfigVim = '' + filetype plugin on + set nocompatible + syntax on + ''; + }; +} diff --git a/home/programs/nixvim/plugins/aerial.nix b/home/programs/nixvim-old/plugins/aerial.nix similarity index 100% rename from home/programs/nixvim/plugins/aerial.nix rename to home/programs/nixvim-old/plugins/aerial.nix diff --git a/home/programs/nixvim/plugins/autopairs.nix b/home/programs/nixvim-old/plugins/autopairs.nix similarity index 100% rename from home/programs/nixvim/plugins/autopairs.nix rename to home/programs/nixvim-old/plugins/autopairs.nix diff --git a/home/programs/nixvim/plugins/barbar.nix b/home/programs/nixvim-old/plugins/barbar.nix similarity index 100% rename from home/programs/nixvim/plugins/barbar.nix rename to home/programs/nixvim-old/plugins/barbar.nix diff --git a/home/programs/nixvim/plugins/bullets.nix b/home/programs/nixvim-old/plugins/bullets.nix similarity index 100% rename from home/programs/nixvim/plugins/bullets.nix rename to home/programs/nixvim-old/plugins/bullets.nix diff --git a/home/programs/nixvim/plugins/cmp.nix b/home/programs/nixvim-old/plugins/cmp.nix similarity index 100% rename from home/programs/nixvim/plugins/cmp.nix rename to home/programs/nixvim-old/plugins/cmp.nix diff --git a/home/programs/nixvim/plugins/comment-box.nix b/home/programs/nixvim-old/plugins/comment-box.nix similarity index 100% rename from home/programs/nixvim/plugins/comment-box.nix rename to home/programs/nixvim-old/plugins/comment-box.nix diff --git a/home/programs/nixvim/plugins/comment.nix b/home/programs/nixvim-old/plugins/comment.nix similarity index 100% rename from home/programs/nixvim/plugins/comment.nix rename to home/programs/nixvim-old/plugins/comment.nix diff --git a/home/programs/nixvim/plugins/conform.nix b/home/programs/nixvim-old/plugins/conform.nix similarity index 100% rename from home/programs/nixvim/plugins/conform.nix rename to home/programs/nixvim-old/plugins/conform.nix diff --git a/home/programs/nixvim/plugins/dap.nix b/home/programs/nixvim-old/plugins/dap.nix similarity index 100% rename from home/programs/nixvim/plugins/dap.nix rename to home/programs/nixvim-old/plugins/dap.nix diff --git a/home/programs/nixvim-old/plugins/default.nix b/home/programs/nixvim-old/plugins/default.nix new file mode 100644 index 0000000..56f491c --- /dev/null +++ b/home/programs/nixvim-old/plugins/default.nix @@ -0,0 +1,54 @@ +{ + imports = [ + ./aerial.nix + ./autopairs.nix + ./barbar.nix + ./bullets.nix + ./cmp.nix + ./comment-box.nix + ./comment.nix + ./conform.nix + ./dap.nix + ./diffview.nix + ./dynomark.nix + ./edgy.nix + ./gitsigns.nix + ./haskell-tools.nix + ./knap.nix + ./leap.nix + ./lsp.nix + ./ltex-extra.nix + ./lualine.nix + ./markdown-preview.nix + ./mkdnflow.nix + ./neoscroll.nix + ./neotree.nix + ./noice.nix + ./notify.nix + ./oil.nix + ./openscad.nix + ./otter.nix + ./papis.nix + ./peek.nix + ./markdown-preview.nix + ./smart-splits.nix + ./snippets.nix + ./sniprun.nix + ./startup.nix + ./surround.nix + ./telescope.nix + ./texpresso.nix + ./todo-comments.nix + ./toggleterm.nix + ./treesitter.nix + ./trouble.nix + ./typst-preview.nix + ./typst-vim.nix + ./undotree.nix + ./vimtex.nix + ./web-devicons.nix + ./which-key.nix + ./yanky.nix + ./zk.nix + ]; +} diff --git a/home/programs/nixvim/plugins/dynomark.nix b/home/programs/nixvim-old/plugins/dynomark.nix similarity index 100% rename from home/programs/nixvim/plugins/dynomark.nix rename to home/programs/nixvim-old/plugins/dynomark.nix diff --git a/home/programs/nixvim/plugins/edgy.nix b/home/programs/nixvim-old/plugins/edgy.nix similarity index 100% rename from home/programs/nixvim/plugins/edgy.nix rename to home/programs/nixvim-old/plugins/edgy.nix diff --git a/home/programs/nixvim/plugins/gitsigns.nix b/home/programs/nixvim-old/plugins/gitsigns.nix similarity index 100% rename from home/programs/nixvim/plugins/gitsigns.nix rename to home/programs/nixvim-old/plugins/gitsigns.nix diff --git a/home/programs/nixvim/plugins/haskell-tools.nix b/home/programs/nixvim-old/plugins/haskell-tools.nix similarity index 100% rename from home/programs/nixvim/plugins/haskell-tools.nix rename to home/programs/nixvim-old/plugins/haskell-tools.nix diff --git a/home/programs/nixvim/plugins/knap.nix b/home/programs/nixvim-old/plugins/knap.nix similarity index 100% rename from home/programs/nixvim/plugins/knap.nix rename to home/programs/nixvim-old/plugins/knap.nix diff --git a/home/programs/nixvim/plugins/leap.nix b/home/programs/nixvim-old/plugins/leap.nix similarity index 100% rename from home/programs/nixvim/plugins/leap.nix rename to home/programs/nixvim-old/plugins/leap.nix diff --git a/home/programs/nixvim/plugins/lsp.nix b/home/programs/nixvim-old/plugins/lsp.nix similarity index 100% rename from home/programs/nixvim/plugins/lsp.nix rename to home/programs/nixvim-old/plugins/lsp.nix diff --git a/home/programs/nixvim/plugins/ltex-extra.nix b/home/programs/nixvim-old/plugins/ltex-extra.nix similarity index 100% rename from home/programs/nixvim/plugins/ltex-extra.nix rename to home/programs/nixvim-old/plugins/ltex-extra.nix diff --git a/home/programs/nixvim/plugins/lualine.nix b/home/programs/nixvim-old/plugins/lualine.nix similarity index 100% rename from home/programs/nixvim/plugins/lualine.nix rename to home/programs/nixvim-old/plugins/lualine.nix diff --git a/home/programs/nixvim/plugins/markdown-preview.nix b/home/programs/nixvim-old/plugins/markdown-preview.nix similarity index 100% rename from home/programs/nixvim/plugins/markdown-preview.nix rename to home/programs/nixvim-old/plugins/markdown-preview.nix diff --git a/home/programs/nixvim/plugins/mkdnflow.nix b/home/programs/nixvim-old/plugins/mkdnflow.nix similarity index 100% rename from home/programs/nixvim/plugins/mkdnflow.nix rename to home/programs/nixvim-old/plugins/mkdnflow.nix diff --git a/home/programs/nixvim/plugins/neoscroll.nix b/home/programs/nixvim-old/plugins/neoscroll.nix similarity index 100% rename from home/programs/nixvim/plugins/neoscroll.nix rename to home/programs/nixvim-old/plugins/neoscroll.nix diff --git a/home/programs/nixvim/plugins/neotree.nix b/home/programs/nixvim-old/plugins/neotree.nix similarity index 100% rename from home/programs/nixvim/plugins/neotree.nix rename to home/programs/nixvim-old/plugins/neotree.nix diff --git a/home/programs/nixvim/plugins/noice.nix b/home/programs/nixvim-old/plugins/noice.nix similarity index 100% rename from home/programs/nixvim/plugins/noice.nix rename to home/programs/nixvim-old/plugins/noice.nix diff --git a/home/programs/nixvim/plugins/notify.nix b/home/programs/nixvim-old/plugins/notify.nix similarity index 100% rename from home/programs/nixvim/plugins/notify.nix rename to home/programs/nixvim-old/plugins/notify.nix diff --git a/home/programs/nixvim/plugins/oil.nix b/home/programs/nixvim-old/plugins/oil.nix similarity index 100% rename from home/programs/nixvim/plugins/oil.nix rename to home/programs/nixvim-old/plugins/oil.nix diff --git a/home/programs/nixvim/plugins/openscad.nix b/home/programs/nixvim-old/plugins/openscad.nix similarity index 100% rename from home/programs/nixvim/plugins/openscad.nix rename to home/programs/nixvim-old/plugins/openscad.nix diff --git a/home/programs/nixvim/plugins/otter.nix b/home/programs/nixvim-old/plugins/otter.nix similarity index 100% rename from home/programs/nixvim/plugins/otter.nix rename to home/programs/nixvim-old/plugins/otter.nix diff --git a/home/programs/nixvim/plugins/papis.nix b/home/programs/nixvim-old/plugins/papis.nix similarity index 100% rename from home/programs/nixvim/plugins/papis.nix rename to home/programs/nixvim-old/plugins/papis.nix diff --git a/home/programs/nixvim-old/plugins/render-markdown.nix b/home/programs/nixvim-old/plugins/render-markdown.nix new file mode 100644 index 0000000..4ab73d4 --- /dev/null +++ b/home/programs/nixvim-old/plugins/render-markdown.nix @@ -0,0 +1,29 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ python312Packages.pylatexenc ]; + + programs.nixvim.plugins = { + render-markdown = { + enable = true; + settings = { + ft = [ + "markdown" + "quarto" + ]; + latex = { + enabled = false; + }; + completions = { + lsp = { + enabled = true; + }; + }; + }; + }; + + web-devicons = { + enable = true; + }; + }; +} diff --git a/home/programs/nixvim/plugins/smart-splits.nix b/home/programs/nixvim-old/plugins/smart-splits.nix similarity index 100% rename from home/programs/nixvim/plugins/smart-splits.nix rename to home/programs/nixvim-old/plugins/smart-splits.nix diff --git a/home/programs/nixvim/plugins/snippets.nix b/home/programs/nixvim-old/plugins/snippets.nix similarity index 100% rename from home/programs/nixvim/plugins/snippets.nix rename to home/programs/nixvim-old/plugins/snippets.nix diff --git a/home/programs/nixvim/plugins/sniprun.nix b/home/programs/nixvim-old/plugins/sniprun.nix similarity index 100% rename from home/programs/nixvim/plugins/sniprun.nix rename to home/programs/nixvim-old/plugins/sniprun.nix diff --git a/home/programs/nixvim/plugins/startup.nix b/home/programs/nixvim-old/plugins/startup.nix similarity index 100% rename from home/programs/nixvim/plugins/startup.nix rename to home/programs/nixvim-old/plugins/startup.nix diff --git a/home/programs/nixvim/plugins/surround.nix b/home/programs/nixvim-old/plugins/surround.nix similarity index 100% rename from home/programs/nixvim/plugins/surround.nix rename to home/programs/nixvim-old/plugins/surround.nix diff --git a/home/programs/nixvim/plugins/telescope.nix b/home/programs/nixvim-old/plugins/telescope.nix similarity index 100% rename from home/programs/nixvim/plugins/telescope.nix rename to home/programs/nixvim-old/plugins/telescope.nix diff --git a/home/programs/nixvim/plugins/texpresso.nix b/home/programs/nixvim-old/plugins/texpresso.nix similarity index 100% rename from home/programs/nixvim/plugins/texpresso.nix rename to home/programs/nixvim-old/plugins/texpresso.nix diff --git a/home/programs/nixvim/plugins/todo-comments.nix b/home/programs/nixvim-old/plugins/todo-comments.nix similarity index 100% rename from home/programs/nixvim/plugins/todo-comments.nix rename to home/programs/nixvim-old/plugins/todo-comments.nix diff --git a/home/programs/nixvim/plugins/treesitter.nix b/home/programs/nixvim-old/plugins/treesitter.nix similarity index 100% rename from home/programs/nixvim/plugins/treesitter.nix rename to home/programs/nixvim-old/plugins/treesitter.nix diff --git a/home/programs/nixvim/plugins/typst-preview.nix b/home/programs/nixvim-old/plugins/typst-preview.nix similarity index 100% rename from home/programs/nixvim/plugins/typst-preview.nix rename to home/programs/nixvim-old/plugins/typst-preview.nix diff --git a/home/programs/nixvim/plugins/typst-vim.nix b/home/programs/nixvim-old/plugins/typst-vim.nix similarity index 100% rename from home/programs/nixvim/plugins/typst-vim.nix rename to home/programs/nixvim-old/plugins/typst-vim.nix diff --git a/home/programs/nixvim-old/plugins/vimtex.nix b/home/programs/nixvim-old/plugins/vimtex.nix new file mode 100644 index 0000000..d5b38fe --- /dev/null +++ b/home/programs/nixvim-old/plugins/vimtex.nix @@ -0,0 +1,40 @@ +{ ... }: + +{ + programs.nixvim = { + plugins = { + vimtex = { + enable = true; + settings = { + view_automatic = false; + mappings_disable = { + "n" = [ "K" ]; + }; + }; + }; + }; + + autoGroups = { + "lazyvim_vimtex_conceal" = { + clear = true; + }; + }; + + autoCmd = [ + { + event = [ "FileType" ]; + group = "lazyvim_vimtex_conceal"; + pattern = [ + "bib" + "tex" + ]; + callback.__raw = # lua + '' + function () + vim.wo.conceallevel = 2 + end + ''; + } + ]; + }; +} diff --git a/home/programs/nixvim/default.nix b/home/programs/nixvim/default.nix index b005886..f3cfd11 100644 --- a/home/programs/nixvim/default.nix +++ b/home/programs/nixvim/default.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, ... }: +{ pkgs, inputs, ... }: { imports = [ @@ -6,38 +6,38 @@ ./plugins ]; - home.sessionVariables = { - EDITOR = "nvim"; - }; + home.sessionVariables.EDITOR = "nvim"; programs.nixvim = { enable = true; defaultEditor = true; - - nixpkgs.useGlobalPackages = false; - - clipboard = { - providers = { - wl-copy.enable = true; - }; - }; - - viAlias = true; - vimAlias = true; - - lualoader.enable = true; - - extraPackages = with pkgs; [ + extraPackages = with pkgs; [ # TODO: texliveFull texlivePackages.standalone texlivePackages.relsize # needed for BA # papis-nvim ]; - extraConfigVim = '' - filetype plugin on - set nocompatible - syntax on - ''; + + nixpkgs.useGlobalPackages = false; + + clipboard.providers.wl-copy.enable = true; + keymaps = [ + { + key = "Y"; + action = ''"+y''; + options.silent = true; + } + { + key = "P"; + action = ''"+p''; + options.silent = true; + } + ]; + + viAlias = true; + vimAlias = true; + + lualoader.enable = true; globals = { mapleader = " "; diff --git a/home/programs/nixvim/plugins/css-color.nix b/home/programs/nixvim/plugins/css-color.nix new file mode 100644 index 0000000..1f5eb12 --- /dev/null +++ b/home/programs/nixvim/plugins/css-color.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.nixvim.plugins.vim-css-color = { + enable = true; + lazyLoad.settings.filetypes = [ "css" ]; + }; +} diff --git a/home/programs/nixvim/plugins/default.nix b/home/programs/nixvim/plugins/default.nix index 56f491c..aad20b5 100644 --- a/home/programs/nixvim/plugins/default.nix +++ b/home/programs/nixvim/plugins/default.nix @@ -1,54 +1,21 @@ { imports = [ - ./aerial.nix - ./autopairs.nix - ./barbar.nix - ./bullets.nix - ./cmp.nix - ./comment-box.nix - ./comment.nix - ./conform.nix - ./dap.nix - ./diffview.nix - ./dynomark.nix - ./edgy.nix - ./gitsigns.nix - ./haskell-tools.nix - ./knap.nix - ./leap.nix - ./lsp.nix - ./ltex-extra.nix - ./lualine.nix - ./markdown-preview.nix - ./mkdnflow.nix - ./neoscroll.nix - ./neotree.nix - ./noice.nix - ./notify.nix - ./oil.nix - ./openscad.nix - ./otter.nix - ./papis.nix - ./peek.nix - ./markdown-preview.nix - ./smart-splits.nix - ./snippets.nix - ./sniprun.nix - ./startup.nix - ./surround.nix - ./telescope.nix - ./texpresso.nix - ./todo-comments.nix + ./css-color.nix + ./img-clip.nix + ./lz-n.nix + ./rainbow.nix + ./render-markdown.nix + ./rustaceanvim.nix ./toggleterm.nix - ./treesitter.nix ./trouble.nix - ./typst-preview.nix - ./typst-vim.nix ./undotree.nix - ./vimtex.nix + ./unified.nix ./web-devicons.nix ./which-key.nix - ./yanky.nix - ./zk.nix + ./wilder.nix + ./yazi.nix + ./yuck.nix + + ./vimtex.nix ]; } diff --git a/home/programs/nixvim/plugins/diffview.nix b/home/programs/nixvim/plugins/diffview.nix deleted file mode 100644 index 2b7bc78..0000000 --- a/home/programs/nixvim/plugins/diffview.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: - -{ - programs.nixvim = { - plugins = { - diffview = { - enable = true; - }; - }; - }; -} - diff --git a/home/programs/nixvim/plugins/img-clip.nix b/home/programs/nixvim/plugins/img-clip.nix new file mode 100644 index 0000000..139153a --- /dev/null +++ b/home/programs/nixvim/plugins/img-clip.nix @@ -0,0 +1,22 @@ +{ ... }: + +{ + programs.nixvim = { + plugins.img-clip = { + enable = true; + lazyLoad.settings.filetypes = [ + "md" + "tex" + "typ" + ]; + }; + + keymaps = [ + { + key = "p"; + action = "PasteImage"; + options.desc = "Paste image"; + } + ]; + }; +} diff --git a/home/programs/nixvim/plugins/lz-n.nix b/home/programs/nixvim/plugins/lz-n.nix new file mode 100644 index 0000000..ceac461 --- /dev/null +++ b/home/programs/nixvim/plugins/lz-n.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + programs.nixvim.plugins.lz-n = { + enable = true; + }; +} diff --git a/home/programs/nixvim/plugins/peek.nix b/home/programs/nixvim/plugins/peek.nix deleted file mode 100644 index fa9f229..0000000 --- a/home/programs/nixvim/plugins/peek.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - peek = { - enable = true; - settings = { - app = "firefox"; - }; - }; - }; -} diff --git a/home/programs/nixvim/plugins/rainbow.nix b/home/programs/nixvim/plugins/rainbow.nix new file mode 100644 index 0000000..24b06e8 --- /dev/null +++ b/home/programs/nixvim/plugins/rainbow.nix @@ -0,0 +1,100 @@ +{ pkgs, ... }: + +{ + programs.nixvim = { + plugins = { + rainbow = { + enable = true; + lazyLoad.settings.event = [ + "BufReadPost" + "BufNewFile" + ]; + + settings = { + active = 1; + conf = { + guifgs = [ + "#f5c2e7" + "#eba0ac" + "#a6e3a1" + "#74c7ec" + "#f5e0dc" + "#cba6f7" + "#fab387" + "#94e2d5" + "#89b4fa" + "#f2cdcd" + "#f38ba8" + "#f9e2af" + "#89dceb" + "#b4befe" + ]; + operators = "_,_"; + parentheses = [ + "start=/(/ end=/)/ fold" + "start=/{/ end=/}/ fold" + "start=/\\[/ end=/\\]/ fold" + "start=/\\begin/ end=/\\end/ fold" + ]; + separately = { + "*" = { + parentheses = [ + "start=/(/ end=/)/ fold" + "start=/{/ end=/}/ fold" + "start=/\\[/ end=/\\]/ fold" + ]; + }; + css = 0; + haskell = { + parentheses = [ + "start=/(/ end=/)/ fold" + "start=/\[/ end=/\]/ fold" + "start=/\v\{\ze[^-]/ end=/}/ fold" + ]; + }; + lisp = { + guifgs = [ + "#f5c2e7" + "#eba0ac" + "#a6e3a1" + "#74c7ec" + "#f5e0dc" + "#cba6f7" + "#fab387" + "#94e2d5" + "#89b4fa" + "#f2cdcd" + "#f38ba8" + "#f9e2af" + "#89dceb" + "#b4befe" + ]; + }; + markdown = { + parentheses_options = "containedin=markdownCode contained"; + }; + nerdtree = 0; + perl = { + syn_name_prefix = "perlBlockFoldRainbow"; + }; + stylus = { + parentheses = [ "start=/{/ end=/}/ fold contains=@colorableGroup" ]; + }; + tex = { + parentheses = [ + "start=/(/ end=/)/ fold" + "start=/{/ end=/}/ fold" + "start=/\\[/ end=/\\]/ fold" + "start=/\\begin/ end=/\\end/ fold" + ]; + }; + vim = { + parentheses_options = "containedin=vimFuncBody"; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/home/programs/nixvim/plugins/render-markdown.nix b/home/programs/nixvim/plugins/render-markdown.nix index 4ab73d4..5aef979 100644 --- a/home/programs/nixvim/plugins/render-markdown.nix +++ b/home/programs/nixvim/plugins/render-markdown.nix @@ -3,27 +3,37 @@ { home.packages = with pkgs; [ python312Packages.pylatexenc ]; - programs.nixvim.plugins = { - render-markdown = { - enable = true; - settings = { - ft = [ - "markdown" - "quarto" - ]; - latex = { - enabled = false; - }; - completions = { - lsp = { - enabled = true; - }; + programs.nixvim = { + plugins = { + render-markdown = { + enable = true; + lazyLoad.settings.filetypes = [ "md" ]; + + settings = { + ft = [ "markdown" ]; + latex.enabled = false; + completions.lsp.enabled = true; }; }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "m"; + group = "Markdown"; + icon = " "; + } + ]; }; - web-devicons = { - enable = true; - }; + keymaps = [ + { + action = "RenderMarkdown toggle"; + key = "mp"; + mode = "n"; + options = { + desc = "Toggle markdown preview"; + }; + } + ]; }; } diff --git a/home/programs/nixvim/plugins/rustaceanvim.nix b/home/programs/nixvim/plugins/rustaceanvim.nix new file mode 100644 index 0000000..649658e --- /dev/null +++ b/home/programs/nixvim/plugins/rustaceanvim.nix @@ -0,0 +1,52 @@ +{ pkgs, ... }: + +{ + programs.nixvim = { + extraPackages = with pkgs; [ rust-analyzer ]; + + plugins = { + rustaceanvim = { + enable = true; + lazyload.settings.filetype = "rs"; + }; + }; + + files = { + "ftplugin/rust.lua" = { + keymaps = [ + { + action.__raw = '' + function() + vim.cmd.RustAnalyzer('codeAction') + end + ''; + key = "a"; + mode = [ + "n" + ]; + options = { + desc = "Code action"; + silent = true; + buffer.__raw = "vim.api.nvim_get_current_buf()"; + }; + } + { + action.__raw = '' + function() + vim.cmd.RustAnalyzer({'hover', 'actions'}) + end + ''; + key = "K"; + mode = [ + "n" + ]; + options = { + silent = true; + buffer.__raw = "vim.api.nvim_get_current_buf()"; + }; + } + ]; + }; + }; + }; +} diff --git a/home/programs/nixvim/plugins/toggleterm.nix b/home/programs/nixvim/plugins/toggleterm.nix index e8c606c..696e114 100644 --- a/home/programs/nixvim/plugins/toggleterm.nix +++ b/home/programs/nixvim/plugins/toggleterm.nix @@ -5,18 +5,32 @@ plugins = { toggleterm = { enable = true; + lazyLoad.settings.cmd = [ + "ToggleTermSendCurrentLine" + "ToggleTermSendVisualLines" + "ToggleTermSendVisualSelection" + ]; + settings = { open_mapping.__raw = "[[]]"; insert_mappings = true; shade_terminals = false; }; }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "c"; + group = "Terminal"; + icon = " "; + } + ]; }; keymaps = [ { action = "ToggleTermSendCurrentLine"; - key = "sts"; + key = "cl"; mode = "n"; options = { desc = "Send Current Line"; @@ -24,7 +38,7 @@ } { action = "ToggleTermSendVisualLines"; - key = "stv"; + key = "cv"; mode = "x"; options = { desc = "Send all the (whole) lines in selection"; @@ -32,7 +46,7 @@ } { action = "ToggleTermSendVisualSelection"; - key = "sts"; + key = "cs"; mode = "x"; options = { desc = "Send selection"; diff --git a/home/programs/nixvim/plugins/trouble.nix b/home/programs/nixvim/plugins/trouble.nix index aef0736..ca829fc 100644 --- a/home/programs/nixvim/plugins/trouble.nix +++ b/home/programs/nixvim/plugins/trouble.nix @@ -5,6 +5,8 @@ plugins = { trouble = { enable = true; + lazyLoad.settings.cmd = "Trouble"; + settings = { modes = { diagnostics = { diff --git a/home/programs/nixvim/plugins/undotree.nix b/home/programs/nixvim/plugins/undotree.nix index ea56afa..ee90d3c 100644 --- a/home/programs/nixvim/plugins/undotree.nix +++ b/home/programs/nixvim/plugins/undotree.nix @@ -5,7 +5,38 @@ plugins = { undotree = { enable = true; + lazyLoad.settings.cmd = "UndotreeShow"; }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "t"; + group = "Undotree"; + icon = " "; + } + ]; }; + keymaps = [ + { + key = "th"; + action = "UndotreeHide"; + options.desc = "Hide undotree"; + } + { + key = "tf"; + action = "UndotreeFocus"; + options.desc = "Focus undotree"; + } + { + key = "tp"; + action = "UndotreePersistUndo"; + options.desc = "Persist undo"; + } + { + key = "ts"; + action = "UndotreeShow"; + options.desc = "Show undotree"; + } + ]; }; } diff --git a/home/programs/nixvim/plugins/unified.nix b/home/programs/nixvim/plugins/unified.nix new file mode 100644 index 0000000..28cbead --- /dev/null +++ b/home/programs/nixvim/plugins/unified.nix @@ -0,0 +1,32 @@ +{ ... }: + +{ + programs.nixvim = { + plugins = { + unified = { + enable = true; + lazyLoad.settings.cmd = "Unified"; + }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "u"; + group = "Unified"; + icon = " "; + } + ]; + }; + keymaps = [ + { + key = "us"; + action = "Unified"; + options.desc = "Start Unified"; + } + { + key = "uq"; + action = "Unified resetUnified reset"; + options.desc = "Stop Unified"; + } + ]; + }; +} diff --git a/home/programs/nixvim/plugins/web-devicons.nix b/home/programs/nixvim/plugins/web-devicons.nix index d577745..ec55149 100644 --- a/home/programs/nixvim/plugins/web-devicons.nix +++ b/home/programs/nixvim/plugins/web-devicons.nix @@ -1,9 +1,11 @@ { ... }: { - programs.nixvim = { - plugins = { - web-devicons.enable = true; - }; + programs.nixvim.plugins.web-devicons = { + enable = true; + lazyLoad.settings.event = [ + "BufReadPost" + "BufNewFile" + ]; }; } diff --git a/home/programs/nixvim/plugins/which-key.nix b/home/programs/nixvim/plugins/which-key.nix index a2da0cf..3495e3f 100644 --- a/home/programs/nixvim/plugins/which-key.nix +++ b/home/programs/nixvim/plugins/which-key.nix @@ -1,9 +1,11 @@ { ... }: { - programs.nixvim.plugins = { - which-key = { - enable = true; - }; + programs.nixvim.plugins.which-key = { + enable = true; + lazyLoad.settings.event = [ + "BufReadPost" + "BufNewFile" + ]; }; } diff --git a/home/programs/nixvim/plugins/wilder.nix b/home/programs/nixvim/plugins/wilder.nix new file mode 100644 index 0000000..3df495d --- /dev/null +++ b/home/programs/nixvim/plugins/wilder.nix @@ -0,0 +1,51 @@ +{ ... }: + +{ + programs.nixvim.plugins.wilder = { + enable = true; + lazyLoad.settings.event = [ + "BufReadPost" + "BufNewFile" + ]; + + settings.modes = [ + ":" + "/" + "?" + ]; + + # Configure the wilder engine + options = { + pipeline.__raw = '' + wilder.branch( + wilder.cmdline_pipeline({ + fuzzy = 1, + set_device = 1, + }), + wilder.vim_search_pipeline() + ) + ''; + renderer.__raw = '' + wilder.popupmenu_renderer( + wilder.popupmenu_border_theme({ + highlighter = wilder.basic_highlighter(), + highlights = { + accent = "WilderAccent", + }, + border = "rounded", + left = { " ", wilder.popupmenu_devicons() }, + right = { " ", wilder.popupmenu_scrollbar() }, + }) + ) + ''; + }; + }; + + # Define the custom highlight group for the accent color + programs.nixvim.highlight = { + WilderAccent = { + fg = "#f5c2e7"; + bold = true; + }; + }; +} diff --git a/home/programs/nixvim/plugins/yanky.nix b/home/programs/nixvim/plugins/yanky.nix deleted file mode 100644 index 022ea31..0000000 --- a/home/programs/nixvim/plugins/yanky.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - yanky = { - enable = true; - settings = { - ring = { - storage = "sqlite"; - }; - }; - }; - - sqlite-lua = { - enable = true; - }; - }; - - keymaps = [ - { - key = "p"; - action = "(YankyPutAfter)"; - mode = [ - "n" - "x" - ]; - } - { - key = "P"; - action = "(YankyPutBefore)"; - mode = [ - "n" - "x" - ]; - } - { - key = "gp"; - action = "(YankyGPutAfter)"; - mode = [ - "n" - "x" - ]; - } - { - key = "gP"; - action = "(YankyGPutBefore)"; - mode = [ - "n" - "x" - ]; - } - { - key = ""; - action = "(YankyPreviousEntry)"; - mode = [ - "n" - ]; - } - { - key = ""; - action = "(YankyNextEntry)"; - mode = [ - "n" - ]; - } - ]; - }; -} diff --git a/home/programs/nixvim/plugins/yazi.nix b/home/programs/nixvim/plugins/yazi.nix new file mode 100644 index 0000000..ff13518 --- /dev/null +++ b/home/programs/nixvim/plugins/yazi.nix @@ -0,0 +1,40 @@ +{ ... }: + +{ + programs.nixvim = { + plugins = { + yazi = { + enable = true; + lazyLoad.settings.event = [ + "BufReadPost" + "BufNewFile" + ]; + }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "y"; + group = "Yazi"; + icon = " "; + } + ]; + }; + keymaps = [ + { + key = "yf"; + action = "Yazi"; + options.desc = "Open yazi at the current file"; + } + { + key = "yw"; + action = "Yazi cwd"; + options.desc = "Open yazi at the current working directory"; + } + { + key = "yl"; + action = "Yazi toggle"; + options.desc = "Resume the last session"; + } + ]; + }; +} diff --git a/home/programs/nixvim/plugins/yuck.nix b/home/programs/nixvim/plugins/yuck.nix new file mode 100644 index 0000000..fffd712 --- /dev/null +++ b/home/programs/nixvim/plugins/yuck.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + programs.nixvim.plugins.yuck = { + enable = true; + lazyLoad.settings.filetypes = [ + "yuck" + ]; + }; +} diff --git a/home/programs/nixvim/plugins/zk.nix b/home/programs/nixvim/plugins/zk.nix deleted file mode 100644 index 00665a2..0000000 --- a/home/programs/nixvim/plugins/zk.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - zk = { - enable = true; - settings = { - picker = "telescope"; - }; - }; - which-key.settings.spec = [ - { - __unkeyed-1 = "z"; - group = "Zettelkasten"; - icon = "󰝰 "; - } - ]; - }; - keymaps = [ - { - key = "zn"; - action = "ZkNew { title = vim.fn.input('Title: ') }"; - mode = [ "n" ]; - options = { - desc = "Create"; - }; - } - { - key = "zo"; - action = "ZkNotes { sort = { 'modified' } }"; - mode = [ "n" ]; - options = { - desc = "Open"; - }; - } - { - key = "zt"; - action = "ZkTags"; - mode = [ "n" ]; - options = { - desc = "Open Tags"; - }; - } - { - key = "zf"; - action = "ZkNotes { sort = { 'modified' }, match = { vim.fn.input('Search: ') } }"; - mode = [ "n" ]; - options = { - desc = "Search"; - }; - } - { - key = "zf"; - action = ":'<,'>ZkMatch"; - mode = [ "v" ]; - options = { - desc = "Search (Matching the Selection)"; - }; - } - ]; - files = { - # TODO: Add descriptions - # TODO: Did the sytnax change? - "ftplugin/markdown.lua" = { - extraConfigLua = # lua - '' - -- Add the key mappings only for Markdown files in a zk notebook. - if require("zk.util").notebook_root(vim.fn.expand('%:p')) ~= nil then - local function map(...) vim.api.nvim_buf_set_keymap(0, ...) end - local opts = { noremap=true, silent=false } - - -- Create a new note after asking for its title. - -- This overrides the global `zn` mapping to create the note in the same directory as the current buffer. - map("n", "zn", "ZkNew { dir = vim.fn.expand('%:p:h'), title = vim.fn.input('Title: ') }", opts) - -- Create a new note in the same directory as the current buffer, using the current selection for title. - map("v", "znt", ":'<,'>ZkNewFromTitleSelection { dir = vim.fn.expand('%:p:h') }", opts) - -- Create a new note in the same directory as the current buffer, using the current selection for note content and asking for its title. - map("v", "znc", ":'<,'>ZkNewFromContentSelection { dir = vim.fn.expand('%:p:h'), title = vim.fn.input('Title: ') }", opts) - - -- Open notes linking to the current buffer. - map("n", "zb", "ZkBacklinks", opts) - -- Open notes linked by the current buffer. - map("n", "zl", "ZkLinks", opts) - - -- Preview a linked note. - map("n", "K", "lua vim.lsp.buf.hover()", opts) - -- Open the code actions for a visual selection. - map("v", "za", ":'<,'>lua vim.lsp.buf.range_code_action()", opts) - end - ''; - }; - }; - }; -} From 761067ca6ed21d97d970154bcfed722dbd64fd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Mon, 13 Apr 2026 18:09:16 +0200 Subject: [PATCH 3/3] nixvim plugins install all currently wanted plugins --- home/programs/nixvim-old/default.nix | 21 --- home/programs/nixvim-old/plugins/aerial.nix | 7 - .../programs/nixvim-old/plugins/autopairs.nix | 13 -- home/programs/nixvim-old/plugins/bullets.nix | 68 ------- home/programs/nixvim-old/plugins/cmp.nix | 73 -------- home/programs/nixvim-old/plugins/comment.nix | 16 -- home/programs/nixvim-old/plugins/default.nix | 54 ------ home/programs/nixvim-old/plugins/gitsigns.nix | 11 -- home/programs/nixvim-old/plugins/leap.nix | 30 --- home/programs/nixvim-old/plugins/lsp.nix | 102 ----------- .../nixvim-old/plugins/ltex-extra.nix | 9 - home/programs/nixvim-old/plugins/lualine.nix | 48 ----- .../nixvim-old/plugins/markdown-preview.nix | 9 - home/programs/nixvim-old/plugins/neotree.nix | 14 -- home/programs/nixvim-old/plugins/noice.nix | 22 --- home/programs/nixvim-old/plugins/notify.nix | 17 -- home/programs/nixvim-old/plugins/oil.nix | 9 - home/programs/nixvim-old/plugins/otter.nix | 9 - home/programs/nixvim-old/plugins/papis.nix | 28 --- .../nixvim-old/plugins/render-markdown.nix | 29 --- .../nixvim-old/plugins/smart-splits.nix | 104 ----------- home/programs/nixvim-old/plugins/sniprun.nix | 28 --- home/programs/nixvim-old/plugins/startup.nix | 71 -------- home/programs/nixvim-old/plugins/surround.nix | 162 ----------------- .../programs/nixvim-old/plugins/telescope.nix | 49 ----- .../programs/nixvim-old/plugins/texpresso.nix | 30 --- .../nixvim-old/plugins/typst-preview.nix | 38 ---- .../programs/nixvim-old/plugins/typst-vim.nix | 17 -- home/programs/nixvim-old/plugins/vimtex.nix | 40 ---- home/programs/nixvim/plugins/aerial.nix | 45 +++++ home/programs/nixvim/plugins/autopairs.nix | 10 + .../{nixvim-old => nixvim}/plugins/barbar.nix | 37 ++-- home/programs/nixvim/plugins/bullets.nix | 65 +++++++ home/programs/nixvim/plugins/cmp.nix | 70 +++++++ home/programs/nixvim/plugins/colorizor.nix | 15 ++ .../plugins/comment-box.nix | 23 +-- home/programs/nixvim/plugins/comment.nix | 10 + .../plugins/conform.nix | 14 +- home/programs/nixvim/plugins/css-color.nix | 8 - home/programs/nixvim/plugins/csvview.nix | 49 +++++ .../{nixvim-old => nixvim}/plugins/dap.nix | 67 +++---- home/programs/nixvim/plugins/default.nix | 39 +++- .../plugins/dynomark.nix | 14 +- .../{nixvim-old => nixvim}/plugins/edgy.nix | 4 +- home/programs/nixvim/plugins/gitsigns.nix | 8 + .../plugins/haskell-tools.nix | 4 +- .../{nixvim-old => nixvim}/plugins/knap.nix | 33 ++-- home/programs/nixvim/plugins/lsp.nix | 67 +++++++ home/programs/nixvim/plugins/lualine.nix | 8 + .../nixvim/plugins/markdown-preview.nix | 8 + .../plugins/mkdnflow.nix | 20 +- .../plugins/neoscroll.nix | 3 +- home/programs/nixvim/plugins/neotree.nix | 10 + home/programs/nixvim/plugins/noice.nix | 23 +++ home/programs/nixvim/plugins/notify.nix | 14 ++ home/programs/nixvim/plugins/oil.nix | 8 + .../plugins/openscad.nix | 2 + home/programs/nixvim/plugins/otter.nix | 8 + home/programs/nixvim/plugins/papis.nix | 24 +++ home/programs/nixvim/plugins/rainbow.nix | 161 +++++++--------- .../nixvim/plugins/render-markdown.nix | 15 +- home/programs/nixvim/plugins/rustaceanvim.nix | 74 ++++---- home/programs/nixvim/plugins/smart-splits.nix | 108 +++++++++++ .../plugins/snippets.nix | 6 +- home/programs/nixvim/plugins/sniprun.nix | 27 +++ home/programs/nixvim/plugins/startup.nix | 71 ++++++++ home/programs/nixvim/plugins/surround.nix | 172 ++++++++++++++++++ .../plugins/todo-comments.nix | 15 ++ home/programs/nixvim/plugins/toggleterm.nix | 20 +- .../plugins/treesitter.nix | 3 + home/programs/nixvim/plugins/trouble.nix | 4 +- .../programs/nixvim/plugins/typst-preview.nix | 30 +++ home/programs/nixvim/plugins/typst-vim.nix | 15 ++ home/programs/nixvim/plugins/unified.nix | 1 + home/programs/nixvim/plugins/vimtex.nix | 61 ++++++- home/programs/nixvim/plugins/web-devicons.nix | 5 +- home/programs/nixvim/plugins/which-key.nix | 5 +- home/programs/nixvim/plugins/wilder.nix | 5 +- home/programs/nixvim/plugins/yazi.nix | 5 +- home/programs/nixvim/plugins/yuck.nix | 4 +- home/services/default.nix | 1 - home/services/emanote.nix | 23 --- 82 files changed, 1201 insertions(+), 1468 deletions(-) delete mode 100644 home/programs/nixvim-old/default.nix delete mode 100644 home/programs/nixvim-old/plugins/aerial.nix delete mode 100644 home/programs/nixvim-old/plugins/autopairs.nix delete mode 100644 home/programs/nixvim-old/plugins/bullets.nix delete mode 100644 home/programs/nixvim-old/plugins/cmp.nix delete mode 100644 home/programs/nixvim-old/plugins/comment.nix delete mode 100644 home/programs/nixvim-old/plugins/default.nix delete mode 100644 home/programs/nixvim-old/plugins/gitsigns.nix delete mode 100644 home/programs/nixvim-old/plugins/leap.nix delete mode 100644 home/programs/nixvim-old/plugins/lsp.nix delete mode 100644 home/programs/nixvim-old/plugins/ltex-extra.nix delete mode 100644 home/programs/nixvim-old/plugins/lualine.nix delete mode 100644 home/programs/nixvim-old/plugins/markdown-preview.nix delete mode 100644 home/programs/nixvim-old/plugins/neotree.nix delete mode 100644 home/programs/nixvim-old/plugins/noice.nix delete mode 100644 home/programs/nixvim-old/plugins/notify.nix delete mode 100644 home/programs/nixvim-old/plugins/oil.nix delete mode 100644 home/programs/nixvim-old/plugins/otter.nix delete mode 100644 home/programs/nixvim-old/plugins/papis.nix delete mode 100644 home/programs/nixvim-old/plugins/render-markdown.nix delete mode 100644 home/programs/nixvim-old/plugins/smart-splits.nix delete mode 100644 home/programs/nixvim-old/plugins/sniprun.nix delete mode 100644 home/programs/nixvim-old/plugins/startup.nix delete mode 100644 home/programs/nixvim-old/plugins/surround.nix delete mode 100644 home/programs/nixvim-old/plugins/telescope.nix delete mode 100644 home/programs/nixvim-old/plugins/texpresso.nix delete mode 100644 home/programs/nixvim-old/plugins/typst-preview.nix delete mode 100644 home/programs/nixvim-old/plugins/typst-vim.nix delete mode 100644 home/programs/nixvim-old/plugins/vimtex.nix create mode 100644 home/programs/nixvim/plugins/aerial.nix create mode 100644 home/programs/nixvim/plugins/autopairs.nix rename home/programs/{nixvim-old => nixvim}/plugins/barbar.nix (67%) create mode 100644 home/programs/nixvim/plugins/bullets.nix create mode 100644 home/programs/nixvim/plugins/cmp.nix create mode 100644 home/programs/nixvim/plugins/colorizor.nix rename home/programs/{nixvim-old => nixvim}/plugins/comment-box.nix (69%) create mode 100644 home/programs/nixvim/plugins/comment.nix rename home/programs/{nixvim-old => nixvim}/plugins/conform.nix (94%) delete mode 100644 home/programs/nixvim/plugins/css-color.nix create mode 100644 home/programs/nixvim/plugins/csvview.nix rename home/programs/{nixvim-old => nixvim}/plugins/dap.nix (90%) rename home/programs/{nixvim-old => nixvim}/plugins/dynomark.nix (77%) rename home/programs/{nixvim-old => nixvim}/plugins/edgy.nix (99%) create mode 100644 home/programs/nixvim/plugins/gitsigns.nix rename home/programs/{nixvim-old => nixvim}/plugins/haskell-tools.nix (82%) rename home/programs/{nixvim-old => nixvim}/plugins/knap.nix (54%) create mode 100644 home/programs/nixvim/plugins/lsp.nix create mode 100644 home/programs/nixvim/plugins/lualine.nix create mode 100644 home/programs/nixvim/plugins/markdown-preview.nix rename home/programs/{nixvim-old => nixvim}/plugins/mkdnflow.nix (93%) rename home/programs/{nixvim-old => nixvim}/plugins/neoscroll.nix (95%) create mode 100644 home/programs/nixvim/plugins/neotree.nix create mode 100644 home/programs/nixvim/plugins/noice.nix create mode 100644 home/programs/nixvim/plugins/notify.nix create mode 100644 home/programs/nixvim/plugins/oil.nix rename home/programs/{nixvim-old => nixvim}/plugins/openscad.nix (92%) create mode 100644 home/programs/nixvim/plugins/otter.nix create mode 100644 home/programs/nixvim/plugins/papis.nix create mode 100644 home/programs/nixvim/plugins/smart-splits.nix rename home/programs/{nixvim-old => nixvim}/plugins/snippets.nix (72%) create mode 100644 home/programs/nixvim/plugins/sniprun.nix create mode 100644 home/programs/nixvim/plugins/startup.nix create mode 100644 home/programs/nixvim/plugins/surround.nix rename home/programs/{nixvim-old => nixvim}/plugins/todo-comments.nix (98%) rename home/programs/{nixvim-old => nixvim}/plugins/treesitter.nix (83%) create mode 100644 home/programs/nixvim/plugins/typst-preview.nix create mode 100644 home/programs/nixvim/plugins/typst-vim.nix delete mode 100644 home/services/emanote.nix diff --git a/home/programs/nixvim-old/default.nix b/home/programs/nixvim-old/default.nix deleted file mode 100644 index 02ef072..0000000 --- a/home/programs/nixvim-old/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ inputs, pkgs, ... }: - -{ - imports = [ - ./plugins - ]; - - programs.nixvim = { - extraPackages = with pkgs; [ - texliveFull - texlivePackages.standalone - texlivePackages.relsize # needed for BA - # papis-nvim - ]; - extraConfigVim = '' - filetype plugin on - set nocompatible - syntax on - ''; - }; -} diff --git a/home/programs/nixvim-old/plugins/aerial.nix b/home/programs/nixvim-old/plugins/aerial.nix deleted file mode 100644 index b460d0f..0000000 --- a/home/programs/nixvim-old/plugins/aerial.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - aerial.enable = true; - }; -} diff --git a/home/programs/nixvim-old/plugins/autopairs.nix b/home/programs/nixvim-old/plugins/autopairs.nix deleted file mode 100644 index 2aed7bb..0000000 --- a/home/programs/nixvim-old/plugins/autopairs.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - nvim-autopairs = { - enable = true; - settings = { - check_ts = true; - }; - }; - }; -} - diff --git a/home/programs/nixvim-old/plugins/bullets.nix b/home/programs/nixvim-old/plugins/bullets.nix deleted file mode 100644 index 46076a6..0000000 --- a/home/programs/nixvim-old/plugins/bullets.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - bullets = { - enable = true; - settings = { - enabled_file_types = [ - "markdown" - "text" - "gitcommit" - ]; - set_mappings = 0; - checkbox_markers = " -X"; - custom_mappings = [ - [ - "nmap" - "o" - "(bullets-newline)" - ] - [ - "vmap" - "gN" - "(bullets-renumber)" - ] - [ - "nmap" - "gN" - "(bullets-renumber)" - ] - [ - "imap" - "" - "(bullets-demote)" - ] - [ - "nmap" - ">>" - "(bullets-demote)" - ] - [ - "vmap" - ">" - "(bullets-demote)" - ] - [ - "imap" - "" - "(bullets-promote)" - ] - [ - "nmap" - "<<" - "(bullets-promote)" - ] - [ - "vmap" - "<" - "(bullets-promote)" - ] - ]; - }; - }; - }; - }; -} - diff --git a/home/programs/nixvim-old/plugins/cmp.nix b/home/programs/nixvim-old/plugins/cmp.nix deleted file mode 100644 index 6f3ee2e..0000000 --- a/home/programs/nixvim-old/plugins/cmp.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - blink-cmp = { - enable = true; - settings = { - keymap = { - preset = "default"; - }; - snippets = { - preset = "luasnip"; - }; - completion = { - accept = { - auto_brackets = { - enabled = true; - kind_resolution = { - enabled = true; - }; - semantic_token_resolution = { - enabled = true; - timeout_ms = 400; - }; - }; - }; - }; - sources = { - per_filetype = { - yaml = [ "papis" ]; - }; - providers = { - spell = { - module = "blink-cmp-spell"; - name = "Spell"; - score_offset = 100; - opts = { }; - }; - vimtex = { - name = "vimtex"; - module = "blink.compat.source"; - }; - dap = { - name = "dap"; - module = "blink.compat.source"; - }; - mkdnflow = { - name = "mkdnflow"; - module = "blink.compat.source"; - }; - }; - default = [ - "lsp" - "mkdnflow" - "path" - "snippets" - # "dap" - "vimtex" - "buffer" - "spell" - ]; - }; - }; - }; - blink-cmp-spell.enable = true; - blink-compat.enable = true; - cmp-vimtex.enable = true; - # cmp-dap.enable = true; - }; - }; -} - diff --git a/home/programs/nixvim-old/plugins/comment.nix b/home/programs/nixvim-old/plugins/comment.nix deleted file mode 100644 index 8a4d813..0000000 --- a/home/programs/nixvim-old/plugins/comment.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - comment = { - enable = true; - settings = { - mappings = { - basic = true; - }; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/default.nix b/home/programs/nixvim-old/plugins/default.nix deleted file mode 100644 index 56f491c..0000000 --- a/home/programs/nixvim-old/plugins/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - imports = [ - ./aerial.nix - ./autopairs.nix - ./barbar.nix - ./bullets.nix - ./cmp.nix - ./comment-box.nix - ./comment.nix - ./conform.nix - ./dap.nix - ./diffview.nix - ./dynomark.nix - ./edgy.nix - ./gitsigns.nix - ./haskell-tools.nix - ./knap.nix - ./leap.nix - ./lsp.nix - ./ltex-extra.nix - ./lualine.nix - ./markdown-preview.nix - ./mkdnflow.nix - ./neoscroll.nix - ./neotree.nix - ./noice.nix - ./notify.nix - ./oil.nix - ./openscad.nix - ./otter.nix - ./papis.nix - ./peek.nix - ./markdown-preview.nix - ./smart-splits.nix - ./snippets.nix - ./sniprun.nix - ./startup.nix - ./surround.nix - ./telescope.nix - ./texpresso.nix - ./todo-comments.nix - ./toggleterm.nix - ./treesitter.nix - ./trouble.nix - ./typst-preview.nix - ./typst-vim.nix - ./undotree.nix - ./vimtex.nix - ./web-devicons.nix - ./which-key.nix - ./yanky.nix - ./zk.nix - ]; -} diff --git a/home/programs/nixvim-old/plugins/gitsigns.nix b/home/programs/nixvim-old/plugins/gitsigns.nix deleted file mode 100644 index 85acb44..0000000 --- a/home/programs/nixvim-old/plugins/gitsigns.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - gitsigns = { - enable = true; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/leap.nix b/home/programs/nixvim-old/plugins/leap.nix deleted file mode 100644 index 98dcdd7..0000000 --- a/home/programs/nixvim-old/plugins/leap.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - leap = { - enable = true; - settings = { - case_sensitive = false; - }; - }; - }; - keymaps = [ - { - key = "s"; - action = "(leap)"; - mode = [ - "n" - "x" - "o" - ]; - } - { - key = "S"; - action = "(leap-from-window)"; - mode = [ "n" ]; - } - ]; - }; -} diff --git a/home/programs/nixvim-old/plugins/lsp.nix b/home/programs/nixvim-old/plugins/lsp.nix deleted file mode 100644 index c1fdc8a..0000000 --- a/home/programs/nixvim-old/plugins/lsp.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ pkgs, config, ... }: - -{ - home.packages = with pkgs; [ - tofu-ls - zuban - ]; - - programs.nixvim = { - plugins.lsp.enable = true; - - lsp = { - luaConfig = { - post = '' - vim.lsp.enable('tofu_ls') - vim.lsp.enable('prolog_ls') - ''; - }; - servers = { - nixd = { - enable = false; - }; - rust_analyzer = { - enable = true; - }; - leanls = { - enable = true; - }; - nil_ls = { - enable = !config.programs.nixvim.plugins.lsp.servers.nixd.enable; - config = { - nil = { - formatting = { - command = [ - "nixfmt" - ]; - }; - diagnostics = { - ignored = [ ]; - }; - nix = { - flake = { - autoArchive = true; - }; - }; - }; - }; - }; - nushell = { - enable = true; - }; - pylsp = { - enable = true; - }; - pylyzer = { - enable = false; - }; - pyright = { - enable = true; - }; - clangd = { - enable = true; - }; - zk = { - enable = true; - }; - elixirls = { - enable = true; - }; - marksman = { - enable = true; - }; - texlab = { - enable = true; - }; - lua_ls = { - enable = true; - }; - ltex_plus = { - enable = true; - package = pkgs.ltex-ls-plus; - config = { - ltex = { - language = "en-US"; - enabled = [ - "latex" - "tex" - "bibtex" - "markdown" - "typst" - "quarto" - ]; - }; - }; - }; - tinymist = { - enable = true; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/ltex-extra.nix b/home/programs/nixvim-old/plugins/ltex-extra.nix deleted file mode 100644 index 55f59fd..0000000 --- a/home/programs/nixvim-old/plugins/ltex-extra.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - ltex-extra = { - enable = true; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/lualine.nix b/home/programs/nixvim-old/plugins/lualine.nix deleted file mode 100644 index c65ba02..0000000 --- a/home/programs/nixvim-old/plugins/lualine.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - lualine = { - enable = true; - # settings = { - # sections = { - # lualine_c = [ - # { - # __unkeyed-1 = { - # __raw = '' - # function() - # require("trouble").statusline({ - # mode = "lsp_document_symbols", - # groups = {}, - # title = false, - # filter = { range = true }, - # format = "{kind_icon}{symbol.name:Normal}", - # -- The following line is needed to fix the background color - # -- Set it to the lualine section you want to use - # hl_group = "lualine_c_normal", - # } - # ).get - # end - # ''; - # }; - # cond = { - # __raw = '' - # require("trouble").statusline({ - # mode = "lsp_document_symbols", - # groups = {}, - # title = false, - # filter = { range = true }, - # format = "{kind_icon}{symbol.name:Normal}", - # -- The following line is needed to fix the background color - # -- Set it to the lualine section you want to use - # hl_group = "lualine_c_normal", - # }).has - # ''; - # }; - # } - # ]; - # }; - # }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/markdown-preview.nix b/home/programs/nixvim-old/plugins/markdown-preview.nix deleted file mode 100644 index ddb9dd1..0000000 --- a/home/programs/nixvim-old/plugins/markdown-preview.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - markdown-preview = { - enable = true; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/neotree.nix b/home/programs/nixvim-old/plugins/neotree.nix deleted file mode 100644 index bc288dc..0000000 --- a/home/programs/nixvim-old/plugins/neotree.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - neo-tree = { - enable = true; - settings = { - enable_git_status = true; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/noice.nix b/home/programs/nixvim-old/plugins/noice.nix deleted file mode 100644 index 91b521a..0000000 --- a/home/programs/nixvim-old/plugins/noice.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - noice = { - enable = true; - settings = { - lsp.override = { - "vim.lsp.util.convert_input_to_markdown_lines" = true; - "vim.lsp.util.stylize_markdown" = true; - }; - prests = { - bottom_search = true; - command_palette = true; - inc_rename = false; - long_message_to_split = true; - lsp_doc_border = false; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/notify.nix b/home/programs/nixvim-old/plugins/notify.nix deleted file mode 100644 index d5cb17a..0000000 --- a/home/programs/nixvim-old/plugins/notify.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - notify = { - enable = true; - settings = { - render = "wrapped-compact"; - }; - }; - }; - opts = { - termguicolors = true; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/oil.nix b/home/programs/nixvim-old/plugins/oil.nix deleted file mode 100644 index bb8c8eb..0000000 --- a/home/programs/nixvim-old/plugins/oil.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - oil = { - enable = true; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/otter.nix b/home/programs/nixvim-old/plugins/otter.nix deleted file mode 100644 index 272af71..0000000 --- a/home/programs/nixvim-old/plugins/otter.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - otter = { - enable = true; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/papis.nix b/home/programs/nixvim-old/plugins/papis.nix deleted file mode 100644 index 3b5b62b..0000000 --- a/home/programs/nixvim-old/plugins/papis.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, ... }: - -{ - programs.nixvim = { - plugins = { - papis = { - enable = true; - settings = { - yq_bin = "${pkgs.yq-go}/bin/yq"; - search = { - provider = "telescope"; - }; - }; - }; - }; - - keymaps = [ - { - key = "pp"; - action = "Papis search"; - mode = [ "n" ]; - options = { - desc = "Papis"; - }; - } - ]; - }; -} diff --git a/home/programs/nixvim-old/plugins/render-markdown.nix b/home/programs/nixvim-old/plugins/render-markdown.nix deleted file mode 100644 index 4ab73d4..0000000 --- a/home/programs/nixvim-old/plugins/render-markdown.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ python312Packages.pylatexenc ]; - - programs.nixvim.plugins = { - render-markdown = { - enable = true; - settings = { - ft = [ - "markdown" - "quarto" - ]; - latex = { - enabled = false; - }; - completions = { - lsp = { - enabled = true; - }; - }; - }; - }; - - web-devicons = { - enable = true; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/smart-splits.nix b/home/programs/nixvim-old/plugins/smart-splits.nix deleted file mode 100644 index dcf3e43..0000000 --- a/home/programs/nixvim-old/plugins/smart-splits.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ ... }: -{ - programs.nixvim.plugins = { - smart-splits = { - enable = true; - }; - }; - programs.nixvim.keymaps = [ - { - action.__raw = "require('smart-splits').move_cursor_left"; - key = "h"; - mode = "n"; - } - { - action.__raw = "require('smart-splits').move_cursor_right"; - key = "l"; - mode = "n"; - } - { - action.__raw = "require('smart-splits').move_cursor_down"; - key = "j"; - mode = "n"; - } - { - action.__raw = "require('smart-splits').move_cursor_up"; - key = "k"; - mode = "n"; - } - { - action.__raw = "require('smart-splits').resize_left"; - key = "h"; - mode = "n"; - } - { - action.__raw = "require('smart-splits').resize_right"; - key = "l"; - mode = "n"; - } - { - action.__raw = "require('smart-splits').resize_down"; - key = "j"; - mode = "n"; - } - { - action.__raw = "require('smart-splits').resize_up"; - key = "k"; - mode = "n"; - } - { - action = "silent !kitten @ launch --location=hsplit"; - key = "s"; - mode = [ - "n" - "v" - "i" - ]; - } - { - action = "silent !kitten @ launch --location=vsplit"; - key = "v"; - mode = [ - "n" - "v" - "i" - ]; - } - { - action = "silent !kitten @ launch --location=hsplit --cwd=current --bias=35"; - key = "p"; - mode = [ - "n" - "v" - "i" - ]; - } - { - action = "silent !kitten @ close-window"; - key = "q"; - mode = [ - "n" - "v" - "i" - ]; - } - { - action = "silent !kitten @ action layout_action rotate"; - key = "r"; - mode = [ - "n" - "v" - "i" - ]; - } - { - action = "silent !kitten @ action toggle_layout stack"; - key = "f"; - mode = [ - "n" - "v" - "i" - ]; - } - ]; -} diff --git a/home/programs/nixvim-old/plugins/sniprun.nix b/home/programs/nixvim-old/plugins/sniprun.nix deleted file mode 100644 index 450f8f0..0000000 --- a/home/programs/nixvim-old/plugins/sniprun.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - sniprun = { - enable = true; - settings = { - display = [ "VirtualLine" ]; - snipruncolors = { - SniprunVirtualTextOk = { - bg = "#91d7e3"; - fg = "#000000"; - ctermbg = "Cyan"; - ctermfg = "Black"; - }; - SniprunVirtualTextErr = { - bg = "#ee99a0"; - fg = "#000000"; - ctermbg = "DarkRed"; - ctermfg = "Black"; - }; - }; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/startup.nix b/home/programs/nixvim-old/plugins/startup.nix deleted file mode 100644 index b05b83c..0000000 --- a/home/programs/nixvim-old/plugins/startup.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - startup = { - enable = true; - settings = { - theme = "dashboard"; - sections = { - body = { - align = "center"; - content = [ - [ - " Find File" - "Telescope find_files" - "ff" - ] - [ - "󰍉 Find Word" - "Telescope live_grep" - "lg" - ] - [ - " Recent Files" - "Telescope oldfiles" - "of" - ] - [ - " File Browser" - "Telescope file_browser" - "fb" - ] - [ - " Colorschemes" - "Telescope colorscheme" - "cs" - ] - [ - " New File" - "lua require'startup'.new_file()" - "nf" - ] - ]; - defaultColor = ""; - foldSection = true; - highlight = "String"; - margin = 5; - oldfilesAmount = 0; - title = "Basic Commands"; - type = "mapping"; - }; - header = { - align = "center"; - content = { - __raw = "require('startup.headers').hydra_header"; - }; - defaultColor = ""; - foldSection = false; - highlight = "Statement"; - margin = 5; - oldfilesAmount = 0; - title = "Header"; - type = "text"; - }; - }; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/surround.nix b/home/programs/nixvim-old/plugins/surround.nix deleted file mode 100644 index 2bcb458..0000000 --- a/home/programs/nixvim-old/plugins/surround.nix +++ /dev/null @@ -1,162 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins = { - nvim-surround = { - enable = true; - luaConfig.post = # lua - '' - local M = {} - - M.get_input = function(prompt) - local input = require("nvim-surround.input") - return input.get_input(prompt) - end - - M.get_selection = function(args) - if args.char then - return M.get_find(args.char)(args.char) - elseif args.motion then - return require("nvim-surround.motions").get_selection(args.motion) - elseif args.node then - return require("nvim-surround.treesitter").get_selection(args.node) - elseif args.pattern then - return require("nvim-surround.patterns").get_selection(args.pattern) - elseif args.query then - return require("nvim-surround.queries").get_selection(args.query.capture, args.query.type) - else - vim.notify("Invalid key provided for `:h nvim-surround.config.get_selection()`.", vim.log.levels.ERROR) - end - end - - surrounds = { - ["("] = { - add = { "( ", " )" }, - find = function() - return M.get_selection({ motion = "a(" }) - end, - delete = "^(. ?)().-( ?.)()$", - }, - [")"] = { - add = { "(", ")" }, - find = function() - return M.get_selection({ motion = "a)" }) - end, - delete = "^(.)().-(.)()$", - }, - ["{"] = { - add = { "{ ", " }" }, - find = function() - return M.get_selection({ motion = "a{" }) - end, - delete = "^(. ?)().-( ?.)()$", - }, - ["}"] = { - add = { "{", "}" }, - find = function() - return M.get_selection({ motion = "a}" }) - end, - delete = "^(.)().-(.)()$", - }, - ["<"] = { - add = { "< ", " >" }, - find = function() - return M.get_selection({ motion = "a<" }) - end, - delete = "^(. ?)().-( ?.)()$", - }, - [">"] = { - add = { "<", ">" }, - find = function() - return M.get_selection({ motion = "a>" }) - end, - delete = "^(.)().-(.)()$", - }, - ["["] = { - add = { "[ ", " ]" }, - find = function() - return M.get_selection({ motion = "a[" }) - end, - delete = "^(. ?)().-( ?.)()$", - }, - ["]"] = { - add = { "[", "]" }, - find = function() - return M.get_selection({ motion = "a]" }) - end, - delete = "^(.)().-(.)()$", - }, - ["'"] = { - add = { "'", "'" }, - find = function() - return M.get_selection({ motion = "a'" }) - end, - delete = "^(.)().-(.)()$", - }, - ['"'] = { - add = { '"', '"' }, - find = function() - return M.get_selection({ motion = 'a"' }) - end, - delete = "^(.)().-(.)()$", - }, - ["`"] = { - add = { "`", "`" }, - find = function() - return M.get_selection({ motion = "a`" }) - end, - delete = "^(.)().-(.)()$", - }, - ["i"] = { - add = function() - local left_delimiter = M.get_input("Enter the left delimiter: ") - local right_delimiter = left_delimiter and M.get_input("Enter the right delimiter: ") - if right_delimiter then - return { { left_delimiter }, { right_delimiter } } - end - end, - find = function() end, - delete = function() end, - }, - } - ''; - settings = { - aliases = { - "a" = ">"; - "b" = ")"; - "B" = "}"; - "r" = "]"; - "q" = [ - "\"" - "'" - "`" - ]; - "Q" = "''"; - "s" = [ - "}" - "]" - ")" - ">" - "\"" - "'" - "`" - ]; - }; - keymaps = { - insert = "s"; - insert_line = "S"; - normal = "ys"; - normal_cur = "yss"; - normal_line = "yS"; - normal_cur_line = "ySS"; - visual = "S"; - visual_line = "gS"; - delete = "ds"; - # TODO: This keymap clashed with comment boxses - change = "cs"; - change_line = "cS"; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/telescope.nix b/home/programs/nixvim-old/plugins/telescope.nix deleted file mode 100644 index 1e51056..0000000 --- a/home/programs/nixvim-old/plugins/telescope.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - ripgrep - fd - ]; - programs.nixvim.plugins = { - telescope = { - enable = true; - extensions = { - fzf-native.enable = true; - ui-select.enable = true; - undo.enable = true; - file-browser = { - enable = true; - settings = { - hijack_netrw = true; - }; - }; - }; - keymaps = { - "ff" = { - action = "find_files"; - options.desc = "List Files"; - }; - "fb" = { - action = "file_browser path=%:p:h select_buffer=true"; - options.desc = "File Browser"; - }; - "fs" = { - action = "buffers"; - options.desc = "List Open Buffers"; - }; - "fu" = { - action = "undo"; - options.desc = "Undo Tree"; - }; - }; - }; - which-key.settings.spec = [ - { - __unkeyed-1 = "f"; - group = "Telescope"; - icon = "󰭎 "; - } - ]; - }; -} diff --git a/home/programs/nixvim-old/plugins/texpresso.nix b/home/programs/nixvim-old/plugins/texpresso.nix deleted file mode 100644 index 488ee2f..0000000 --- a/home/programs/nixvim-old/plugins/texpresso.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ ... }: - -# TODO: Make filetype keybindings work -{ - programs.nixvim = { - plugins = { - texpresso = { - enable = false; - }; - }; - files = { - "ftplugin/latex.lua" = { - keymaps = [ - { - action = "Texpresso %"; - key = "t"; - mode = [ - "n" - "v" - "i" - ]; - options = { - desc = "Start Texpresso"; - }; - } - ]; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/typst-preview.nix b/home/programs/nixvim-old/plugins/typst-preview.nix deleted file mode 100644 index 7122474..0000000 --- a/home/programs/nixvim-old/plugins/typst-preview.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - typst-preview = { - enable = true; - lazyLoad = { - settings = { - ft = "typst"; - cmd = "TypstPreview"; - }; - }; - settings = { - open_command = "qutebrowser --target tab %s"; - }; - }; - }; - files = { - "ftplugin/typst.lua" = { - keymaps = [ - { - action = "TypstPreview"; - key = "t"; - mode = [ - "n" - "v" - "i" - ]; - options = { - desc = "Typst Preview"; - }; - } - ]; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/typst-vim.nix b/home/programs/nixvim-old/plugins/typst-vim.nix deleted file mode 100644 index 8de7abd..0000000 --- a/home/programs/nixvim-old/plugins/typst-vim.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -# TODO: coneal does not work -{ - programs.nixvim = { - plugins = { - typst-vim = { - enable = true; - settings = { - conceal = 1; - conceal_math = 1; - conceal_emoji = 1; - }; - }; - }; - }; -} diff --git a/home/programs/nixvim-old/plugins/vimtex.nix b/home/programs/nixvim-old/plugins/vimtex.nix deleted file mode 100644 index d5b38fe..0000000 --- a/home/programs/nixvim-old/plugins/vimtex.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ ... }: - -{ - programs.nixvim = { - plugins = { - vimtex = { - enable = true; - settings = { - view_automatic = false; - mappings_disable = { - "n" = [ "K" ]; - }; - }; - }; - }; - - autoGroups = { - "lazyvim_vimtex_conceal" = { - clear = true; - }; - }; - - autoCmd = [ - { - event = [ "FileType" ]; - group = "lazyvim_vimtex_conceal"; - pattern = [ - "bib" - "tex" - ]; - callback.__raw = # lua - '' - function () - vim.wo.conceallevel = 2 - end - ''; - } - ]; - }; -} diff --git a/home/programs/nixvim/plugins/aerial.nix b/home/programs/nixvim/plugins/aerial.nix new file mode 100644 index 0000000..958a6a2 --- /dev/null +++ b/home/programs/nixvim/plugins/aerial.nix @@ -0,0 +1,45 @@ +{ ... }: + +{ + programs.nixvim = { + plugins = { + aerial = { + enable = true; + lazyLoad.settings.cmd = [ + "AerialToggle" + "AerialNavToggle" + ]; + }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "a"; + group = "Aerial"; + icon = " "; + } + ]; + }; + keymaps = [ + { + key = "at"; + action = "AerialToggle"; + options.desc = "Aerial tab"; + } + { + key = "an"; + action = "AerialNavToggle"; + options.desc = "Aerial navgation"; + } + { + key = "a."; + action = "AerialNext"; + options.desc = "Aerial next"; + } + { + key = "a,"; + action = "AerialPrev"; + options.desc = "Aerial previous"; + } + ]; + }; +} diff --git a/home/programs/nixvim/plugins/autopairs.nix b/home/programs/nixvim/plugins/autopairs.nix new file mode 100644 index 0000000..f1efe69 --- /dev/null +++ b/home/programs/nixvim/plugins/autopairs.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + programs.nixvim.plugins.nvim-autopairs = { + enable = true; + autoLoad = true; + + settings.check_ts = true; + }; +} diff --git a/home/programs/nixvim-old/plugins/barbar.nix b/home/programs/nixvim/plugins/barbar.nix similarity index 67% rename from home/programs/nixvim-old/plugins/barbar.nix rename to home/programs/nixvim/plugins/barbar.nix index 932ac57..a8e4a11 100644 --- a/home/programs/nixvim-old/plugins/barbar.nix +++ b/home/programs/nixvim/plugins/barbar.nix @@ -3,9 +3,9 @@ { programs.nixvim = { plugins = { - barbar = { - enable = true; - }; + barbar.enable = true; + autoLoad = true; + which-key.settings.spec = [ { __unkeyed-1 = "b"; @@ -22,62 +22,49 @@ } ]; }; + keymaps = [ { action = "BufferPrevious"; key = ","; mode = "n"; - options = { - desc = "Tab "; - }; + options.desc = "Tab "; } { action = "BufferNext"; key = "."; mode = "n"; - options = { - desc = "Tab "; - }; + options.desc = "Tab "; } { action = "BufferMovePrevious"; key = "b<"; mode = "n"; - options = { - desc = "Re-Order "; - }; + options.desc = "Re-Order "; } { action = "BufferMoveNext"; key = "b>"; mode = "n"; - options = { - desc = "Re-Order "; - }; + options.desc = "Re-Order "; } { action = "BufferClose"; key = "bc"; mode = "n"; - options = { - desc = "Close"; - }; + options.desc = "Close"; } { - action = "tabnew +Telescope\\ file_browser"; + action = "tabnew +Telescope\\ yazi"; # TODO: does not work key = "bn"; mode = "n"; - options = { - desc = "Create"; - }; + options.desc = "Create"; } { action = "BufferPick"; key = "bp"; mode = "n"; - options = { - desc = "Pick Tab"; - }; + options.desc = "Pick Tab"; } ]; }; diff --git a/home/programs/nixvim/plugins/bullets.nix b/home/programs/nixvim/plugins/bullets.nix new file mode 100644 index 0000000..6ae05a3 --- /dev/null +++ b/home/programs/nixvim/plugins/bullets.nix @@ -0,0 +1,65 @@ +{ ... }: + +{ + programs.nixvim.plugins.bullets = { + enable = true; + lazyLoad.settings.filetypes = [ "md" "txt" "gitcommit" ]; + + settings = { + enabled_file_types = [ + "markdown" + "text" + "gitcommit" + ]; + set_mappings = 0; + checkbox_markers = " -X"; + custom_mappings = [ + [ + "nmap" + "mn" + "(bullets-newline)" + ] + [ + "vmap" + "mr" + "(bullets-renumber)" + ] + [ + "nmap" + "mr" + "(bullets-renumber)" + ] + [ + "imap" + "" + "(bullets-demote)" + ] + [ + "nmap" + ">>" + "(bullets-demote)" + ] + [ + "vmap" + ">" + "(bullets-demote)" + ] + [ + "imap" + "" + "(bullets-promote)" + ] + [ + "nmap" + "<<" + "(bullets-promote)" + ] + [ + "vmap" + "<" + "(bullets-promote)" + ] + ]; + }; + }; +} diff --git a/home/programs/nixvim/plugins/cmp.nix b/home/programs/nixvim/plugins/cmp.nix new file mode 100644 index 0000000..a097b15 --- /dev/null +++ b/home/programs/nixvim/plugins/cmp.nix @@ -0,0 +1,70 @@ +{ ... }: + +{ + programs.nixvim.plugins = { + blink-cmp = { + enable = true; + autoLoad = true; + + settings = { + keymap.preset = "default"; + snippets.preset = "luasnip"; + + completion.accept = { + auto_brackets = { + enabled = true; + kind_resolution.enabled = true; + + semantic_token_resolution = { + enabled = true; + timeout_ms = 400; + }; + }; + }; + + sources = { + per_filetype.yaml = [ "papis" ]; + + providers = { + spell = { + module = "blink-cmp-spell"; + name = "Spell"; + score_offset = 100; + opts = { }; + }; + + vimtex = { + name = "vimtex"; + module = "blink.compat.source"; + }; + + dap = { + name = "dap"; + module = "blink.compat.source"; + }; + + mkdnflow = { + name = "mkdnflow"; + module = "blink.compat.source"; + }; + }; + + default = [ + "lsp" + "mkdnflow" + "path" + "snippets" + # "dap" + "vimtex" + "buffer" + "spell" + ]; + }; + }; + }; + blink-cmp-spell.enable = true; + blink-compat.enable = true; + cmp-vimtex.enable = true; + # cmp-dap.enable = true; + }; +} diff --git a/home/programs/nixvim/plugins/colorizor.nix b/home/programs/nixvim/plugins/colorizor.nix new file mode 100644 index 0000000..ce955b9 --- /dev/null +++ b/home/programs/nixvim/plugins/colorizor.nix @@ -0,0 +1,15 @@ +{ ... }: + +{ + programs.nixvim.plugins.colorizer = { + enable = true; + lazyLoad.settings.filetypes = [ + "css" + "scss" + "less" + "sass" + "html" + "svg" + ]; + }; +} diff --git a/home/programs/nixvim-old/plugins/comment-box.nix b/home/programs/nixvim/plugins/comment-box.nix similarity index 69% rename from home/programs/nixvim-old/plugins/comment-box.nix rename to home/programs/nixvim/plugins/comment-box.nix index 42c2451..09c9ba1 100644 --- a/home/programs/nixvim-old/plugins/comment-box.nix +++ b/home/programs/nixvim/plugins/comment-box.nix @@ -5,7 +5,9 @@ plugins = { comment-box = { enable = true; + autoLoad = true; }; + which-key.settings.spec = [ { __unkeyed-1 = "c"; @@ -14,41 +16,32 @@ } ]; }; + keymaps = [ { key = "cb"; action = "CBccbox"; - options = { - desc = "Box Title"; - }; + options.desc = "Box Title"; } { key = "ct"; action = "CBllline"; - options = { - desc = "Titled Line"; - }; + options.desc = "Titled Line"; } { key = "cl"; action = "CBline"; - options = { - desc = "Simple Line"; - }; + options.desc = "Simple Line"; } { key = "cm"; action = "CBllbox14"; - options = { - desc = "Marked"; - }; + options.desc = "Marked"; } { key = "cd"; action = "CBd"; - options = { - desc = "Remove a Box"; - }; + options.desc = "Remove a Box"; } ]; }; diff --git a/home/programs/nixvim/plugins/comment.nix b/home/programs/nixvim/plugins/comment.nix new file mode 100644 index 0000000..51858b3 --- /dev/null +++ b/home/programs/nixvim/plugins/comment.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + programs.nixvim.plugins.comment = { + enable = true; + autoLoad = true; + + settings.mappings.basic = true; + }; +} diff --git a/home/programs/nixvim-old/plugins/conform.nix b/home/programs/nixvim/plugins/conform.nix similarity index 94% rename from home/programs/nixvim-old/plugins/conform.nix rename to home/programs/nixvim/plugins/conform.nix index 8abe1a7..1acc872 100644 --- a/home/programs/nixvim-old/plugins/conform.nix +++ b/home/programs/nixvim/plugins/conform.nix @@ -21,13 +21,13 @@ programs.nixvim.plugins = { conform-nvim = { enable = true; + autoLoad = true; + settings = { formatters_by_ft = { lua = [ "stylua" ]; rust = [ "rustfmt" ]; - python = [ - "black" - ]; + python = [ "black" ]; haskell = [ "fourmolu" ]; terraform = [ "hcl" ]; elixir = [ "mix" ]; @@ -47,9 +47,7 @@ yaml = [ "prettierd" ]; nu = [ "topiary_nu" ]; nix = [ "nixfmt" ]; - tex = [ - "tex-fmt" - ]; + tex = [ "tex-fmt" ]; "_" = [ "squeeze_blanks" "trim_whitespace" @@ -94,9 +92,7 @@ "2" ]; }; - tex-fmt = { - command = "tex-fmt"; - }; + tex-fmt.command = "tex-fmt"; }; }; }; diff --git a/home/programs/nixvim/plugins/css-color.nix b/home/programs/nixvim/plugins/css-color.nix deleted file mode 100644 index 1f5eb12..0000000 --- a/home/programs/nixvim/plugins/css-color.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - programs.nixvim.plugins.vim-css-color = { - enable = true; - lazyLoad.settings.filetypes = [ "css" ]; - }; -} diff --git a/home/programs/nixvim/plugins/csvview.nix b/home/programs/nixvim/plugins/csvview.nix new file mode 100644 index 0000000..deb4a15 --- /dev/null +++ b/home/programs/nixvim/plugins/csvview.nix @@ -0,0 +1,49 @@ +{ ... }: + +{ + programs.nixvim = { + plugins = { + csvview = { + enable = true; + lazyLoad.settings.cmd = [ + "CsvViewEnable" + "CsvViewToggle" + ]; + + settings = { + parser.async_chunksize = 30; + view = { + display_mode = "border"; + spacing = 2; + }; + }; + }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "z"; + group = "CSV"; + icon = " "; + } + ]; + }; + + keymaps = [ + { + key = "ze"; + action = "CsvViewEnable"; + options.desc = "Csv enable preview"; + } + { + key = "zd"; + action = "CsvViewDisable"; + options.desc = "Csv disable preview"; + } + { + key = "zt"; + action = "CsvViewToggle"; + options.desc = "Csv toggle preview"; + } + ]; + }; +} diff --git a/home/programs/nixvim-old/plugins/dap.nix b/home/programs/nixvim/plugins/dap.nix similarity index 90% rename from home/programs/nixvim-old/plugins/dap.nix rename to home/programs/nixvim/plugins/dap.nix index 4cd659c..727a1f3 100644 --- a/home/programs/nixvim-old/plugins/dap.nix +++ b/home/programs/nixvim/plugins/dap.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ @@ -13,10 +13,13 @@ plugins = { dap-python = { enable = true; + autoLoad = true; }; dap = { enable = true; + autoLoad = true; + luaConfig.post = '' local dap, dapui = require("dap"), require("dapui") dap.listeners.before.attach.dapui_config = function() @@ -32,11 +35,13 @@ dapui.close() end ''; + adapters = { executables = { lldb = { command = "${pkgs.lldb_19}/bin/lldb-dap"; }; + gdb = { command = "${pkgs.gdb}/bin/gdb"; args = [ @@ -45,6 +50,7 @@ "set print pretty on" ]; }; + rust-gdb = { command = "${pkgs.rustc}/bin/rust-gdb"; args = [ @@ -55,9 +61,8 @@ }; }; }; - signs = { - dapBreakpoint.text = ""; - }; + + signs.dapBreakpoint.text = ""; configurations = { cpp = [ { @@ -104,6 +109,7 @@ cwd = "\${workspaceFolder}"; } ]; + c = [ { name = "Launch file"; @@ -136,6 +142,7 @@ args = { }; } ]; + rust = [ { name = "Launch"; @@ -182,12 +189,17 @@ ]; }; }; + dap-ui = { enable = true; + autoLoad = true; }; + dap-virtual-text = { enable = true; + autoLoad = true; }; + which-key.settings.spec = [ { __unkeyed-1 = "d"; @@ -196,70 +208,55 @@ } ]; }; + keymaps = [ { key = "dt"; action.__raw = "function() require('dap').toggle_breakpoint() end"; mode = [ "n" ]; - options = { - desc = "Toggle Breakpoint"; - }; + options.desc = "Toggle Breakpoint"; } { key = "dc"; action.__raw = "function() require('dap').continue() end"; mode = [ "n" ]; - options = { - desc = "Continue"; - }; + options.desc = "Continue"; } { key = "dc"; action.__raw = "function() require('dap').continue() end"; mode = [ "n" ]; - options = { - desc = "Continue"; - }; + options.desc = "Continue"; } { key = "di"; action.__raw = "function() require('dap').step_into() end"; mode = [ "n" ]; - options = { - desc = "Step Into"; - }; + options.desc = "Step Into"; } { key = "do"; action.__raw = "function() require('dap').step_over() end"; mode = [ "n" ]; - options = { - desc = "Step Over"; - }; + options.desc = "Step Over"; } { key = "du"; action.__raw = "function() require('dap').step_out() end"; mode = [ "n" ]; - options = { - desc = "Step Out"; - }; + options.desc = "Step Out"; } { key = "dr"; action.__raw = "function() require('dap').repl.open() end"; mode = [ "n" ]; - options = { - desc = "Open REPL"; - }; + options.desc = "Open REPL"; } { key = "dl"; action.__raw = "function() require('dap').run_last() end"; mode = [ "n" ]; - options = { - desc = "Run Last"; - }; + options.desc = "Run Last"; } { key = "dq"; @@ -272,27 +269,21 @@ end ''; mode = [ "n" ]; - options = { - desc = "Terminate"; - }; + options.desc = "Terminate"; } { key = "db"; action.__raw = "function() require('dap').list_breakpoints() end"; mode = [ "n" ]; - options = { - desc = "List Breakpoints"; - }; + options.desc = "List Breakpoints"; + } { key = "de"; action.__raw = "function() require('dap').set_exception_breakpoints({ ' all ' }) end"; mode = [ "n" ]; - options = { - desc = "Set Exception Breakpoints"; - }; + options.desc = "Set Exception Breakpoints"; } ]; }; } - diff --git a/home/programs/nixvim/plugins/default.nix b/home/programs/nixvim/plugins/default.nix index aad20b5..56b6a65 100644 --- a/home/programs/nixvim/plugins/default.nix +++ b/home/programs/nixvim/plugins/default.nix @@ -1,21 +1,54 @@ { imports = [ - ./css-color.nix + ./aerial.nix + ./autopairs.nix + ./barbar.nix + ./bullets.nix + ./cmp.nix + ./colorizor.nix + ./comment-box.nix + ./comment.nix + ./conform.nix + ./csvview.nix + ./dap.nix + ./dynomark.nix + ./edgy.nix + ./gitsigns.nix ./img-clip.nix + ./knap.nix + ./lualine.nix + ./lsp.nix ./lz-n.nix + ./markdown-preview.nix + ./mkdnflow.nix + ./neoscroll.nix + ./neotree.nix + ./noice.nix + ./notify.nix + ./oil.nix + ./otter.nix + ./papis.nix ./rainbow.nix ./render-markdown.nix ./rustaceanvim.nix + ./smart-splits.nix + ./snippets.nix + ./sniprun.nix + ./startup.nix + ./surround.nix + ./todo-comments.nix ./toggleterm.nix + ./treesitter.nix ./trouble.nix + ./typst-preview.nix + ./typst-vim.nix ./undotree.nix ./unified.nix + ./vimtex.nix ./web-devicons.nix ./which-key.nix ./wilder.nix ./yazi.nix ./yuck.nix - - ./vimtex.nix ]; } diff --git a/home/programs/nixvim-old/plugins/dynomark.nix b/home/programs/nixvim/plugins/dynomark.nix similarity index 77% rename from home/programs/nixvim-old/plugins/dynomark.nix rename to home/programs/nixvim/plugins/dynomark.nix index 6363cbe..d463b6e 100644 --- a/home/programs/nixvim-old/plugins/dynomark.nix +++ b/home/programs/nixvim/plugins/dynomark.nix @@ -14,11 +14,7 @@ let in { programs.nixvim = { - - extraPlugins = [ - dynomark-nvim - ]; - + extraPlugins = [ dynomark-nvim ]; extraConfigLua = "require('dynomark').setup({})"; keymaps = [ @@ -26,17 +22,13 @@ in key = "v"; action = "(DynomarkToggle)"; mode = [ "n" ]; - options = { - desc = "Toggle Dynomark"; - }; + options.desc = "Toggle Dynomark"; } { key = "V"; action = "(DynomarkRun)"; mode = [ "n" ]; - options = { - desc = "Run Dynomark query under cursor"; - }; + options.desc = "Run Dynomark query under cursor"; } ]; }; diff --git a/home/programs/nixvim-old/plugins/edgy.nix b/home/programs/nixvim/plugins/edgy.nix similarity index 99% rename from home/programs/nixvim-old/plugins/edgy.nix rename to home/programs/nixvim/plugins/edgy.nix index d158c14..e188aaa 100644 --- a/home/programs/nixvim-old/plugins/edgy.nix +++ b/home/programs/nixvim/plugins/edgy.nix @@ -9,10 +9,12 @@ # To prevent this, set `splitkeep` to either `screen` or `topline`. splitkeep = "screen"; }; + plugins = { edgy = { enable = true; autoLoad = true; + settings = { bottom.__raw = '' { @@ -37,6 +39,7 @@ } } ''; + left.__raw = '' { -- Neo-tree filesystem always takes half the screen height @@ -77,4 +80,3 @@ }; }; } - diff --git a/home/programs/nixvim/plugins/gitsigns.nix b/home/programs/nixvim/plugins/gitsigns.nix new file mode 100644 index 0000000..afeffce --- /dev/null +++ b/home/programs/nixvim/plugins/gitsigns.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.nixvim.plugins.gitsigns = { + enable = true; + autoLoad = true; + }; +} diff --git a/home/programs/nixvim-old/plugins/haskell-tools.nix b/home/programs/nixvim/plugins/haskell-tools.nix similarity index 82% rename from home/programs/nixvim-old/plugins/haskell-tools.nix rename to home/programs/nixvim/plugins/haskell-tools.nix index ae590df..f8aa995 100644 --- a/home/programs/nixvim-old/plugins/haskell-tools.nix +++ b/home/programs/nixvim/plugins/haskell-tools.nix @@ -12,8 +12,6 @@ haskellPackages.ghci-dap ]; - extraPlugins = with pkgs.vimPlugins; [ - haskell-tools-nvim - ]; + extraPlugins = with pkgs.vimPlugins; [ haskell-tools-nvim ]; }; } diff --git a/home/programs/nixvim-old/plugins/knap.nix b/home/programs/nixvim/plugins/knap.nix similarity index 54% rename from home/programs/nixvim-old/plugins/knap.nix rename to home/programs/nixvim/plugins/knap.nix index b2f8fea..71fa400 100644 --- a/home/programs/nixvim-old/plugins/knap.nix +++ b/home/programs/nixvim/plugins/knap.nix @@ -1,6 +1,5 @@ { pkgs, ... }: -# TODO: Make filetype keybindings work let keys = [ { @@ -11,9 +10,7 @@ let "v" "i" ]; - options = { - desc = "Close Viewer (knap)"; - }; + options.desc = "Close Viewer (knap)"; } { action.__raw = "function() require('knap').toggle_autopreviewing() end"; @@ -23,9 +20,7 @@ let "v" "i" ]; - options = { - desc = "Toggle Auto-Processing (knap)"; - }; + options.desc = "Toggle Auto-Processing (knap)"; } { action.__raw = "function() require('knap').forward_jump() end"; @@ -35,9 +30,7 @@ let "v" "i" ]; - options = { - desc = "SyncTeX Forward Search (Knap)"; - }; + options.desc = "SyncTeX Forward Search (Knap)"; } ]; in @@ -47,22 +40,18 @@ in texliveFull rubber ]; + programs.nixvim = { extraPlugins = with pkgs.vimPlugins; [ knap ]; - globals = { - knap_settings = { - htmltohtmlviewerlaunch = "luakit %outputfile%"; - mdtohtmlviewerlaunch = "luakit %outputfile%"; - markdowntohtmlviewerlaunch = "luakit %outputfile%"; - }; + globals.knap_settings = { + htmltohtmlviewerlaunch = "luakit %outputfile%"; + mdtohtmlviewerlaunch = "luakit %outputfile%"; + markdowntohtmlviewerlaunch = "luakit %outputfile%"; }; + files = { - "ftplugin/latex.lua" = { - keymaps = keys; - }; - "ftplugin/markdown.lua" = { - keymaps = keys; - }; + "ftplugin/latex.lua".keymaps = keys; + "ftplugin/markdown.lua".keymaps = keys; }; }; } diff --git a/home/programs/nixvim/plugins/lsp.nix b/home/programs/nixvim/plugins/lsp.nix new file mode 100644 index 0000000..0370ef8 --- /dev/null +++ b/home/programs/nixvim/plugins/lsp.nix @@ -0,0 +1,67 @@ +{ pkgs, config, ... }: + +{ + home.packages = with pkgs; [ + tofu-ls + zuban + ]; + + programs.nixvim = { + plugins.lsp = { + enable = true; + autoLoad = true; + }; + + lsp = { + luaConfig = { + post = '' + vim.lsp.enable('tofu_ls') + vim.lsp.enable('prolog_ls') + ''; + }; + servers = { + nixd.enable = false; + rust_analyzer.enable = true; + leanls.enable = true; + nil_ls = { + enable = !config.programs.nixvim.plugins.lsp.servers.nixd.enable; + config = { + nil = { + formatting.command = [ "nixfmt" ]; + diagnostics.ignored = [ ]; + nix.flake.autoArchive = true; + }; + }; + }; + nushell.enable = true; + pylsp.enable = true; + pylyzer.enable = false; + pyright.enable = true; + clangd.enable = true; + zk.enable = true; + elixirls.enable = true; + marksman.enable = true; + texlab.enable = true; + lua_ls.enable = true; + ltex_plus = { + enable = true; + package = pkgs.ltex-ls-plus; + config = { + ltex = { + language = "en-US"; + enabled = [ + "latex" + "tex" + "bibtex" + "markdown" + "typst" + "quarto" + ]; + }; + }; + }; + tinymist.enable = true; + }; + }; + }; +} diff --git a/home/programs/nixvim/plugins/lualine.nix b/home/programs/nixvim/plugins/lualine.nix new file mode 100644 index 0000000..6ceba03 --- /dev/null +++ b/home/programs/nixvim/plugins/lualine.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.nixvim.plugins.lualine = { + enable = true; + autoLoad = true; + }; +} diff --git a/home/programs/nixvim/plugins/markdown-preview.nix b/home/programs/nixvim/plugins/markdown-preview.nix new file mode 100644 index 0000000..809f073 --- /dev/null +++ b/home/programs/nixvim/plugins/markdown-preview.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.nixvim.plugins.markdown-preview = { + enable = true; + lazyLoad.settings.filetypes = [ "md" ]; + }; +} diff --git a/home/programs/nixvim-old/plugins/mkdnflow.nix b/home/programs/nixvim/plugins/mkdnflow.nix similarity index 93% rename from home/programs/nixvim-old/plugins/mkdnflow.nix rename to home/programs/nixvim/plugins/mkdnflow.nix index dd4ea42..b28397e 100644 --- a/home/programs/nixvim-old/plugins/mkdnflow.nix +++ b/home/programs/nixvim/plugins/mkdnflow.nix @@ -2,13 +2,13 @@ { programs.nixvim = { - extraConfigLua = '' - vim.api.nvim_create_autocmd("FileType", {pattern = "markdown", command = "set awa"}) - ''; + extraConfigLua = ''vim.api.nvim_create_autocmd("FileType", {pattern = "markdown", command = "set awa"})''; plugins = { mkdnflow = { enable = true; + lazyLoad.settings.filetypes = [ "md" ]; + settings = { links = { style = "wiki"; @@ -31,6 +31,7 @@ end ''; }; + modules = { conceal = true; cursor = true; @@ -42,10 +43,12 @@ tables = true; yaml = true; }; + filetypes = { markdown = true; qmd = true; }; + to_do = { symbols = [ " " @@ -54,6 +57,7 @@ ]; status_propagation.up = true; }; + foldtext = { title_transformer.__raw = '' function() @@ -104,6 +108,7 @@ middle = "─"; }; }; + mappings = { MkdnEnter = [ [ @@ -165,6 +170,7 @@ "" ]; }; + create_dirs = true; new_file_template = { use_template = true; @@ -173,10 +179,14 @@ date = "os_date"; }; template = '' - --- + --- title: {{ title }} + description: + published: true date: {{ date }} - tags: [] + tags: private + editor: markdown + dateCreated: {{ date }} --- # {{ title }} ''; diff --git a/home/programs/nixvim-old/plugins/neoscroll.nix b/home/programs/nixvim/plugins/neoscroll.nix similarity index 95% rename from home/programs/nixvim-old/plugins/neoscroll.nix rename to home/programs/nixvim/plugins/neoscroll.nix index 40a4403..c487cb6 100644 --- a/home/programs/nixvim-old/plugins/neoscroll.nix +++ b/home/programs/nixvim/plugins/neoscroll.nix @@ -4,6 +4,8 @@ programs.nixvim.plugins = { neoscroll = { enable = true; + autoLoad = true; + settings = { cursor_scrolls_alone = true; easing_function = "quadratic"; @@ -22,7 +24,6 @@ respect_scrolloff = false; stop_eof = true; }; - }; }; } diff --git a/home/programs/nixvim/plugins/neotree.nix b/home/programs/nixvim/plugins/neotree.nix new file mode 100644 index 0000000..e2c45f7 --- /dev/null +++ b/home/programs/nixvim/plugins/neotree.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + programs.nixvim.plugins.neo-tree = { + enable = true; + autoLoad = true; + + settings.enable_git_status = true; + }; +} diff --git a/home/programs/nixvim/plugins/noice.nix b/home/programs/nixvim/plugins/noice.nix new file mode 100644 index 0000000..2d34538 --- /dev/null +++ b/home/programs/nixvim/plugins/noice.nix @@ -0,0 +1,23 @@ +{ ... }: + +{ + programs.nixvim.plugins.noice = { + enable = true; + autoLoad = true; + + settings = { + lsp.override = { + "vim.lsp.util.convert_input_to_markdown_lines" = true; + "vim.lsp.util.stylize_markdown" = true; + }; + + prests = { + bottom_search = true; + command_palette = true; + inc_rename = false; + long_message_to_split = true; + lsp_doc_border = false; + }; + }; + }; +} diff --git a/home/programs/nixvim/plugins/notify.nix b/home/programs/nixvim/plugins/notify.nix new file mode 100644 index 0000000..bc9e9da --- /dev/null +++ b/home/programs/nixvim/plugins/notify.nix @@ -0,0 +1,14 @@ +{ ... }: + +{ + programs.nixvim = { + plugins.notify = { + enable = true; + autoLoad = true; + + settings.render = "wrapped-compact"; + }; + + opts.termguicolors = true; + }; +} diff --git a/home/programs/nixvim/plugins/oil.nix b/home/programs/nixvim/plugins/oil.nix new file mode 100644 index 0000000..79a611b --- /dev/null +++ b/home/programs/nixvim/plugins/oil.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.nixvim.plugins.oil = { + enable = true; + autoLoad = true; + }; +} diff --git a/home/programs/nixvim-old/plugins/openscad.nix b/home/programs/nixvim/plugins/openscad.nix similarity index 92% rename from home/programs/nixvim-old/plugins/openscad.nix rename to home/programs/nixvim/plugins/openscad.nix index 1860dce..f3cda17 100644 --- a/home/programs/nixvim-old/plugins/openscad.nix +++ b/home/programs/nixvim/plugins/openscad.nix @@ -3,6 +3,8 @@ { programs.nixvim.plugins.openscad = { enable = true; + lazyLoad.settings.filetype = [ "scad" ]; + luaConfig.post = '' vim.g.openscad_fuzzy_finder = 'skim' -- when the pdf_command is run, the last argument will be the pdf filename diff --git a/home/programs/nixvim/plugins/otter.nix b/home/programs/nixvim/plugins/otter.nix new file mode 100644 index 0000000..dd064cf --- /dev/null +++ b/home/programs/nixvim/plugins/otter.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.nixvim.plugins.otter = { + enable = true; + autoLoad = true; + }; +} diff --git a/home/programs/nixvim/plugins/papis.nix b/home/programs/nixvim/plugins/papis.nix new file mode 100644 index 0000000..cb80137 --- /dev/null +++ b/home/programs/nixvim/plugins/papis.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: + +{ + programs.nixvim = { + plugins.papis = { + enable = true; + autoLoad = true; + + settings = { + yq_bin = "${pkgs.yq-go}/bin/yq"; + search.provider = "telescope"; + }; + }; + + keymaps = [ + { + key = "pp"; + action = "Papis search"; + mode = [ "n" ]; + options.desc = "Papis"; + } + ]; + }; +} diff --git a/home/programs/nixvim/plugins/rainbow.nix b/home/programs/nixvim/plugins/rainbow.nix index 24b06e8..112ea87 100644 --- a/home/programs/nixvim/plugins/rainbow.nix +++ b/home/programs/nixvim/plugins/rainbow.nix @@ -1,98 +1,75 @@ -{ pkgs, ... }: +{ ... }: { - programs.nixvim = { - plugins = { - rainbow = { - enable = true; - lazyLoad.settings.event = [ - "BufReadPost" - "BufNewFile" - ]; + programs.nixvim.plugins.rainbow = { + enable = true; + autoLoad = true; - settings = { - active = 1; - conf = { - guifgs = [ - "#f5c2e7" - "#eba0ac" - "#a6e3a1" - "#74c7ec" - "#f5e0dc" - "#cba6f7" - "#fab387" - "#94e2d5" - "#89b4fa" - "#f2cdcd" - "#f38ba8" - "#f9e2af" - "#89dceb" - "#b4befe" - ]; - operators = "_,_"; - parentheses = [ - "start=/(/ end=/)/ fold" - "start=/{/ end=/}/ fold" - "start=/\\[/ end=/\\]/ fold" - "start=/\\begin/ end=/\\end/ fold" - ]; - separately = { - "*" = { - parentheses = [ - "start=/(/ end=/)/ fold" - "start=/{/ end=/}/ fold" - "start=/\\[/ end=/\\]/ fold" - ]; - }; - css = 0; - haskell = { - parentheses = [ - "start=/(/ end=/)/ fold" - "start=/\[/ end=/\]/ fold" - "start=/\v\{\ze[^-]/ end=/}/ fold" - ]; - }; - lisp = { - guifgs = [ - "#f5c2e7" - "#eba0ac" - "#a6e3a1" - "#74c7ec" - "#f5e0dc" - "#cba6f7" - "#fab387" - "#94e2d5" - "#89b4fa" - "#f2cdcd" - "#f38ba8" - "#f9e2af" - "#89dceb" - "#b4befe" - ]; - }; - markdown = { - parentheses_options = "containedin=markdownCode contained"; - }; - nerdtree = 0; - perl = { - syn_name_prefix = "perlBlockFoldRainbow"; - }; - stylus = { - parentheses = [ "start=/{/ end=/}/ fold contains=@colorableGroup" ]; - }; - tex = { - parentheses = [ - "start=/(/ end=/)/ fold" - "start=/{/ end=/}/ fold" - "start=/\\[/ end=/\\]/ fold" - "start=/\\begin/ end=/\\end/ fold" - ]; - }; - vim = { - parentheses_options = "containedin=vimFuncBody"; - }; - }; - }; + settings = { + active = 1; + conf = { + guifgs = [ + "#f5c2e7" + "#eba0ac" + "#a6e3a1" + "#74c7ec" + "#f5e0dc" + "#cba6f7" + "#fab387" + "#94e2d5" + "#89b4fa" + "#f2cdcd" + "#f38ba8" + "#f9e2af" + "#89dceb" + "#b4befe" + ]; + operators = "_,_"; + parentheses = [ + "start=/(/ end=/)/ fold" + "start=/{/ end=/}/ fold" + "start=/\\[/ end=/\\]/ fold" + "start=/\\begin/ end=/\\end/ fold" + ]; + separately = { + "*".parentheses = [ + "start=/(/ end=/)/ fold" + "start=/{/ end=/}/ fold" + "start=/\\[/ end=/\\]/ fold" + ]; + css = 0; + haskell.parentheses = [ + "start=/(/ end=/)/ fold" + "start=/\[/ end=/\]/ fold" + "start=/\v\{\ze[^-]/ end=/}/ fold" + ]; + lisp.guifgs = [ + "#f5c2e7" + "#eba0ac" + "#a6e3a1" + "#74c7ec" + "#f5e0dc" + "#cba6f7" + "#fab387" + "#94e2d5" + "#89b4fa" + "#f2cdcd" + "#f38ba8" + "#f9e2af" + "#89dceb" + "#b4befe" + ]; + markdown.parentheses_options = "containedin=markdownCode contained"; + nerdtree = 0; + perl.syn_name_prefix = "perlBlockFoldRainbow"; + stylus.parentheses = [ "start=/{/ end=/}/ fold contains=@colorableGroup" ]; + tex.parentheses = [ + "start=/(/ end=/)/ fold" + "start=/{/ end=/}/ fold" + "start=/\\[/ end=/\\]/ fold" + "start=/\\begin/ end=/\\end/ fold" + ]; + vim.parentheses_options = "containedin=vimFuncBody"; }; }; }; diff --git a/home/programs/nixvim/plugins/render-markdown.nix b/home/programs/nixvim/plugins/render-markdown.nix index 5aef979..7984e31 100644 --- a/home/programs/nixvim/plugins/render-markdown.nix +++ b/home/programs/nixvim/plugins/render-markdown.nix @@ -13,6 +13,15 @@ ft = [ "markdown" ]; latex.enabled = false; completions.lsp.enabled = true; + + code = { + width = "block"; + min_width = 45; + left_pad = 2; + language_pad = 2; + }; + + heading.icons = [ "󰎤 " "󰎧 " "󰎪 " "󰎭 " "󰎱 " "󰎳 " ]; }; }; @@ -28,11 +37,9 @@ keymaps = [ { action = "RenderMarkdown toggle"; - key = "mp"; + key = "ms"; mode = "n"; - options = { - desc = "Toggle markdown preview"; - }; + options.desc = "Toggle markdown preview"; } ]; }; diff --git a/home/programs/nixvim/plugins/rustaceanvim.nix b/home/programs/nixvim/plugins/rustaceanvim.nix index 649658e..40218f2 100644 --- a/home/programs/nixvim/plugins/rustaceanvim.nix +++ b/home/programs/nixvim/plugins/rustaceanvim.nix @@ -4,49 +4,41 @@ programs.nixvim = { extraPackages = with pkgs; [ rust-analyzer ]; - plugins = { - rustaceanvim = { - enable = true; - lazyload.settings.filetype = "rs"; - }; + plugins.rustaceanvim = { + enable = true; + lazyload.settings.filetype = [ "rs" ]; }; - files = { - "ftplugin/rust.lua" = { - keymaps = [ - { - action.__raw = '' - function() - vim.cmd.RustAnalyzer('codeAction') - end - ''; - key = "a"; - mode = [ - "n" - ]; - options = { - desc = "Code action"; - silent = true; - buffer.__raw = "vim.api.nvim_get_current_buf()"; - }; - } - { - action.__raw = '' - function() - vim.cmd.RustAnalyzer({'hover', 'actions'}) - end - ''; - key = "K"; - mode = [ - "n" - ]; - options = { - silent = true; - buffer.__raw = "vim.api.nvim_get_current_buf()"; - }; - } - ]; - }; + files."ftplugin/rust.lua" = { + keymaps = [ + { + action.__raw = '' + function() + vim.cmd.RustAnalyzer('codeAction') + end + ''; + key = "a"; + mode = [ "n" ]; + options = { + desc = "Code action"; + silent = true; + buffer.__raw = "vim.api.nvim_get_current_buf()"; + }; + } + { + action.__raw = '' + function() + vim.cmd.RustAnalyzer({'hover', 'actions'}) + end + ''; + key = "K"; + mode = [ "n" ]; + options = { + silent = true; + buffer.__raw = "vim.api.nvim_get_current_buf()"; + }; + } + ]; }; }; } diff --git a/home/programs/nixvim/plugins/smart-splits.nix b/home/programs/nixvim/plugins/smart-splits.nix new file mode 100644 index 0000000..150563b --- /dev/null +++ b/home/programs/nixvim/plugins/smart-splits.nix @@ -0,0 +1,108 @@ +{ ... }: + +{ + programs.nixvim = { + plugins = { + smart-splits = { + enable = true; + autoLoad = true; + }; + }; + keymaps = [ + { + action.__raw = "require('smart-splits').move_cursor_left"; + key = "h"; + mode = "n"; + } + { + action.__raw = "require('smart-splits').move_cursor_right"; + key = "l"; + mode = "n"; + } + { + action.__raw = "require('smart-splits').move_cursor_down"; + key = "j"; + mode = "n"; + } + { + action.__raw = "require('smart-splits').move_cursor_up"; + key = "k"; + mode = "n"; + } + { + action.__raw = "require('smart-splits').resize_left"; + key = "h"; + mode = "n"; + } + { + action.__raw = "require('smart-splits').resize_right"; + key = "l"; + mode = "n"; + } + { + action.__raw = "require('smart-splits').resize_down"; + key = "j"; + mode = "n"; + } + { + action.__raw = "require('smart-splits').resize_up"; + key = "k"; + mode = "n"; + } + { + action = "silent !kitten @ launch --location=hsplit"; + key = "s"; + mode = [ + "n" + "v" + "i" + ]; + } + { + action = "silent !kitten @ launch --location=vsplit"; + key = "v"; + mode = [ + "n" + "v" + "i" + ]; + } + { + action = "silent !kitten @ launch --location=hsplit --cwd=current --bias=35"; + key = "p"; + mode = [ + "n" + "v" + "i" + ]; + } + { + action = "silent !kitten @ close-window"; + key = "q"; + mode = [ + "n" + "v" + "i" + ]; + } + { + action = "silent !kitten @ action layout_action rotate"; + key = "r"; + mode = [ + "n" + "v" + "i" + ]; + } + { + action = "silent !kitten @ action toggle_layout stack"; + key = "f"; + mode = [ + "n" + "v" + "i" + ]; + } + ]; + }; +} diff --git a/home/programs/nixvim-old/plugins/snippets.nix b/home/programs/nixvim/plugins/snippets.nix similarity index 72% rename from home/programs/nixvim-old/plugins/snippets.nix rename to home/programs/nixvim/plugins/snippets.nix index a4d9aeb..4671523 100644 --- a/home/programs/nixvim-old/plugins/snippets.nix +++ b/home/programs/nixvim/plugins/snippets.nix @@ -1,15 +1,17 @@ -{...}: +{ ... }: { programs.nixvim.plugins = { luasnip = { enable = true; + autoLoad = true; + fromVscode = [ { } ]; }; friendly-snippets = { enable = true; + lazyLoad.enable = false; }; }; } - diff --git a/home/programs/nixvim/plugins/sniprun.nix b/home/programs/nixvim/plugins/sniprun.nix new file mode 100644 index 0000000..9ede917 --- /dev/null +++ b/home/programs/nixvim/plugins/sniprun.nix @@ -0,0 +1,27 @@ +{ ... }: + +{ + programs.nixvim.plugins.sniprun = { + enable = true; + autoLoad = true; + + settings = { + display = [ "VirtualLine" ]; + snipruncolors = { + SniprunVirtualTextOk = { + bg = "#91d7e3"; + fg = "#000000"; + ctermbg = "Cyan"; + ctermfg = "Black"; + }; + + SniprunVirtualTextErr = { + bg = "#ee99a0"; + fg = "#000000"; + ctermbg = "DarkRed"; + ctermfg = "Black"; + }; + }; + }; + }; +} diff --git a/home/programs/nixvim/plugins/startup.nix b/home/programs/nixvim/plugins/startup.nix new file mode 100644 index 0000000..e952f6c --- /dev/null +++ b/home/programs/nixvim/plugins/startup.nix @@ -0,0 +1,71 @@ +{ ... }: + +{ + programs.nixvim.plugins.startup = { + enable = true; + autoLoad = true; + + settings = { + theme = "dashboard"; + sections = { + body = { + align = "center"; + content = [ + [ + " Find File" + "Telescope find_files" + "ff" + ] + [ + "󰍉 Find Word" + "Telescope live_grep" + "lg" + ] + [ + " Recent Files" + "Telescope oldfiles" + "of" + ] + [ + " Yazi" + "Telescope file_browser" + "yf" + ] + [ + " Colorschemes" + "Telescope colorscheme" + "cs" + ] + [ + " New File" + "lua require'startup'.new_file()" + "nf" + ] + ]; + + defaultColor = ""; + foldSection = true; + highlight = "String"; + margin = 5; + oldfilesAmount = 0; + title = "Basic Commands"; + type = "mapping"; + }; + + header = { + align = "center"; + content = { + __raw = "require('startup.headers').hydra_header"; + }; + defaultColor = ""; + foldSection = false; + highlight = "Statement"; + margin = 5; + oldfilesAmount = 0; + title = "Header"; + type = "text"; + }; + }; + }; + }; +} diff --git a/home/programs/nixvim/plugins/surround.nix b/home/programs/nixvim/plugins/surround.nix new file mode 100644 index 0000000..2145737 --- /dev/null +++ b/home/programs/nixvim/plugins/surround.nix @@ -0,0 +1,172 @@ +{ ... }: + +{ + programs.nixvim.plugins.nvim-surround = { + enable = true; + autoLoad = true; + + luaConfig.post = '' + local M = {} + + M.get_input = function(prompt) + local input = require("nvim-surround.input") + return input.get_input(prompt) + end + + M.get_selection = function(args) + if args.char then + return M.get_find(args.char)(args.char) + elseif args.motion then + return require("nvim-surround.motions").get_selection(args.motion) + elseif args.node then + return require("nvim-surround.treesitter").get_selection(args.node) + elseif args.pattern then + return require("nvim-surround.patterns").get_selection(args.pattern) + elseif args.query then + return require("nvim-surround.queries").get_selection(args.query.capture, args.query.type) + else + vim.notify("Invalid key provided for `:h nvim-surround.config.get_selection()`.", vim.log.levels.ERROR) + end + end + + surrounds = { + ["("] = { + add = { "( ", " )" }, + find = function() + return M.get_selection({ motion = "a(" }) + end, + delete = "^(. ?)().-( ?.)()$", + }, + + [")"] = { + add = { "(", ")" }, + find = function() + return M.get_selection({ motion = "a)" }) + end, + delete = "^(.)().-(.)()$", + }, + + ["{"] = { + add = { "{ ", " }" }, + find = function() + return M.get_selection({ motion = "a{" }) + end, + delete = "^(. ?)().-( ?.)()$", + }, + + ["}"] = { + add = { "{", "}" }, + find = function() + return M.get_selection({ motion = "a}" }) + end, + delete = "^(.)().-(.)()$", + }, + + ["<"] = { + add = { "< ", " >" }, + find = function() + return M.get_selection({ motion = "a<" }) + end, + delete = "^(. ?)().-( ?.)()$", + }, + + [">"] = { + add = { "<", ">" }, + find = function() + return M.get_selection({ motion = "a>" }) + end, + delete = "^(.)().-(.)()$", + }, + + ["["] = { + add = { "[ ", " ]" }, + find = function() + return M.get_selection({ motion = "a[" }) + end, + delete = "^(. ?)().-( ?.)()$", + }, + + ["]"] = { + add = { "[", "]" }, + find = function() + return M.get_selection({ motion = "a]" }) + end, + delete = "^(.)().-(.)()$", + }, + + ["'"] = { + add = { "'", "'" }, + find = function() + return M.get_selection({ motion = "a'" }) + end, + delete = "^(.)().-(.)()$", + }, + + ['"'] = { + add = { '"', '"' }, + find = function() + return M.get_selection({ motion = 'a"' }) + end, + delete = "^(.)().-(.)()$", + }, + + ["`"] = { + add = { "`", "`" }, + find = function() + return M.get_selection({ motion = "a`" }) + end, + delete = "^(.)().-(.)()$", + }, + + ["i"] = { + add = function() + local left_delimiter = M.get_input("Enter the left delimiter: ") + local right_delimiter = left_delimiter and M.get_input("Enter the right delimiter: ") + if right_delimiter then + return { { left_delimiter }, { right_delimiter } } + end + end, + find = function() end, + delete = function() end, + }, + } + ''; + + settings.aliases = { + "a" = ">"; + "b" = ")"; + "B" = "}"; + "r" = "]"; + "q" = [ + "\"" + "'" + "`" + ]; + "Q" = "''"; + "s" = [ + "}" + "]" + ")" + ">" + "\"" + "'" + "`" + ]; + }; + + keymaps = { + insert = "s"; + insert_line = "S"; + normal = "ys"; + normal_cur = "yss"; + normal_line = "yS"; + normal_cur_line = "ySS"; + visual = "S"; + visual_line = "gS"; + delete = "ds"; + # TODO: This keymap clashed with comment boxses + change = "cs"; + change_line = "cS"; + }; + }; +} diff --git a/home/programs/nixvim-old/plugins/todo-comments.nix b/home/programs/nixvim/plugins/todo-comments.nix similarity index 98% rename from home/programs/nixvim-old/plugins/todo-comments.nix rename to home/programs/nixvim/plugins/todo-comments.nix index b489a0f..84fce8c 100644 --- a/home/programs/nixvim-old/plugins/todo-comments.nix +++ b/home/programs/nixvim/plugins/todo-comments.nix @@ -4,38 +4,47 @@ programs.nixvim.plugins = { todo-comments = { enable = true; + autoLoad = true; + settings = { highlight = { comments_only = false; }; + colors = { default = [ "Identifier" "#7C3AED" ]; + error = [ "DiagnosticError" "ErrorMsg" "#DC2626" ]; + hint = [ "DiagnosticHint" "#10B981" ]; + info = [ "DiagnosticInfo" "#2563EB" ]; + test = [ "Identifier" "#FF00FF" ]; + warning = [ "DiagnosticWarn" "WarningMsg" "#FBBF24" ]; }; + keywords = { FIX = { alt = [ @@ -47,10 +56,12 @@ color = "error"; icon = " "; }; + HACK = { color = "warning"; icon = " "; }; + NOTE = { alt = [ "INFO" @@ -58,6 +69,7 @@ color = "hint"; icon = " "; }; + PERF = { alt = [ "OPTIM" @@ -66,6 +78,7 @@ ]; icon = " "; }; + TEST = { alt = [ "TESTING" @@ -75,10 +88,12 @@ color = "test"; icon = "⏲ "; }; + TODO = { color = "info"; icon = " "; }; + WARN = { alt = [ "WARNING" diff --git a/home/programs/nixvim/plugins/toggleterm.nix b/home/programs/nixvim/plugins/toggleterm.nix index 696e114..97c3b17 100644 --- a/home/programs/nixvim/plugins/toggleterm.nix +++ b/home/programs/nixvim/plugins/toggleterm.nix @@ -20,7 +20,7 @@ which-key.settings.spec = [ { - __unkeyed-1 = "c"; + __unkeyed-1 = "s"; group = "Terminal"; icon = " "; } @@ -30,27 +30,21 @@ keymaps = [ { action = "ToggleTermSendCurrentLine"; - key = "cl"; + key = "sl"; mode = "n"; - options = { - desc = "Send Current Line"; - }; + options.desc = "Send Current Line"; } { action = "ToggleTermSendVisualLines"; - key = "cv"; + key = "sv"; mode = "x"; - options = { - desc = "Send all the (whole) lines in selection"; - }; + options.desc = "Send all the (whole) lines in selection"; } { action = "ToggleTermSendVisualSelection"; - key = "cs"; + key = "ss"; mode = "x"; - options = { - desc = "Send selection"; - }; + options.desc = "Send selection"; } ]; }; diff --git a/home/programs/nixvim-old/plugins/treesitter.nix b/home/programs/nixvim/plugins/treesitter.nix similarity index 83% rename from home/programs/nixvim-old/plugins/treesitter.nix rename to home/programs/nixvim/plugins/treesitter.nix index 2292946..458f9fd 100644 --- a/home/programs/nixvim-old/plugins/treesitter.nix +++ b/home/programs/nixvim/plugins/treesitter.nix @@ -4,6 +4,8 @@ programs.nixvim.plugins = { treesitter = { enable = true; + autoLoad = true; + folding.enable = false; settings = { auto_install = false; @@ -13,6 +15,7 @@ ts-context-commentstring = { enable = true; + lazyLoad.enable = false; }; }; } diff --git a/home/programs/nixvim/plugins/trouble.nix b/home/programs/nixvim/plugins/trouble.nix index ca829fc..37e77a2 100644 --- a/home/programs/nixvim/plugins/trouble.nix +++ b/home/programs/nixvim/plugins/trouble.nix @@ -16,9 +16,7 @@ # Diagnostics for the current buffer only diagnostics_buffer = { mode = "diagnostics"; - filter = { - buf = 0; - }; + filter.buf = 0; }; }; focus = false; diff --git a/home/programs/nixvim/plugins/typst-preview.nix b/home/programs/nixvim/plugins/typst-preview.nix new file mode 100644 index 0000000..611f1d1 --- /dev/null +++ b/home/programs/nixvim/plugins/typst-preview.nix @@ -0,0 +1,30 @@ +{ ... }: + +{ + programs.nixvim = { + plugins.typst-preview = { + enable = true; + lazyLoad = { + settings = { + ft = [ "typst" ]; + cmd = "TypstPreview"; + }; + }; + + settings.open_command = "qutebrowser --target tab %s"; + }; + + files."ftplugin/typst.lua".keymaps = [ + { + action = "TypstPreview"; + key = "t"; + mode = [ + "n" + "v" + "i" + ]; + options.desc = "Typst Preview"; + } + ]; + }; +} diff --git a/home/programs/nixvim/plugins/typst-vim.nix b/home/programs/nixvim/plugins/typst-vim.nix new file mode 100644 index 0000000..be86fce --- /dev/null +++ b/home/programs/nixvim/plugins/typst-vim.nix @@ -0,0 +1,15 @@ +{ ... }: + +# TODO: conceal does not work +{ + programs.nixvim.plugins.typst-vim = { + enable = true; + lazyLoad.settings.filetypes = [ "typst" ]; + + settings = { + conceal = 1; + conceal_math = 1; + conceal_emoji = 1; + }; + }; +} diff --git a/home/programs/nixvim/plugins/unified.nix b/home/programs/nixvim/plugins/unified.nix index 28cbead..835f263 100644 --- a/home/programs/nixvim/plugins/unified.nix +++ b/home/programs/nixvim/plugins/unified.nix @@ -16,6 +16,7 @@ } ]; }; + keymaps = [ { key = "us"; diff --git a/home/programs/nixvim/plugins/vimtex.nix b/home/programs/nixvim/plugins/vimtex.nix index d5b38fe..30ed032 100644 --- a/home/programs/nixvim/plugins/vimtex.nix +++ b/home/programs/nixvim/plugins/vimtex.nix @@ -1,17 +1,45 @@ -{ ... }: +{ pkgs,... }: { programs.nixvim = { + extraPackages = with pkgs; [ + texliveFull + texlivePackages.standalone + texlivePackages.relsize # needed for BA + # papis-nvim + ]; + plugins = { vimtex = { enable = true; + lazyLoad.settings.filetype = [ "tex" ]; + settings = { view_automatic = false; mappings_disable = { "n" = [ "K" ]; }; + view_method = "zathura"; }; }; + + ltex-extra = { + enable = true; + lazyLoad.settings.filetype = [ "tex" ]; + }; + + texpresso = { + enable = true; + lazyload.settings.filetype = [ "tex" ]; + }; + + which-key.settings.spec = [ + { + __unkeyed-1 = "v"; + group = "Vimtex"; + icon = " "; + } + ]; }; autoGroups = { @@ -36,5 +64,36 @@ ''; } ]; + + keymaps = [ + { + key = "vc"; + action = "VimtexCompile"; + options.desc = "Start Vimtex"; + } + { + key = "vs"; + action = "VimtexStop"; + options.desc = "Stop Vimtex"; + } + { + key = "vr"; + action = "VimtexClean"; + options.desc = "Clean Vimtex"; + } + ]; + + files."ftplugin/latex.lua".keymaps = [ + { + action = "Texpresso %"; + key = "t"; + mode = [ + "n" + "v" + "i" + ]; + options.desc = "Start Texpresso"; + } + ]; }; } diff --git a/home/programs/nixvim/plugins/web-devicons.nix b/home/programs/nixvim/plugins/web-devicons.nix index ec55149..625bbb0 100644 --- a/home/programs/nixvim/plugins/web-devicons.nix +++ b/home/programs/nixvim/plugins/web-devicons.nix @@ -3,9 +3,6 @@ { programs.nixvim.plugins.web-devicons = { enable = true; - lazyLoad.settings.event = [ - "BufReadPost" - "BufNewFile" - ]; + autoLoad = true; }; } diff --git a/home/programs/nixvim/plugins/which-key.nix b/home/programs/nixvim/plugins/which-key.nix index 3495e3f..e6d8209 100644 --- a/home/programs/nixvim/plugins/which-key.nix +++ b/home/programs/nixvim/plugins/which-key.nix @@ -3,9 +3,6 @@ { programs.nixvim.plugins.which-key = { enable = true; - lazyLoad.settings.event = [ - "BufReadPost" - "BufNewFile" - ]; + autoLoad = true; }; } diff --git a/home/programs/nixvim/plugins/wilder.nix b/home/programs/nixvim/plugins/wilder.nix index 3df495d..15a54d7 100644 --- a/home/programs/nixvim/plugins/wilder.nix +++ b/home/programs/nixvim/plugins/wilder.nix @@ -3,10 +3,7 @@ { programs.nixvim.plugins.wilder = { enable = true; - lazyLoad.settings.event = [ - "BufReadPost" - "BufNewFile" - ]; + autoLoad = true; settings.modes = [ ":" diff --git a/home/programs/nixvim/plugins/yazi.nix b/home/programs/nixvim/plugins/yazi.nix index ff13518..ebe6fe2 100644 --- a/home/programs/nixvim/plugins/yazi.nix +++ b/home/programs/nixvim/plugins/yazi.nix @@ -5,10 +5,7 @@ plugins = { yazi = { enable = true; - lazyLoad.settings.event = [ - "BufReadPost" - "BufNewFile" - ]; + autoLoad = true; }; which-key.settings.spec = [ diff --git a/home/programs/nixvim/plugins/yuck.nix b/home/programs/nixvim/plugins/yuck.nix index fffd712..bef4f28 100644 --- a/home/programs/nixvim/plugins/yuck.nix +++ b/home/programs/nixvim/plugins/yuck.nix @@ -3,8 +3,6 @@ { programs.nixvim.plugins.yuck = { enable = true; - lazyLoad.settings.filetypes = [ - "yuck" - ]; + lazyLoad.settings.filetypes = [ "yuck" ]; }; } diff --git a/home/services/default.nix b/home/services/default.nix index 8833f36..4bf87df 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -2,7 +2,6 @@ { imports = [ - ./emanote.nix ./flameshot.nix ./fnott.nix ./gpg-agent.nix diff --git a/home/services/emanote.nix b/home/services/emanote.nix deleted file mode 100644 index 43e01af..0000000 --- a/home/services/emanote.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, ... }: - -let - emanote = import ( - builtins.fetchTarball { - url = "https://github.com/srid/emanote/archive/master.tar.gz"; - sha256 = "0kr8bbq1awg2c2ra1mwjxqa9m7is9b6cdksvh48g4w354h5pqbnv"; - } - ); -in -{ - imports = [ emanote.homeManagerModule ]; - services.emanote = { - enable = true; - # host = "127.0.0.1"; # default listen address is 127.0.0.1 - # port = 7000; # default http port is 7000 - notes = [ - "/home/elias/Nextcloud/zettelkasten" - ]; - # TODO: currentSystem - package = emanote.packages."x86_64-linux".default; - }; -}