Update ToggleTerm. Changed a few other plugins.

2023-09-28 16:42:56 -04:00
parent ebbf7b99ae
commit 54583572b8
9 changed files with 115 additions and 82 deletions
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@ -79,7 +79,7 @@ opt.termguicolors = true      -- Enable 24-bit RGB colors
 -----------------------------------------------------------
 opt.expandtab = true            -- Use spaces instead of tabs
 opt.shiftwidth = 4              -- Shift 4 spaces when tab
-opt.tabstop = 4                 -- 1 tab == 4 spaces
+opt.tabstop = 2                 -- 1 tab == 4 spaces
 opt.smartindent = true          -- Autoindent new lines
 -----------------------------------------------------------
 -- Glow Settings
@ -99,7 +99,7 @@ vim.cmd [[
  ]]
 vim.cmd [[ autocmd FileType python set textwidth=110 ]]
 vim.cmd [[ autocmd FileType lua set textwidth=80 ]]
-vim.cmd [[ autocmd FileType markdown,text set textwidth=200 ]]
+vim.cmd [[ autocmd FileType markdown,text set textwidth=125 ]]

 --[[
 local disabled_built_ins = {
@ -167,4 +167,4 @@ end
      --]]

 require('core/keymaps')
-vim.cmd[[colorscheme wildcharm]]
+vim.cmd[[colorscheme tol]]
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@ -1,7 +1,7 @@
 {
  "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
  "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" },
-  "alpha-nvim": { "branch": "main", "commit": "712dc1dccd4fd515ef8bd126b3718f79d3e23b0d" },
+  "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
  "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" },
  "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@ -10,26 +10,25 @@
  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
+  "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
  "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
  "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" },
-  "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" },
+  "diffview.nvim": { "branch": "main", "commit": "a111d19ccceac6530448d329c63f998f77b5626e" },
  "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" },
  "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" },
  "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" },
-  "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
-  "gitsigns.nvim": { "branch": "main", "commit": "907ae8636016aab2f283576fc60d46ca3427e579" },
+  "gitsigns.nvim": { "branch": "main", "commit": "bdeba1cec3faddd89146690c10b9a87949c0ee66" },
  "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" },
  "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
  "hover.nvim": { "branch": "main", "commit": "f74d2924564ba5fd8faa2d7e7cf6065de26f9820" },
  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
-  "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
+  "lazy.nvim": { "branch": "main", "commit": "7ca3bdb566c3ba4492f2d22b37c2c9e26f09470f" },
  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "01b4b6724ebcf5b43fc021486f6a260f1d09311e" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
  "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
  "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
@ -39,36 +38,37 @@
  "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
  "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" },
  "mkdnflow.nvim": { "branch": "main", "commit": "a728a3533bb57502fdfd6fdb4e5839fc87430edc" },
-  "moonfly": { "branch": "master", "commit": "1e81cbb88a34c41572fde43cd633bd6d60727274" },
+  "moonfly": { "branch": "master", "commit": "3924a0b6e6e9684f1b190a173de8ce03d9233153" },
  "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
  "neovim": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" },
-  "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" },
+  "nightfox.nvim": { "branch": "main", "commit": "fe2fc7b93d66349eff2c5baa6cec922ee3958f56" },
  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
  "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
-  "nvim": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" },
+  "nvim": { "branch": "main", "commit": "3d9a5ed556e289bce6c1fb0af89ec838360641b2" },
  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-dap": { "branch": "master", "commit": "0e6b7c47dd70e80793ed39271b2aa712d9366dbc" },
+  "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" },
  "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
-  "nvim-lspconfig": { "branch": "master", "commit": "57139c690dc8d594b2f9de8d1e609f2854a4fe45" },
+  "nvim-lspconfig": { "branch": "master", "commit": "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4" },
  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
-  "nvim-tree.lua": { "branch": "master", "commit": "94c7c810af205c0f00c8f105dcf490c8eb17658a" },
-  "nvim-treesitter": { "branch": "master", "commit": "9ab4e9cc8989e3811b14897cd0eb21ae35e5541e" },
-  "nvim-web-devicons": { "branch": "master", "commit": "925e2aa30dc9fe9332060199c19f132ec0f3d493" },
+  "nvim-tree.lua": { "branch": "master", "commit": "934469b9b6df369e198fb3016969e56393b0dc07" },
+  "nvim-treesitter": { "branch": "master", "commit": "cb139d880bcf9b3a6f29f2bd088a7491d1662918" },
+  "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "semshi": { "branch": "master", "commit": "8047086306b1951e741f519f53d293d8b4b37f1a" },
+  "semshi": { "branch": "master", "commit": "cc40bb91e6d85ca42e6280c24c19f62ce9e30b95" },
  "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" },
  "starry.nvim": { "branch": "master", "commit": "dacd68fd7a3b4657ca5a57f3a3236b9c88dd9c29" },
  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "6e51d0cd6447cf2525412220ff0a2885eef9039c" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" },
  "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
  "tmux.nvim": { "branch": "main", "commit": "673782b74a6055d430d3f5148a033edd99e5519f" },
  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" },
-  "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" },
+  "toggleterm.nvim": { "branch": "main", "commit": "faee9d60428afc7857e0927fdc18daa6c409fa64" },
+  "tokyonight.nvim": { "branch": "main", "commit": "8e670218651eaf02bf61c68ecdfdaa572bc14b47" },
+  "tol.nvim": { "branch": "main", "commit": "4d1259b8655063276cc96d6457ea9ed30d1fbb80" },
  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
  "vim-arduino": { "branch": "master", "commit": "111db616db21d4f925691f1517792953f7671647" },
  "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
--- a/nvim/.config/nvim/lua/core/keymaps.lua
+++ b/nvim/.config/nvim/lua/core/keymaps.lua
@ -40,6 +40,10 @@ map('n', '<leader>fa', ':Telescope adjacent<CR>', default_opts)
 map('n', '<leader>b', ':! black %<CR>', default_opts)
 map('n', '<leader>m', ':! markdownlint -f %<CR>', default_opts)

+-- Terminal
+map('n', '<C-t>', ':ToggleTerm direction=float<CR>', default_opts)
+map('t', '<C-n>', '<C-\\><C-n><CR>', default_opts) -- Exit Insert Mode Faster
+
 ------------------------------------------------
 -- Old Keymaps from Nvim-Mapper (Sunsetted)
 ------------------------------------------------
--- a/nvim/.config/nvim/lua/plugins/init.lua
+++ b/nvim/.config/nvim/lua/plugins/init.lua
@ -71,9 +71,16 @@ return {
  {
  'nvim-lualine/lualine.nvim',
  dependencies = { 'nvim-tree/nvim-web-devicons' },
-  config = function() require('lualine').setup{
-    options = { theme = 'palenight' }
-  } end,
+  config = function() require('lualine').setup({
+    options = {
+	  theme = 'material',
+	  always_divide_middle = false,
+	},
+	sections = {
+	  lualine_x = { "encoding", { "fileformat", symbols = { unix = "" } }, "filetype" },
+	},
+})
+  end,
 },

 -- Nvim Tree File Manager on the Left
@ -150,7 +157,9 @@ return {

 -- Top Right Notify Pop Up
  'rcarriga/nvim-notify',
-  {'akinsho/toggleterm.nvim', version = "*", opts = {--[[ things you want to change go here]]}},
+  {'akinsho/toggleterm.nvim', version = "*", opts = {
+	direction = 'float',
+  }},

 ------------------------------------------------------------
 -- echasnovski's Minis get a section of their own...
@ -359,25 +368,12 @@ return {
  },
  { "bluz71/vim-moonfly-colors", name = "moonfly", lazy = true, priority = 1000 },
  'Bekaboo/deadcolumn.nvim',
-  -- {
-  --   'm4xshen/smartcolumn.nvim',
-  --       config = function()
-  --         require("smartcolumn").setup{
-  --    config = {
-  --     colorcolumn = "100",
-  --     disabled_filetypes = { "help" },
-  --     custom_colorcolumn = {},
-  --   },
-  -- }
-  --     end
-  -- },
  {
-    'feline-nvim/feline.nvim',
-    dependencies = { 'nvim-tree/nvim-web-devicons' },
-  },
-  -- Plugin that causes your code to crumble >:)
-  -- 'eandrju/cellular-automaton.nvim',
-
+        "dustypomerleau/tol.nvim",
+        lazy = false, -- load the colorscheme at startup
+        priority = 1000, -- load colorscheme first
+        config = true,
+    },
 {
    "wookayin/semshi",
    ft = "python",
--- a/nvim/.config/nvim/lua/plugins/nvim-treesitter.lua
+++ b/nvim/.config/nvim/lua/plugins/nvim-treesitter.lua
@ -4,21 +4,23 @@
 --end

 return {
-    -- Treesitter interface
    'nvim-treesitter/nvim-treesitter',
-  --build = ":TSUpdate"
-      config = function ()
-	require('nvim-treesitter.install').update({ with_sync = true })
+	build = ":TSUpdate",
+	config = function ()
+	  local configs = require("nvim-treesitter.configs")
+		configs.setup({
+	  -- require('nvim-treesitter.install').update({ with_sync = true })
      -- A list of parser names, or "all"
-	ensure_installed = {
-	  'bash', 'css', 'html', 'javascript', 'json', 'lua', 'python',
-	  'vim', 'yaml', 'typescript', 'markdown',
-	}
-	sync_install = true
-	highlight = {
-	  -- `false` will disable the whole extension
-	  enable = true,
-	  additional_vim_regex_highlighting = true,
-	}
+	  ensure_installed = {
+		'bash', 'css', 'html', 'javascript', 'json', 'lua', 'python',
+		'vim', 'yaml', 'typescript', 'markdown',
+	  },
+	  sync_install = true,
+	  highlight = {
+		enable = true,
+		additional_vim_regex_highlighting = true,
+	  },
+	  indent = { enable = true },
+	})
    end
  }
--- a/nvim/.config/nvim/spell/en.utf-8.add
+++ b/nvim/.config/nvim/spell/en.utf-8.add
@ -318,3 +318,21 @@ distrcits
 suggstions
 Chek's
 COO
+nginx's
+nginx
+config
+javascript
+subdomain
+Moodle
+MSP
+moodle
+Faux
+repos
+Github
+Gitea
+AppDaemon
+AppDaemon's
+birdnet
+HomeAssistant
+MQTT
+BirdNET
--- a/nvim/.config/nvim/spell/en.utf-8.add.spl
+++ b/nvim/.config/nvim/spell/en.utf-8.add.spl
--- a/tmux/.config/tmux/tmux.conf
+++ b/tmux/.config/tmux/tmux.conf
@ -1,5 +1,8 @@
 set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin"
 set-window-option -g mode-keys vi
+#set-option default-terminal "screen-256color"
+set-option default-terminal "tmux-256color"
+set-option -a terminal-overrides ",*256col*:RGB"

 # Standard Plugins
 set -g @plugin 'tmux-plugins/tpm'
@ -40,7 +43,7 @@ set -g @dracula-show-powerline true
 set -g @dracula-show-flags true
 set -g @dracula-show-left-icon window
 set -g @dracula-border-contrast true
-set -g @dracula-ping-server "overras.duckdns.org"
+set -g @dracula-ping-server "google.com"
 set -g @dracula-ping-rate 5
 set -g @dracula-cpu-usage-label " "
 set -g @dracula-cpu-usage-colors "pink dark_gray"
@ -50,8 +53,5 @@ set -g @dracula-git-no-repo-message ⊚
 set -g @dracula-show-timezone false
 set -g @dracula-military-time true

-#run-shell ~/.dotfiles/tmux/.config/tmux/plugins/tmux-continuum/continuum.tmux
-
 # Initiazlie TMUX plugin manager - kept at bottom of file
-# run '~/.config/tmux/plugins/tpm/tpm'
 run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm'
--- a/tmuxp/Work.yaml
+++ b/tmuxp/Work.yaml
@ -1,28 +1,27 @@
 session_name: Work
 windows:
- layout: bf7e,144x54,0,0,1
-  options: {}
-  panes:
-  - focus: 'true'
-    shell_command: nvim
-  start_directory: /Users/normrasmussen/Documents/Work
-  window_name: notes
- focus: 'true'
-  layout: beff,143x54,0,0,2
-  options: {}
-  panes:
-  - focus: 'true'
-    shell_command: Python
-  start_directory: /Users/normrasmussen/Documents/Work/Custom_Templates
-  window_name: templates
- layout: bf85,144x54,0,0,8
+- layout: ba3e,151x53,0,0,1
  options: {}
  panes:
  - focus: 'true'
    shell_command: zsh
+  start_directory: /Users/normrasmussen/Documents/Work
+  window_name: notes
+- layout: c1ff,149x54,0,0,2
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command: zsh
+  start_directory: /Users/normrasmussen/Documents/Work/Custom_Templates
+  window_name: templates
+- layout: ba40,151x53,0,0,3
+  options: {}
+  panes:
+  - focus: 'true'
+    shell_command: nvim
  start_directory: /Users/normrasmussen/Documents/Work/Scripts
  window_name: scripts
- layout: 775a,144x54,0,0[144x43,0,0,4,144x10,0,44,5]
+- layout: e469,177x53,0,0[177x42,0,0,4,177x10,0,43,5]
  options: {}
  panes:
  - focus: 'true'
@ -33,10 +32,24 @@ windows:
    - cd /Users/normrasmussen
    - zsh
  window_name: dots
- layout: bf03,143x54,0,0,6
+- focus: 'true'
+  layout: 5cf6,171x53,0,0[171x36,0,0,7,171x16,0,37{85x16,0,37,14,85x16,86,37,16}]
+  options: {}
+  panes:
+  - shell_command:
+    - cd /Users/normrasmussen/Documents/Projects/hugo_blog/rsmsn_blog
+    - nvim
+  - focus: 'true'
+    shell_command:
+    - cd /Users/normrasmussen/Desktop
+  - shell_command:
+    - cd /Users/normrasmussen/Documents/Projects/hugo_blog/rsmsn_blog
+    - zsh
+  window_name: hugo
+- layout: 5d96,171x53,0,0,17
  options: {}
  panes:
  - focus: 'true'
    shell_command: zsh
-  start_directory: /Users/normrasmussen/Documents/Projects/hugo_blog
-  window_name: hugo
+  start_directory: /Users/normrasmussen
+  window_name: zsh