12 files changed, 53 insertions, 22 deletions
diff --git a/features/user/cli/shells/nushell/prompt.nu b/features/user/cli/shells/nushell/prompt.nu
index a79e766..cfdd478 100644
--- a/features/user/cli/shells/nushell/prompt.nu
+++ b/features/user/cli/shells/nushell/prompt.nu
@@ -42,7 +42,7 @@ $env.PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR
 $env.config.cursor_shape.vi_insert = "line"
 $env.config.cursor_shape.vi_normal = "block"
 
-$env.config.cursor_shape.vi_normal = "line"
+$env.config.cursor_shape.emacs = "line"
 
 # customize menus to match
 $env.config.menus = [
diff --git a/pkgs/custom-neovim/config/init.lua b/pkgs/custom-neovim/config/init.lua
index 115ff6e..af22f3a 100644
--- a/pkgs/custom-neovim/config/init.lua
+++ b/pkgs/custom-neovim/config/init.lua
@@ -20,7 +20,7 @@ require("plugins.treesitter")
 require("plugins.mini.files")
 require("plugins.dropbar")
 require("plugins.auto-session")
-require("plugins.vimade")
+-- require("plugins.vimade")
 
 -- LSP Plugins:
 require("plugins.lspconfig")
diff --git a/pkgs/custom-neovim/config/lua/autocommands.lua b/pkgs/custom-neovim/config/lua/autocommands.lua
index d3e3835..1c2b3ae 100644
--- a/pkgs/custom-neovim/config/lua/autocommands.lua
+++ b/pkgs/custom-neovim/config/lua/autocommands.lua
@@ -1,9 +1,8 @@
 -- Autocommands
 
 -- start terminal in insert mode
-vim.api.nvim_create_autocmd("TermOpen", {
-  callback = function()
-    vim.cmd "startinsert!"
-  end,
-})
-
+-- vim.api.nvim_create_autocmd("TermOpen", {
+--   callback = function()
+--     vim.cmd "startinsert!"
+--   end,
+-- })
diff --git a/pkgs/custom-neovim/config/lua/mappings.lua b/pkgs/custom-neovim/config/lua/mappings.lua
index 6ed3b36..8c670f4 100644
--- a/pkgs/custom-neovim/config/lua/mappings.lua
+++ b/pkgs/custom-neovim/config/lua/mappings.lua
@@ -43,6 +43,8 @@ mapkey("n", "<leader>md", "Delete a session", ":Autosession delete<cr>")
 
 -- Terminals
 mapkey("n", "<leader>c", "Manage terminals", "")
+mapkey("n", "<leader>cc", "Toggle terminal", ":lua Snacks.terminal.toggle()<cr>")
+mapkey("n", "<leader>co", "Open new terminal", ":lua Snacks.terminal.open()<cr>")
 
 -- Git
 mapkey("n", "<leader>g", "Open lazygit", ":lua Snacks.lazygit()<cr>")
@@ -57,16 +59,20 @@ vim.keymap.set("c", "<cr>", function()
   return '<cr>'
 end, { expr = true }) -- Make enter complete command.
 mapkey("n", "<esc>", "Clear highlights", ":noh<cr>") -- Make esc clear highlights
-mapkey("n", "<leader>q", "Close buffer", ":bd<cr>")
-mapkey("n", "<leader>Q", "Force close buffer", ":bd!<cr>")
+-- mapkey("n", "<leader>q", "Close buffer", ":bd<cr>")
+-- mapkey("n", "<leader>Q", "Force close buffer", ":bd!<cr>")
+
+-- Newline in normal mode.
+mapkey('n', '<CR>', "Add newline below", 'm`o<Esc>``')
+mapkey('n', '<S-CR>', "Add newline above", 'm`O<Esc>``')
 
 -- Really delete
 mapkey({"n", "v"}, "<leader>d", "Really delete", [["_d]])
 mapkey({"n", "v"}, "<leader>x", "Really delete character", [["_x]])
 
 -- Visual Movement Keys.
--- mapkey({"n", "v"}, "j", "Go down visually", "gj")
--- mapkey({"n", "v"}, "k", "Go up visually", "gk")
+mapkey({"n", "v"}, "j", "Go down visually", "gj")
+mapkey({"n", "v"}, "k", "Go up visually", "gk")
 
 -- Learn hjkl.
 -- mapkey({"n", "v"}, "<left>", "Correct the keypress", function() print("Try pressing h instead.") end)
diff --git a/pkgs/custom-neovim/config/lua/options.lua b/pkgs/custom-neovim/config/lua/options.lua
index 8fccdeb..5444180 100644
--- a/pkgs/custom-neovim/config/lua/options.lua
+++ b/pkgs/custom-neovim/config/lua/options.lua
@@ -14,6 +14,10 @@ vim.o.signcolumn = "yes" -- always show the sign column, otherwise it would shif
 vim.o.clipboard = "unnamedplus" -- use system clipboard
 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions,globals"
 
+-- Split Behavior
+vim.o.splitright = true
+vim.o.splitbelow = true
+
 -- Indention
 local indent = 2
 vim.o.autoindent = true -- auto indentation
diff --git a/pkgs/custom-neovim/config/lua/plugins/dropbar.lua b/pkgs/custom-neovim/config/lua/plugins/dropbar.lua
index 2d5fdaa..5d4bb43 100644
--- a/pkgs/custom-neovim/config/lua/plugins/dropbar.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/dropbar.lua
@@ -26,11 +26,11 @@ dropbar.setup({
           sources.markdown,
         }
       end
-      if vim.bo[buf].buftype == 'terminal' then
-        return {
-          sources.terminal,
-        }
-      end
+      -- if vim.bo[buf].buftype == 'terminal' then
+      --   return {
+      --     sources.terminal,
+      --   }
+      -- end
       return {
         custom_path,
         utils.source.fallback {
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
index 5057e1d..7934211 100644
--- a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
@@ -51,3 +51,9 @@ miniclue.setup({
     scroll_up = "<C-u>",
   },
 })
+
+vim.api.nvim_create_autocmd("TermOpen", {
+  callback = function()
+    vim.cmd.lua("MiniClue.ensure_buf_triggers()")
+  end,
+})
diff --git a/pkgs/custom-neovim/config/lua/plugins/snacks.lua b/pkgs/custom-neovim/config/lua/plugins/snacks.lua
index 89bf2fa..c2cf737 100644
--- a/pkgs/custom-neovim/config/lua/plugins/snacks.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/snacks.lua
@@ -5,7 +5,7 @@ require("snacks").setup {
     win = {
       input = {
         keys = {
-          -- ["<Esc>"] = { "close", mode = { "n", "i" } },
+          ["<Esc>"] = { "close", mode = { "n", "i" } },
         },
       },
     },
@@ -15,8 +15,22 @@ require("snacks").setup {
     config = {
       quitOnTopLevelReturn = true,
     },
+    win = {
+      height = 0.8,
+    },
   },
   input = {
     enabled = true,
   },
+  terminal = {
+    -- interactive = false,
+    start_insert = true,
+    auto_insert = true,
+    win = {
+      height = 0.2,
+    },
+    keys = {},
+  },
 }
+
+-- Utils.mapkey("t", "<c-w>", "Manage windows", "<c-\\><c-o><c-w>")
diff --git a/pkgs/custom-neovim/config/lua/plugins/vimade.lua b/pkgs/custom-neovim/config/lua/plugins/vimade.lua
index 1301f96..692e0ef 100644
--- a/pkgs/custom-neovim/config/lua/plugins/vimade.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/vimade.lua
@@ -1 +1 @@
-require("vimade").setup()
+require("vimade").setup {}
diff --git a/pkgs/custom-neovim/config/lua/statusline.lua b/pkgs/custom-neovim/config/lua/statusline.lua
index 9f0106d..1e5c708 100644
--- a/pkgs/custom-neovim/config/lua/statusline.lua
+++ b/pkgs/custom-neovim/config/lua/statusline.lua
@@ -94,6 +94,11 @@ statusline_components.diagnostic_status = function()
 
   vim.defer_fn(vim.cmd.redrawstatus, 500)
 
+  -- Don't show diagnostics in insert mode.
+  if mode_to_str[vim.api.nvim_get_mode().mode]:find "INSERT" then
+    return ""
+  end
+
   return table.concat(diagnostics, " ")
 end
 
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index 1cafdcb..61b66ce 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -17,14 +17,12 @@ in
         actions-preview-nvim # Adds a selector for LSP actions.
         nvim-treesitter.withAllGrammars # All treesitter grammars.
         tabby-nvim # Tab bar.
-        lualine-nvim # Status line.
         # alpha-nvim # Dashboard.
         # persisted-nvim # Session manager.
         snacks-nvim
         # oil-nvim
         dropbar-nvim
         auto-session
-        vimade
 
         # Colorschemes
         oxocarbon-nvim # IBM Carbon themes.
diff --git a/pkgs/custom-neovim/design.md b/pkgs/custom-neovim/design.md
index 0fe769b..1ee4dc4 100644
--- a/pkgs/custom-neovim/design.md
+++ b/pkgs/custom-neovim/design.md
@@ -10,7 +10,6 @@
 
 ## Todo
 
-- Configure terminal management
 - add quick window switcher plugin
 - add automatic parentheses
 - add smart indentation