Nix Emacs HEAD master

Add Emacs Darwin to the pkgs
Other neovim and tangential things

9 files changed, 52 insertions, 41 deletions

diff --git a/config/nvim/lua/plugins/catppuccin.lua b/config/nvim/lua/plugins/catppuccin.lua
new file mode 100644
index 0000000..9b09225
--- /dev/null
+++ b/config/nvim/lua/plugins/catppuccin.lua
@@ -0,0 +1,15 @@
+return {
+  'catppuccin/nvim',
+  name = 'catppuccin',
+  priority = 1000,
+  config = function()
+    require('catppuccin').setup({
+      flavour = 'mocha',
+      transparent_background = true,
+      float = {
+        transparent = true,
+      },
+    })
+    vim.cmd.colorscheme('catppuccin')
+  end,
+}
diff --git a/config/nvim/lua/plugins/image.lua b/config/nvim/lua/plugins/image.lua
index 32c3540..1ab0f9a 100644
--- a/config/nvim/lua/plugins/image.lua
+++ b/config/nvim/lua/plugins/image.lua
@@ -9,12 +9,12 @@ return {
           enabled = true,
           only_render_image_at_cursor = true,
           only_render_image_at_cursor_mode = "popup", -- or "inline"
-          floating_windows = true,               -- if true, images will be rendered in floating markdown windows
+          floating_windows = true,                    -- if true, images will be rendered in floating markdown windows
         },
       },
       window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs" },
-      editor_only_render_when_focused = true,                                        -- auto show/hide images when the editor gains/looses focus
+      editor_only_render_when_focused = true, -- auto show/hide images when the editor gains/looses focus
     })
-  end
-
+  end,
+  build = false,
 }
diff --git a/config/nvim/lua/plugins/lastplace.lua b/config/nvim/lua/plugins/lastplace.lua
deleted file mode 100644
index a393a90..0000000
--- a/config/nvim/lua/plugins/lastplace.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
-  'ethanholz/nvim-lastplace',
-  config = function()
-    require'nvim-lastplace'.setup({})
-  end
-}
-
diff --git a/config/nvim/lua/plugins/modus-themes.lua b/config/nvim/lua/plugins/modus-themes.lua
deleted file mode 100644
index 3058078..0000000
--- a/config/nvim/lua/plugins/modus-themes.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-  "miikanissi/modus-themes.nvim",
-  priority = 1000,
-  config = function ()
-    require("modus-themes").setup({
-      style = "modus_vivendi",
-      sign_column_background = false,
-      line_nr_column_background = false,
-    })
-    vim.cmd.colorscheme("modus")
-  end
-}
-
diff --git a/config/nvim/lua/plugins/remember.lua b/config/nvim/lua/plugins/remember.lua
new file mode 100644
index 0000000..911d9c6
--- /dev/null
+++ b/config/nvim/lua/plugins/remember.lua
@@ -0,0 +1,7 @@
+return {
+  'vladdoster/remember.nvim',
+  config = function()
+    require'remember'.setup({})
+  end
+}
+
diff --git a/config/nvim/lua/plugins/render-markdown.lua b/config/nvim/lua/plugins/render-markdown.lua
index 9d52c5b..b87f8a1 100644
--- a/config/nvim/lua/plugins/render-markdown.lua
+++ b/config/nvim/lua/plugins/render-markdown.lua
@@ -104,8 +104,11 @@ return {
         enabled = false,
       },
       heading = {
-        width = 'block',
-      }
+        icons = { '󰫎 ', '󰫎 ', '󰫎 ', '󰫎 ', '󰫎 ', '󰫎 ' },
+        backgrounds = {},
+      },
+      nested = false,
     })
-  end
+  end,
 }
+
diff --git a/config/nvim/lua/plugins/scratch-buffer.lua b/config/nvim/lua/plugins/scratch-buffer.lua
deleted file mode 100644
index a6526ab..0000000
--- a/config/nvim/lua/plugins/scratch-buffer.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  'miguelcrespo/scratch-buffer.nvim',
-  event = 'VimEnter',
-  config = function()
-    require('scratch-buffer').setup()
-  end,
-  dependencies = {
-    -- Recommended if you want interactive evaluation
-    "Olical/conjure"
-  }
-}
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
index e761994..7cfe5c5 100644
--- a/config/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -3,9 +3,9 @@ return {
   dependencies = { "nvim-lua/plenary.nvim" },
   config = function()
     require("telescope").setup({
-      defaults = {
-        borderchars = { "─", "│", "─", "│", "┌", "┐", "┘", "└" },
-      },
+      -- defaults = {
+      --   borderchars = { "─", "│", "─", "│", "┌", "┐", "┘", "└" },
+      -- },
     })
 
     local tscope = require('telescope.builtin')
diff --git a/config/nvim/lua/plugins/which-key.lua b/config/nvim/lua/plugins/which-key.lua
new file mode 100644
index 0000000..c068002
--- /dev/null
+++ b/config/nvim/lua/plugins/which-key.lua
@@ -0,0 +1,17 @@
+return {
+  'folke/which-key.nvim',
+  event = 'VeryLazy',
+  opts = {
+    icons = { mappings = false },
+    delay = 1000
+  },
+  keys = {
+    {
+      '<leader>?',
+      function()
+        require('which-key').show({ global = false })
+      end,
+      desc = 'Buffer Local Keymaps',
+    },
+  },
+}