From 3056ac5c415e89ee834cf71eae283950a0198662 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Sat, 7 Jan 2023 10:42:54 -0600
Subject: [PATCH] mostly neovim/tmux stuffs

---
 home/private_bin/executable_concom            |  2 +-
 .../astronvim/lua/user/mappings.lua           |  8 -----
 .../astronvim/lua/user/plugins/init.lua       | 30 +++++++++++++++----
 .../lua/user/plugins/mason-lspconfig.lua      |  2 +-
 home/private_dot_config/lazygit/config.yml    |  2 ++
 home/private_dot_config/tmux/tmux.conf        |  3 +-
 6 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/home/private_bin/executable_concom b/home/private_bin/executable_concom
index 9f9806b..b3c412f 100644
--- a/home/private_bin/executable_concom
+++ b/home/private_bin/executable_concom
@@ -130,7 +130,7 @@ def main():
     print(f"{color('message:',11)}\n  {summary}")
 
     actions = {
-        "commit": lambda: run(f"git commit -m '{summary}'", capture=False),
+        "commit": lambda: run(f"git commit -m \'{summary}\'", capture=False),
         "commit(with message)": lambda: run(
             f"git commit -m '{summary}' -m '# note: abort with :cq!' -e", capture=False
         ),
diff --git a/home/private_dot_config/astronvim/lua/user/mappings.lua b/home/private_dot_config/astronvim/lua/user/mappings.lua
index 43fe0ef..62f6e12 100644
--- a/home/private_dot_config/astronvim/lua/user/mappings.lua
+++ b/home/private_dot_config/astronvim/lua/user/mappings.lua
@@ -20,10 +20,6 @@ return {
     ["<C-Up>"] = false,
     ["<C-q>"] = false,
     ["<C-s>"] = false,
-    ["<leader>fh"] = false,
-    ["<leader>fm"] = false,
-    ["<leader>fn"] = false,
-    ["<leader>fo"] = false,
     ["<leader>sb"] = false,
     ["<leader>sc"] = false,
     ["<leader>sh"] = false,
@@ -36,10 +32,6 @@ return {
     j = { "gj", desc = "Navigate down" },
     k = { "gk", desc = "Navigate down" },
   },
-  t = {
-    -- setting a mapping to false will disable it
-    -- ["<esc>"] = false,
-  },
 }
 
 -- map('n', 'j', "v:count ? 'j' : 'gj'", { expr = true, noremap = true })
diff --git a/home/private_dot_config/astronvim/lua/user/plugins/init.lua b/home/private_dot_config/astronvim/lua/user/plugins/init.lua
index 3fd4ebc..9850589 100644
--- a/home/private_dot_config/astronvim/lua/user/plugins/init.lua
+++ b/home/private_dot_config/astronvim/lua/user/plugins/init.lua
@@ -1,4 +1,24 @@
+-- load config from local file...
+-- local p = function(name)
+--   return string.format("require'config.%s'", name)
+-- end
+
+-- d for default :P
+local d = function(name)
+  return string.format("require'%s'.setup({})", name)
+end
+
 return {
+  { "lambdalisue/suda.vim" }, -- for sudo reading and writing
+  -- theming
+  {
+    "catppuccin/nvim",
+    as = "catppuccin",
+    config = d("zk"),
+  },
+  -- { "LnL7/vim-nix" },
+  -- language specific
+  { "alaviss/nim.nvim" },
   {
     "quarto-dev/quarto-vim",
     requires = {
@@ -6,11 +26,9 @@ return {
     },
     ft = { "quarto" },
   },
-  { "catppuccin/nvim", as = "catppuccin",
-    config = function()
-      require("catppuccin").setup {}
-    end,
+  -- general tools
+  {
+    "mickael-menu/zk-nvim",
+    config = d("zk"),
   },
-  { 'LnL7/vim-nix' },
-  { 'lambdalisue/suda.vim' }, -- for sudo reading and writing
 }
diff --git a/home/private_dot_config/astronvim/lua/user/plugins/mason-lspconfig.lua b/home/private_dot_config/astronvim/lua/user/plugins/mason-lspconfig.lua
index 3de9ccc..a8af2c2 100644
--- a/home/private_dot_config/astronvim/lua/user/plugins/mason-lspconfig.lua
+++ b/home/private_dot_config/astronvim/lua/user/plugins/mason-lspconfig.lua
@@ -4,7 +4,7 @@ return {
 		"gopls",
 		"html",
 		"jsonls",
-		"pyright",
+		-- "pyright",
 		"sumneko_lua",
 		"texlab",
 		"yamlls",
diff --git a/home/private_dot_config/lazygit/config.yml b/home/private_dot_config/lazygit/config.yml
index 98a6606..5323077 100644
--- a/home/private_dot_config/lazygit/config.yml
+++ b/home/private_dot_config/lazygit/config.yml
@@ -23,8 +23,10 @@ gui:
       - "#89b4fa" # Blue
     selectedLineBgColor:
       - "#313244" # Surface0
+      - reverse
     selectedRangeBgColor:
       - "#313244" # Surface0
+      - reverse
     cherryPickedCommitBgColor:
       - "#94e2d5" # Teal
     cherryPickedCommitFgColor:
diff --git a/home/private_dot_config/tmux/tmux.conf b/home/private_dot_config/tmux/tmux.conf
index 421ae52..fde453b 100644
--- a/home/private_dot_config/tmux/tmux.conf
+++ b/home/private_dot_config/tmux/tmux.conf
@@ -3,7 +3,8 @@ setw -g mode-keys vi
 
 set -g prefix C-a
 unbind C-b
-bind C-a send-prefix
+
+set -g mouse on
 
 # smart pane switching with awareness of vim splits
 bind h select-pane -L