From dd508ec7f90ebcf1f87a7642c58c57bb8305ca01 Mon Sep 17 00:00:00 2001 From: Wayne-Cole <77279425+Wacky404@users.noreply.github.com> Date: Sat, 1 Feb 2025 12:27:59 -0600 Subject: update: updating plugins and adding in tmux.conf --- .config/.workloggerconfig.json | 10 ++++++++- .config/borders/bordersrc | 4 ++-- .config/iterm2/AppSupport | 1 + .config/jgit/config | 3 +++ .config/nvim/after/ftplugin/typescriptreact.lua | 5 +++++ .config/nvim/lua/wacky/core/colorscheme.lua | 26 ++++++++++++---------- .config/nvim/lua/wacky/core/keymaps.lua | 8 +++---- .config/nvim/lua/wacky/plugins-setup.lua | 13 ++++++++--- .config/nvim/lua/wacky/plugins/autopairs.lua | 1 + .config/nvim/lua/wacky/plugins/comment.lua | 1 + .config/nvim/lua/wacky/plugins/formatter.lua | 19 ++++++++++++++++ .config/nvim/lua/wacky/plugins/linter-setup.lua | 4 ++++ .config/nvim/lua/wacky/plugins/lsp/lspconfig.lua | 24 +++++++++++++++++++- .config/nvim/lua/wacky/plugins/lsp/mason.lua | 2 ++ .config/nvim/lua/wacky/plugins/nvim-cmp.lua | 1 + .config/nvim/lua/wacky/plugins/nvim-tree.lua | 1 + .config/nvim/lua/wacky/plugins/telescope.lua | 1 + .config/nvim/lua/wacky/plugins/treesitter.lua | 4 ++++ .config/nvim/plugin/packer_compiled.lua | 28 +++++++++++------------- .config/sketchybar/settings.lua | 6 ++--- .tmux.conf | 24 ++++++++++++++++++++ README.md | 4 ++-- 22 files changed, 147 insertions(+), 43 deletions(-) create mode 120000 .config/iterm2/AppSupport create mode 100644 .config/jgit/config create mode 100644 .config/nvim/after/ftplugin/typescriptreact.lua create mode 100644 .tmux.conf diff --git a/.config/.workloggerconfig.json b/.config/.workloggerconfig.json index c4ca21c..57601c7 100644 --- a/.config/.workloggerconfig.json +++ b/.config/.workloggerconfig.json @@ -1,7 +1,7 @@ { "savepath": "Documents/GitHub/worklogger/Output/", "backuppath": "Documents/worklogger/", - "fileformat": "csv", + "fileformat": "json", "loglvl": "Warning", "jobs": [ { @@ -49,6 +49,14 @@ "Exemplar": "12345" } ] + }, + { + "name": "WorkLogger", + "projects": [ + { + "Logging": "Configuring Logging Threading" + } + ] } ] } diff --git a/.config/borders/bordersrc b/.config/borders/bordersrc index 4d11a72..6f7410d 100755 --- a/.config/borders/bordersrc +++ b/.config/borders/bordersrc @@ -27,7 +27,7 @@ options=( style=round width=10.0 hidpi=off - active_color=0xffffc0cb - inactive_color=0xff8a00c2 + active_color=$orange_brown + inactive_color=$grey ) borders "${options[@]}" diff --git a/.config/iterm2/AppSupport b/.config/iterm2/AppSupport new file mode 120000 index 0000000..21236f8 --- /dev/null +++ b/.config/iterm2/AppSupport @@ -0,0 +1 @@ +/Users/cole/Library/Application Support/iTerm2 \ No newline at end of file diff --git a/.config/jgit/config b/.config/jgit/config new file mode 100644 index 0000000..1f9067f --- /dev/null +++ b/.config/jgit/config @@ -0,0 +1,3 @@ +[filesystem "Homebrew|23.0.1|/dev/disk3s5"] + timestampResolution = 3000 nanoseconds + minRacyThreshold = 0 nanoseconds diff --git a/.config/nvim/after/ftplugin/typescriptreact.lua b/.config/nvim/after/ftplugin/typescriptreact.lua new file mode 100644 index 0000000..7e76438 --- /dev/null +++ b/.config/nvim/after/ftplugin/typescriptreact.lua @@ -0,0 +1,5 @@ +local opt = vim.opt_local -- for conciseness + +-- tabs and indention +opt.tabstop = 2 +opt.shiftwidth = 2 diff --git a/.config/nvim/lua/wacky/core/colorscheme.lua b/.config/nvim/lua/wacky/core/colorscheme.lua index 9c35834..fe5cce2 100644 --- a/.config/nvim/lua/wacky/core/colorscheme.lua +++ b/.config/nvim/lua/wacky/core/colorscheme.lua @@ -1,16 +1,18 @@ -local status, err = pcall(vim.cmd, "colorscheme bluloco") -if not status then - print(err) - return -end +vim.cmd("set background=light") +vim.cmd("colorscheme zenburned") +vim.g.zenbones = { + transparent_background = true, + lightness = "bright", + darkness = "stark", +} -require("bluloco").setup({ - style = "light", -- "auto" | "dark" | "light" - transparent = true, - italics = false, - terminal = vim.fn.has("gui_running") == 1, -- bluoco colors are enabled in gui terminals per default. - guicursor = true, -}) +--require("bluloco").setup({ +-- style = "light", -- "auto" | "dark" | "light" +-- transparent = true, +-- italics = false, +-- terminal = vim.fn.has("gui_running") == 1, -- bluoco colors are enabled in gui terminals per default. +-- guicursor = true, +--}) -- require("tokyonight").setup({ -- -- your configuration comes here diff --git a/.config/nvim/lua/wacky/core/keymaps.lua b/.config/nvim/lua/wacky/core/keymaps.lua index a841058..5940a49 100644 --- a/.config/nvim/lua/wacky/core/keymaps.lua +++ b/.config/nvim/lua/wacky/core/keymaps.lua @@ -35,10 +35,10 @@ vim.keymap.set("t", "", [[]]) -- toggle-terminal keymap.set("n", "tt", ":ToggleTerm dir=git_dir") ---------------------- --- keymap.set("n", "to", ":tabnew") -- open new tab --- keymap.set("n", "tx", ":tabclose") -- close current tab --- keymap.set("n", "tn", ":tabn") -- go to next tab --- keymap.set("n", "tp", ":tabp") -- go to previous tab +keymap.set("n", "to", ":tabnew") -- open new tab +keymap.set("n", "tx", ":tabclose") -- close current tab +keymap.set("n", "tn", ":tabn") -- go to next tab +keymap.set("n", "tp", ":tabp") -- go to previous tab ---------------------- ---------------------- diff --git a/.config/nvim/lua/wacky/plugins-setup.lua b/.config/nvim/lua/wacky/plugins-setup.lua index e1e72c9..d2cecae 100644 --- a/.config/nvim/lua/wacky/plugins-setup.lua +++ b/.config/nvim/lua/wacky/plugins-setup.lua @@ -37,7 +37,7 @@ return packer.startup(function(use) use("xiyaowong/transparent.nvim") -- Color Scheme is here!!! - use({ "uloco/bluloco.nvim", requires = { "rktjmp/lush.nvim" } }) -- preferred colorscheme atm + use({ "zenbones-theme/zenbones.nvim", requires = { "rktjmp/lush.nvim" } }) -- preferred colorscheme atm use("christoomey/vim-tmux-navigator") -- tmux & split window navigation @@ -129,8 +129,15 @@ return packer.startup(function(use) -- auto closing use("windwp/nvim-autopairs") -- autoclose parens, brackets, quotes, etc... - use({ "windwp/nvim-ts-autotag", after = "nvim-treesitter" }) -- autoclose tags - + use({ + "windwp/nvim-ts-autotag", -- autoclose tags + requires = { + "nvim-treesitter/nvim-treesitter", + }, + config = function() + require("nvim-ts-autotag").setup() + end, + }) -- git integration use("lewis6991/gitsigns.nvim") -- show line modifications on left hand side diff --git a/.config/nvim/lua/wacky/plugins/autopairs.lua b/.config/nvim/lua/wacky/plugins/autopairs.lua index 19890bb..cd3d131 100644 --- a/.config/nvim/lua/wacky/plugins/autopairs.lua +++ b/.config/nvim/lua/wacky/plugins/autopairs.lua @@ -1,6 +1,7 @@ -- import nvim-autopairs safely local autopairs_setup, autopairs = pcall(require, "nvim-autopairs") if not autopairs_setup then + print("autopairs failed...") return end diff --git a/.config/nvim/lua/wacky/plugins/comment.lua b/.config/nvim/lua/wacky/plugins/comment.lua index 89a3d62..1323f4e 100644 --- a/.config/nvim/lua/wacky/plugins/comment.lua +++ b/.config/nvim/lua/wacky/plugins/comment.lua @@ -1,5 +1,6 @@ local setup, comment = pcall(require, "Comment") if not setup then + print("comment failed...") return end diff --git a/.config/nvim/lua/wacky/plugins/formatter.lua b/.config/nvim/lua/wacky/plugins/formatter.lua index f1e5cfc..bc1a427 100644 --- a/.config/nvim/lua/wacky/plugins/formatter.lua +++ b/.config/nvim/lua/wacky/plugins/formatter.lua @@ -16,6 +16,9 @@ require("formatter").setup({ latex = { require("formatter.filetypes.latex").latexindent }, markdown = { require("formatter.filetypes.markdown").prettier }, html = { require("formatter.filetypes.html").prettier }, + css = { require("formatter.filetypes.css").prettier }, + typescript = { require("formatter.filetypes.typescript").prettier }, + typescriptreact = { require("formatter.filetypes.typescriptreact").prettier }, -- Formatter configurations for filetype "lua" go here -- and will be executed in order lua = { @@ -45,6 +48,22 @@ require("formatter").setup({ } end, }, + go = { + function() + local params = vim.lsp.util.make_range_params() + params.context = { only = { "source.organizeImports" } } + local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params) + for cid, res in pairs(result or {}) do + for _, r in pairs(res.result or {}) do + if r.edit then + local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encoding or "utf-16" + vim.lsp.util.apply_workspace_edit(r.edit, enc) + end + end + end + vim.lsp.buf.format({ asynce = false }) + end, + }, -- Use the special "*" filetype for defining formatter configurations on -- any filetype ["*"] = { diff --git a/.config/nvim/lua/wacky/plugins/linter-setup.lua b/.config/nvim/lua/wacky/plugins/linter-setup.lua index 186cfb2..f00ab2c 100644 --- a/.config/nvim/lua/wacky/plugins/linter-setup.lua +++ b/.config/nvim/lua/wacky/plugins/linter-setup.lua @@ -1,6 +1,10 @@ -- specifies linter for each filetype require("lint").linters_by_ft = { python = { "mypy" }, + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, } vim.api.nvim_create_autocmd({ "BufWritePost" }, { diff --git a/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua b/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua index 80316ea..9605cb5 100644 --- a/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua +++ b/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua @@ -49,8 +49,10 @@ local servers = { "arduino_language_server", "ltex", "jedi_language_server", - "biome", + "ts_ls", + "tailwindcss", "metals", + "htmx", } for _, lsp in pairs(servers) do @@ -63,6 +65,26 @@ end -- configure metals server with defaults lspconfig["metals"].setup({}) +-- configure html server to attach on typescriptreact, javascriptreact +lspconfig["html"].setup({ + filetypes = { "html", "typescriptreact", "javascriptreact" }, + capabilities = capabilities, + on_attach = on_attach, +}) + +-- configure go server; additional settings +lspconfig["gopls"].setup({ + settings = { + gopls = { + analyses = { + unusedparams = true, + }, + staticcheck = true, + gofumpt = true, + }, + }, +}) + -- configure lua server (with special settings) lspconfig["lua_ls"].setup({ capabilities = capabilities, diff --git a/.config/nvim/lua/wacky/plugins/lsp/mason.lua b/.config/nvim/lua/wacky/plugins/lsp/mason.lua index 5a71612..76c8860 100644 --- a/.config/nvim/lua/wacky/plugins/lsp/mason.lua +++ b/.config/nvim/lua/wacky/plugins/lsp/mason.lua @@ -32,6 +32,8 @@ mason_lspconfig.setup({ "html", "tailwindcss", "biome", + "htmx", + "gopls", }, -- auto-install configured servers (with lspconfig) automatic_installation = true, -- not the same as ensure_installed diff --git a/.config/nvim/lua/wacky/plugins/nvim-cmp.lua b/.config/nvim/lua/wacky/plugins/nvim-cmp.lua index 5911160..7fff7a6 100644 --- a/.config/nvim/lua/wacky/plugins/nvim-cmp.lua +++ b/.config/nvim/lua/wacky/plugins/nvim-cmp.lua @@ -1,5 +1,6 @@ local cmp_status, cmp = pcall(require, "cmp") if not cmp_status then + print("cmp failed...") return end diff --git a/.config/nvim/lua/wacky/plugins/nvim-tree.lua b/.config/nvim/lua/wacky/plugins/nvim-tree.lua index fb5a889..757be62 100644 --- a/.config/nvim/lua/wacky/plugins/nvim-tree.lua +++ b/.config/nvim/lua/wacky/plugins/nvim-tree.lua @@ -1,5 +1,6 @@ local setup, nvimtree = pcall(require, "nvim-tree") if not setup then + print("nvimtree failed...") return end diff --git a/.config/nvim/lua/wacky/plugins/telescope.lua b/.config/nvim/lua/wacky/plugins/telescope.lua index c5c7b22..a57d906 100644 --- a/.config/nvim/lua/wacky/plugins/telescope.lua +++ b/.config/nvim/lua/wacky/plugins/telescope.lua @@ -1,5 +1,6 @@ local telescope_setup, telescope = pcall(require, "telescope") if not telescope_setup then + print("telescope failed...") return end diff --git a/.config/nvim/lua/wacky/plugins/treesitter.lua b/.config/nvim/lua/wacky/plugins/treesitter.lua index b99c0f3..320d375 100644 --- a/.config/nvim/lua/wacky/plugins/treesitter.lua +++ b/.config/nvim/lua/wacky/plugins/treesitter.lua @@ -28,6 +28,10 @@ treesitter.setup({ "lua", "vim", "gitignore", + "html", + "javascript", + "typescript", + "tsx", }, -- auto install above language parsers auto_install = true, diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 06b4698..143b0f0 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1732813678/share/lua/5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1732813678/share/lua/5.1/?/init.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1732813678/lib/luarocks/rocks-5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1732813678/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1732813678/lib/lua/5.1/?.so" +local package_path_str = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/share/lua/5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/share/lua/5.1/?/init.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/lib/luarocks/rocks-5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -84,11 +84,6 @@ _G.packer_plugins = { path = "/Users/cole/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, - ["bluloco.nvim"] = { - loaded = true, - path = "/Users/cole/.local/share/nvim/site/pack/packer/start/bluloco.nvim", - url = "https://github.com/uloco/bluloco.nvim" - }, ["cmp-buffer"] = { loaded = true, path = "/Users/cole/.local/share/nvim/site/pack/packer/start/cmp-buffer", @@ -207,10 +202,9 @@ _G.packer_plugins = { url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-ts-autotag"] = { - load_after = {}, + config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0" }, loaded = true, - needs_bufread = false, - path = "/Users/cole/.local/share/nvim/site/pack/packer/opt/nvim-ts-autotag", + path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag", url = "https://github.com/windwp/nvim-ts-autotag" }, ["nvim-web-devicons"] = { @@ -283,6 +277,11 @@ _G.packer_plugins = { loaded = true, path = "/Users/cole/.local/share/nvim/site/pack/packer/start/vimtex", url = "https://github.com/lervag/vimtex" + }, + ["zenbones.nvim"] = { + loaded = true, + path = "/Users/cole/.local/share/nvim/site/pack/packer/start/zenbones.nvim", + url = "https://github.com/zenbones-theme/zenbones.nvim" } } @@ -291,15 +290,14 @@ time([[Defining packer_plugins]], false) time([[Setup for markdown-preview.nvim]], true) try_loadstring("\27LJ\2\n=\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\2\0\0\rmarkdown\19mkdp_filetypes\6g\bvim\0", "setup", "markdown-preview.nvim") time([[Setup for markdown-preview.nvim]], false) +-- Config for: nvim-ts-autotag +time([[Config for nvim-ts-autotag]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") +time([[Config for nvim-ts-autotag]], false) -- Config for: toggleterm.nvim time([[Config for toggleterm.nvim]], true) try_loadstring("\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\tsize\3\15\14autochdir\1\14direction\15horizontal\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim") time([[Config for toggleterm.nvim]], false) --- Load plugins in order defined by `after` -time([[Sequenced loading]], true) -vim.cmd [[ packadd nvim-treesitter ]] -vim.cmd [[ packadd nvim-ts-autotag ]] -time([[Sequenced loading]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Filetype lazy-loads diff --git a/.config/sketchybar/settings.lua b/.config/sketchybar/settings.lua index 6123c8b..af5e7cc 100644 --- a/.config/sketchybar/settings.lua +++ b/.config/sketchybar/settings.lua @@ -5,8 +5,8 @@ return { -- battery widget batt_background = colors.black, batt_color_default = colors.green, - batt_color_25 = colors.purple, - batt_color_0 = colors.pink, + batt_color_25 = colors.orange_brown, + batt_color_0 = colors.grey, -- cpu widget cpu_background = colors.black, -- volume widget @@ -21,7 +21,7 @@ return { calendar_background = colors.black, calendar_border = colors.black, -- spaces.lua - spaces_highlight = colors.pink, + spaces_highlight = colors.white, spaces_icon = colors.grey, spaces_background = colors.black, spaces_border = colors.grey, diff --git a/.tmux.conf b/.tmux.conf new file mode 100644 index 0000000..b6111c8 --- /dev/null +++ b/.tmux.conf @@ -0,0 +1,24 @@ +# Configuration for Tmux: + +# Set ctrl-space to prefix +unbind C-Space +set -g prefix C-Space +bind C-Space send-prefix + +# Moves window position forward after +# deleting a window before it +set -g renumber-windows on + +# Move pane to right or left +bind -r "<" swap-window -d -t -1 +bind -r ">" swap-window -d -t +1 + +# Horizontal and Vertical pane split +bind - split-window -vc "#{pane_current_path}" +bind | split-window -hc "#{pane_current_path}" + +# move between windows quickly +bind -r "k" select-pane -U +bind -r "j" select-pane -D +bind -r "h" select-pane -L +bind -r "l" select-pane -R diff --git a/README.md b/README.md index 9d000d6..ebfc869 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ > This config is specifically tailored for my needs and wants on MacOS. As of right now > I'm currently developing in Python, C++, and C. I tried to keep my NeoVim fairly 'light'. ### My Essentials: -> - treessitter +> - treesitter > - telescope -> - lsp, linting, formatting +> - lsp, linting, formatting; seperated > - autocompletion > - terminal integration (.zsh btw) > - markdown preview; for readme and notetaking -- cgit v1.3-3-g829e