From 92fe04a180e3cfca16c3ef4150a5a1eec879b665 Mon Sep 17 00:00:00 2001
From: stefan <stefan@s00.xyz>
Date: Tue, 20 May 2025 15:17:01 -0400
Subject: (form) sync

---
 modules/neovim/default.nix                  |  4 ++++
 modules/neovim/nvim/lua/config/keybinds.lua |  8 ++++++++
 modules/neovim/nvim/lua/config/noice.lua    | 14 ++++++++++++++
 modules/neovim/nvim/lua/config/settings.lua |  5 +++--
 modules/neovim/nvim/lua/config/tmux.lua     |  5 +++++
 5 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 modules/neovim/nvim/lua/config/noice.lua
 create mode 100644 modules/neovim/nvim/lua/config/tmux.lua

(limited to 'modules/neovim')

diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 03b8831..807ab74 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -47,6 +47,7 @@ in
         (nvim-treesitter.withPlugins (p: with p; [
           tree-sitter-nix
           tree-sitter-make
+          tree-sitter-cmake
           tree-sitter-verilog
           tree-sitter-scheme
           tree-sitter-llvm
@@ -75,7 +76,10 @@ in
         plenary-nvim
         mini-icons
         oil-nvim
+        tmux-nvim
+        # noice-nvim
         nvim-lspconfig
+        # blink-cmp
         # tinted-vim
         base16-nvim
         telescope-nvim
diff --git a/modules/neovim/nvim/lua/config/keybinds.lua b/modules/neovim/nvim/lua/config/keybinds.lua
index 5481d37..551fc14 100644
--- a/modules/neovim/nvim/lua/config/keybinds.lua
+++ b/modules/neovim/nvim/lua/config/keybinds.lua
@@ -37,6 +37,14 @@ nmap('<leader>wm', '<C-w><C-h>', { desc = "Focus window left of the current one"
 nmap('<leader>wn', '<C-w><C-j>', { desc = "Focus window below the current one" })
 nmap('<leader>we', '<C-w><C-k>', { desc = "Focus window above the current one" })
 nmap('<leader>wi', '<C-w><C-l>', { desc = "Focus window right of the current one" })
+-- nmap('<C-m>', '<C-w><C-h>', { desc = "Focus window left of the current one" })
+-- nmap('<C-n>', '<C-w><C-j>', { desc = "Focus window below the current one" })
+-- nmap('<C-e>', '<C-w><C-k>', { desc = "Focus window above the current one" })
+-- nmap('<C-i>', '<C-w><C-l>', { desc = "Focus window right of the current one" })
+nmap('<M-m>', function() require("tmux").move_left() end, { desc = "Focus window left of the current one" })
+nmap('<M-n>', function() require("tmux").move_bottom() end, { desc = "Focus window below the current one" })
+nmap('<M-e>', function() require("tmux").move_top() end, { desc = "Focus window above the current one" })
+nmap('<M-i>', function() require("tmux").move_right() end, { desc = "Focus window right of the current one" })
 
 -- nmap('<leader>fo', '<cmd>Telescope find_files<CR>', { silent = true })
 nmap('<leader>fo', '<cmd>FzfLua files<CR>', { silent = true })
diff --git a/modules/neovim/nvim/lua/config/noice.lua b/modules/neovim/nvim/lua/config/noice.lua
new file mode 100644
index 0000000..29f7a1d
--- /dev/null
+++ b/modules/neovim/nvim/lua/config/noice.lua
@@ -0,0 +1,14 @@
+require("noice").setup({
+  lsp = {
+    override = {
+      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+      [ "vim.lsp.util.sylize_markdown" ] = true,
+    },
+
+    presets = {
+      command_palette = true,
+      log_message_to_split = true,
+      lsp_doc_border = true,
+    },
+  },
+})
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index 2ff8821..7baeefa 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -11,7 +11,7 @@ vim.o.scrolloff = 15
 vim.o.sidescrolloff = 12
 vim.o.wrap = false
 vim.o.lbr = true
-vim.o.shortmess = vim.o.shortmess .. "I"
+vim.o.shortmess = "tToOCFIsWcCi"
 vim.o.termguicolors = true
 vim.opt.fillchars = {eob = " "}
 vim.o.smd = false
@@ -49,5 +49,6 @@ vim.opt.foldenable=true
 
 vim.cmd[[set wildchar=<C-n>]]
 
+vim.g.loaded_matchparen = 1
 vim.cmd[[cnoreabbrev ts lua vim.treesitter.start()]]
-
+require('vim._extui').enable({})
diff --git a/modules/neovim/nvim/lua/config/tmux.lua b/modules/neovim/nvim/lua/config/tmux.lua
new file mode 100644
index 0000000..8dbcff4
--- /dev/null
+++ b/modules/neovim/nvim/lua/config/tmux.lua
@@ -0,0 +1,5 @@
+require("tmux").setup({
+  navigation = {
+    enable_default_keybindings = false,
+  },
+})
-- 
cgit v1.2.3