From 23cbac2b68b6654af31a8e1f6c22d4a90b6f6261 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Sun, 29 Jun 2025 07:23:54 -0400 Subject: [PATCH] update --- hosts/android/home.nix | 2 -- modules/home-manager/emacs/default.nix | 6 +++--- modules/home-manager/nixcats/default.nix | 1 - modules/home-manager/nixcats/init.lua | 20 -------------------- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/hosts/android/home.nix b/hosts/android/home.nix index 7607499..e7e8ac5 100644 --- a/hosts/android/home.nix +++ b/hosts/android/home.nix @@ -14,8 +14,6 @@ ../../modules/home-manager/kubernetes.nix ../../modules/home-manager/email.nix ../../modules/home-manager/direnv.nix - ../../modules/home-manager/taskwarrior.nix - ../../modules/home-manager/stylix.nix ../../modules/home-manager/emacs ]; diff --git a/modules/home-manager/emacs/default.nix b/modules/home-manager/emacs/default.nix index 9027eb3..ab016e1 100644 --- a/modules/home-manager/emacs/default.nix +++ b/modules/home-manager/emacs/default.nix @@ -23,8 +23,8 @@ ]; }; services.emacs.enable = true; - home.file.".config/emacs/init.el" = { - source = config.lib.file.mkOutOfStoreSymlink /Users/mthomson/dev/personal/nixos/modules/home-manager/emacs/emacs/init.el; - # recursive = true; + home.file.".config/emacs" = { + source = ./emacs; + recursive = true; }; } diff --git a/modules/home-manager/nixcats/default.nix b/modules/home-manager/nixcats/default.nix index 1bb8e5b..e3f2dfa 100644 --- a/modules/home-manager/nixcats/default.nix +++ b/modules/home-manager/nixcats/default.nix @@ -100,7 +100,6 @@ in { nvim-dap nvim-dap-ui nvim-dap-virtual-text - zk-nvim ]; }; diff --git a/modules/home-manager/nixcats/init.lua b/modules/home-manager/nixcats/init.lua index 0aa1a07..61e252d 100644 --- a/modules/home-manager/nixcats/init.lua +++ b/modules/home-manager/nixcats/init.lua @@ -280,26 +280,6 @@ 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,