From 3e90a97d6178ce939f6c2ae266b6f8554d88ce34 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Thu, 8 May 2025 15:00:58 -0400 Subject: [PATCH] update --- hosts/macbook/home.nix | 1 + modules/home-manager/nixcats/default.nix | 7 ++++++ modules/home-manager/nixcats/init.lua | 27 ++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index e2a66f6..c78cfb4 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -23,6 +23,7 @@ ../../modules/home-manager/direnv.nix ../../modules/home-manager/spotify-player.nix ../../modules/home-manager/nb.nix + ../../modules/home-manager/stylix.nix ]; home.username = "mthomson"; home.homeDirectory = "/Users/mthomson"; diff --git a/modules/home-manager/nixcats/default.nix b/modules/home-manager/nixcats/default.nix index 429b8df..b6ce832 100644 --- a/modules/home-manager/nixcats/default.nix +++ b/modules/home-manager/nixcats/default.nix @@ -50,6 +50,9 @@ in { vue-language-server stylelint-lsp ]; + c = with pkgs; [ + clang + ]; }; # This is for plugins that will load at startup without using packadd: @@ -62,6 +65,8 @@ in { snacks-nvim gruvbox-nvim gruber-darker-nvim + lackluster-nvim + oxocarbon-nvim vim-sleuth oil-nvim plenary-nvim @@ -91,6 +96,7 @@ in { nvim-dap nvim-dap-ui nvim-dap-virtual-text + zk-nvim ]; }; @@ -152,6 +158,7 @@ in { nix = true; go = true; typescript = true; + c = true; }; # anything else to pass and grab in lua with `nixCats.extra` extra = { diff --git a/modules/home-manager/nixcats/init.lua b/modules/home-manager/nixcats/init.lua index cd6d0e3..921db65 100644 --- a/modules/home-manager/nixcats/init.lua +++ b/modules/home-manager/nixcats/init.lua @@ -28,6 +28,8 @@ vim.wo.number = true -- Enable mouse mode vim.o.mouse = 'a' +vim.o.conceallevel = 2 + -- Indent -- vim.o.smarttab = true vim.opt.cpoptions:append('I') @@ -278,6 +280,26 @@ require('lze').load { require('mini.ai').setup() end, }, + { + "zk-nvim", + enabled = nixCats('general') or false, + event = "DeferredUIEnter", + -- keys = { + -- { "zf", desc = "Zk Find" }, + -- { "zt", desc = "Zk Tags" }, + -- { "zn", desc = "Zk New" }, + -- { "zj", desc = "Zk New" }, + -- }, + after = function (plugin) + require('zk').setup({ + picker = "snacks_picker", + }) + vim.keymap.set('n', "zf", "ZkNotes", { desc = "Zk Find" }) + vim.keymap.set('n', "zt", "ZkTags", { desc = "Zk Tags" }) + vim.keymap.set('n', "zn", "ZkNew", { desc = "Zk New" }) + vim.keymap.set('n', "zj", "ZkNew { dir = \"journal/daily\" } ", { desc = "Zk New" }) + end, + }, { "gitsigns.nvim", enabled = nixCats('general') or false, @@ -707,6 +729,11 @@ require('lze').load { enabled = nixCats('typescript') or false, lsp = {}, }, + { + "clangd", + enabled = nixCats('c') or false, + lsp = {}, + }, { "gopls", enabled = nixCats("go") or false,