diff --git a/flake.nix b/flake.nix index fd2a910..baeca71 100644 --- a/flake.nix +++ b/flake.nix @@ -61,8 +61,6 @@ } { devShells = std.harvest self [["dotfiles" "devshells"]]; - # nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ]; - # homeConfigurations = std.pick [ [ "dotfiles" "home" ] ]; homeModules = std.pick self [["repo" "home-modules"]]; packages = std.harvest self [["repo" "packages"]]; legacyPackages = std.harvest self [["repo" "home-configs"]]; diff --git a/native_configs/neovim/init.lua b/native_configs/neovim/init.lua index ff1c73c..e8bfe49 100644 --- a/native_configs/neovim/init.lua +++ b/native_configs/neovim/init.lua @@ -111,7 +111,6 @@ WPlug('nvim-treesitter/nvim-treesitter-context') -- Top one-liner context of fun WPlug('nvim-treesitter/playground') -- Sees Treesitter AST - less hair pulling, more PRs WPlug('saadparwaiz1/cmp_luasnip') -- snippet engine WPlug('L3MON4D3/LuaSnip') -- snippet engine -WPlug('mickael-menu/zk-nvim') -- Zettelkasten WPlug('folke/neodev.nvim') -- Neovim + lua development setup -- Switch cases: -- `gsp` -> PascalCase (classes), `gsc` -> camelCase (Java), `gs_` -> snake_case (C/C++/Rust) @@ -209,8 +208,8 @@ vim.opt.completeopt = { "menu", "menuone", "noselect", "noinsert" } -- vim.opt.clipboard = "unnamedplus" --- more aggressive swap file writing. ThePrimeagen believes higher number --- leads to low DX + +-- more aggressive swap file writing. ThePrimeagen believes higher number leads to low DX vim.opt.updatetime = 50 vim.g.mapleader = ' ' @@ -438,16 +437,6 @@ remap('n', 'fd', function() require('telescope.builtin').diagnostics() end, { desc = '[F]ind [D]iagnostics' }) --- ZK remap stuffs -remap('n', 'zf', function() - -- vim.cmd([[:ZkNotes]]) - require('zk').edit({}, { multi_select = false }) -end, { desc = '[Z]ettelkasten [F]iles' }) - -remap('n', 'zg', function() - vim.cmd(":ZkGrep") -end, { desc = '[Z]ettelkasten [G]rep' }) - -- tab management {{{ -- Jump to specific tab with [number] @@ -1253,49 +1242,6 @@ require("rust-tools").setup { }, } -require('zk').setup({ - picker = "telescope", - lsp = { - config = { - cmd = { "zk", "lsp" }, - name = "zk", - on_attach = on_attach, - }, - auto_attach = { - enable = true, - filetypes = { "markdown" } - }, - }, -}) - --- Custom ZkOrphans that determines unlinked notes --- `:ZkOrphans {tags = {"work"}}` -require('zk.commands').add("ZkOrphans", function(options) - options = vim.tbl_extend("force", { orphan = true }, options or {}) - -- zk.edit opens notes picker - require('zk').edit(options, { title = "Zk Orphans (unlinked notes)" }) -end) --- --- ZkGrep: opens file picker --- In the case where `match_ctor` is falsy, create a prompt. --- This is so that we distinguish between ZkGrep and ZkNotes --- Params: --- match_ctor: string | {match= :string,...} | "" | nil -require('zk.commands').add("ZkGrep", function(match_ctor) - -- handle polymorphic `match_ctor` - local grep_str = match_ctor - local match - if match_ctor == nil or match_ctor == '' then - vim.fn.inputsave() - grep_str = vim.fn.input('Grep string: >') - match = { match = grep_str } - elseif type(match_ctor) == 'string' then - match = { match = grep_str } - end - require('zk').edit(match, { title = "Grep: '" .. grep_str .. "'", mutli_select = false }) -end) - - -- Gitsigns require('gitsigns').setup { signs = { diff --git a/nix-conf/home-manager/base/neovim.nix b/nix-conf/home-manager/base/neovim.nix index eaf5a9b..cd0e555 100644 --- a/nix-conf/home-manager/base/neovim.nix +++ b/nix-conf/home-manager/base/neovim.nix @@ -22,9 +22,7 @@ pkgs.tree-sitter pkgs.fzf # file name fuzzy search pkgs.ripgrep # content fuzzy search - pkgs.zk # Zettelkasten (limited support) pkgs.fd # Required by a Telescope plugin (?) - pkgs.stdenv.cc.cc.lib pkgs.rnix-lsp # doesn't work, Mason just installs it using cargo pkgs.rust4cargo pkgs.nickel