From 072db0b0dd7fda63304a48afdf6df1dea14c210c Mon Sep 17 00:00:00 2001 From: Dustin Stiles Date: Wed, 14 Aug 2024 14:22:54 -0400 Subject: [PATCH] chore(project): updates --- bin/bin/cfa-git | 6 +++ nvim/nvim/lazy-lock.json | 39 +++++++++------ nvim/nvim/lua/theme.lua | 2 +- nvim/nvim/lua/wqtt/plugins/mason-nvim-dap.lua | 22 ++++++++ nvim/nvim/lua/wqtt/plugins/neodev.lua | 1 + nvim/nvim/lua/wqtt/plugins/noice.lua | 30 +++++++++++ nvim/nvim/lua/wqtt/plugins/nvim-dap-ui.lua | 4 ++ nvim/nvim/lua/wqtt/plugins/themes/melange.lua | 1 + nvim/nvim/lua/wqtt/plugins/transparent.lua | 50 ------------------- nvim/nvim/lua/wqtt/plugins/tree-sitter.lua | 1 + zsh/zsh/.zshrc | 6 +++ 11 files changed, 95 insertions(+), 67 deletions(-) create mode 100755 bin/bin/cfa-git create mode 100644 nvim/nvim/lua/wqtt/plugins/mason-nvim-dap.lua create mode 100644 nvim/nvim/lua/wqtt/plugins/neodev.lua create mode 100644 nvim/nvim/lua/wqtt/plugins/noice.lua create mode 100644 nvim/nvim/lua/wqtt/plugins/nvim-dap-ui.lua create mode 100644 nvim/nvim/lua/wqtt/plugins/themes/melange.lua delete mode 100644 nvim/nvim/lua/wqtt/plugins/transparent.lua diff --git a/bin/bin/cfa-git b/bin/bin/cfa-git new file mode 100755 index 0000000..84e2221 --- /dev/null +++ b/bin/bin/cfa-git @@ -0,0 +1,6 @@ +#!/bin/bash + +git config user.email "dustin.stiles1@accesscfa.com" +git config user.name "Dustin Stiles" +git config commit.gpgsign true +git config user.signingkey 1606FDE9D2274F3B diff --git a/nvim/nvim/lazy-lock.json b/nvim/nvim/lazy-lock.json index 6e65a1f..be81bca 100644 --- a/nvim/nvim/lazy-lock.json +++ b/nvim/nvim/lazy-lock.json @@ -5,46 +5,54 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, + "codecompanion.nvim": { "branch": "main", "commit": "63616a4f92245fd82483159030c07c14412a244d" }, + "conform.nvim": { "branch": "master", "commit": "667102f26106709cddd2dff1f699610df5b94d7f" }, + "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, "everforest": { "branch": "master", "commit": "b49ba81e79b20d2b47bb71e98fa984bae90731be" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "github-nvim-theme": { "branch": "main", "commit": "80b7f448d7f7fa36070ffbe2a43458e57058bb72" }, - "gitsigns.nvim": { "branch": "main", "commit": "58bd9e98d8e3c5a1c98af312e85247ee1afd3ed2" }, + "github-nvim-theme": { "branch": "main", "commit": "6b461635230ccb5d0037f378fbe05a27c4ccf7cd" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, + "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, "lush.nvim": { "branch": "main", "commit": "6a254139d077ad53be7e4f3602c8da0c84447fd9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "melange-nvim": { "branch": "master", "commit": "11c4e19dbca58229adcdd13db3c73730a78d0e38" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neorg": { "branch": "main", "commit": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be" }, "neoscroll.nvim": { "branch": "master", "commit": "532dcc8cea4287c4cad6bb77532989a8217cfc7b" }, "nightfox.nvim": { "branch": "main", "commit": "d3e8b1acc095baf57af81bb5e89fe7c4359eb619" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, + "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" }, + "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, + "nvim-lint": { "branch": "master", "commit": "ad0fe35e80f5cd31a0f19176d7b30e5c3011119d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "e6528f4613c8db2e04be908eb2b5886d63f62a98" }, + "nvim-lspconfig": { "branch": "master", "commit": "ad32182cc4a03c8826a64e9ced68046c575fdb7d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, - "nvim-treesitter": { "branch": "master", "commit": "d7353a6b72008b38aa873ace49aa97bea257941b" }, + "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, + "nvim-treesitter": { "branch": "master", "commit": "3de418e73d5b912096229aaeea8bb7aef5094e0d" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "onedarkpro.nvim": { "branch": "main", "commit": "c825a3490dc3f6fb413607ed2602c1280a127756" }, + "ollama.nvim": { "branch": "main", "commit": "45e58779fecde7ac5b8f62800bbe7180d4b48507" }, + "onedarkpro.nvim": { "branch": "main", "commit": "b542d3a18b99d49161b007c9f90530101ff8bedc" }, "onenord.nvim": { "branch": "main", "commit": "70b716fd36a18284ad768402523b79ccdadafedf" }, "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "rose-pine": { "branch": "main", "commit": "e4b08d74b7272cb21e4e9c71b8b9e0830fd722fe" }, + "rose-pine": { "branch": "main", "commit": "cf8de969c49b1d879091ae9048715f4aacd4f9fb" }, "seoul256.vim": { "branch": "master", "commit": "b21c9e63f7c2d543db8b34a393a0b42ec7e9b891" }, "solarized.nvim": { "branch": "main", "commit": "3a197875c76803e4a64d4b1491c6dd0d22b161cd" }, "sweetie.nvim": { "branch": "master", "commit": "4f0dc96ea3adeeac0507eb64cb7dc70fe0ddcecf" }, @@ -52,9 +60,8 @@ "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, - "transparent.nvim": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "vscode.nvim": { "branch": "main", "commit": "f6c88cdf9d37d5c0bb1e492a13a3b4b4cc4dd13e" }, + "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, - "zenbones.nvim": { "branch": "main", "commit": "e9ba8305f65524f9355515cdd8704b2c6ba2def6" } + "zenbones.nvim": { "branch": "main", "commit": "5d69a8b159178c53d08151350967e2b0a42d59be" } } diff --git a/nvim/nvim/lua/theme.lua b/nvim/nvim/lua/theme.lua index 9a458a3..e9f92a3 100644 --- a/nvim/nvim/lua/theme.lua +++ b/nvim/nvim/lua/theme.lua @@ -1,3 +1,3 @@ vim.opt.background = "dark" -vim.cmd("colorscheme dawnfox") +vim.cmd("colorscheme melange") diff --git a/nvim/nvim/lua/wqtt/plugins/mason-nvim-dap.lua b/nvim/nvim/lua/wqtt/plugins/mason-nvim-dap.lua new file mode 100644 index 0000000..4ba8027 --- /dev/null +++ b/nvim/nvim/lua/wqtt/plugins/mason-nvim-dap.lua @@ -0,0 +1,22 @@ +return { + "jay-babu/mason-nvim-dap.nvim", + dependencies = "mason.nvim", + cmd = { "DapInstall", "DapUninstall" }, + opts = { + -- Makes a best effort to setup the various debuggers with + -- reasonable debug configurations + automatic_installation = true, + + -- You can provide additional configuration to the handlers, + -- see mason-nvim-dap README for more information + handlers = {}, + + -- You'll need to check that you have the required things installed + -- online, please don't ask me how to install them :) + ensure_installed = { + -- Update this to ensure that you have the debuggers for the langs you want + }, + }, + -- mason-nvim-dap is loaded when nvim-dap loads + config = function() end, +} diff --git a/nvim/nvim/lua/wqtt/plugins/neodev.lua b/nvim/nvim/lua/wqtt/plugins/neodev.lua new file mode 100644 index 0000000..4d802a0 --- /dev/null +++ b/nvim/nvim/lua/wqtt/plugins/neodev.lua @@ -0,0 +1 @@ +return { "folke/neodev.nvim", opts = {} } diff --git a/nvim/nvim/lua/wqtt/plugins/noice.lua b/nvim/nvim/lua/wqtt/plugins/noice.lua new file mode 100644 index 0000000..00d95e5 --- /dev/null +++ b/nvim/nvim/lua/wqtt/plugins/noice.lua @@ -0,0 +1,30 @@ +return { + "folke/noice.nvim", + event = "VeryLazy", + opts = { + -- add any options here + }, + dependencies = { + "MunifTanjim/nui.nvim", + }, + config = function() + require("noice").setup({ + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp + }, + }, + -- you can enable a preset for easier configuration + presets = { + -- bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + lsp_doc_border = true, -- add a border to hover docs and signature help + }, + }) + require("telescope").load_extension("noice") + end, +} diff --git a/nvim/nvim/lua/wqtt/plugins/nvim-dap-ui.lua b/nvim/nvim/lua/wqtt/plugins/nvim-dap-ui.lua new file mode 100644 index 0000000..c5ee034 --- /dev/null +++ b/nvim/nvim/lua/wqtt/plugins/nvim-dap-ui.lua @@ -0,0 +1,4 @@ +return { + "rcarriga/nvim-dap-ui", + dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }, +} diff --git a/nvim/nvim/lua/wqtt/plugins/themes/melange.lua b/nvim/nvim/lua/wqtt/plugins/themes/melange.lua new file mode 100644 index 0000000..0ea79a9 --- /dev/null +++ b/nvim/nvim/lua/wqtt/plugins/themes/melange.lua @@ -0,0 +1 @@ +return { "savq/melange-nvim" } diff --git a/nvim/nvim/lua/wqtt/plugins/transparent.lua b/nvim/nvim/lua/wqtt/plugins/transparent.lua deleted file mode 100644 index 7e3cea7..0000000 --- a/nvim/nvim/lua/wqtt/plugins/transparent.lua +++ /dev/null @@ -1,50 +0,0 @@ -return { - "xiyaowong/transparent.nvim", - config = function() - require("transparent").setup({ -- Optional, you don't have to run setup. - groups = { -- table: default groups - "Normal", - "NormalNC", - "Comment", - "Constant", - "Special", - "Identifier", - "Statement", - "PreProc", - "Type", - "Underlined", - "Todo", - "String", - "Function", - "Conditional", - "Repeat", - "Operator", - "Structure", - "LineNr", - "NonText", - "SignColumn", - "CursorLine", - "CursorLineNr", - "StatusLine", - "StatusLineNC", - "EndOfBuffer", - "NormalFloat", - "NvimTreeNormal", - "TelescopeNormal", - "TelescopeSelection", - "TelescopePromptTitle", - "TelescopePromptNormal", - "TelescopePromptBorder", - "TelescopeResultsTitle", - "TelescopeResultsNormal", - "TelescopeResultsBorder", - "TelescopePreviewTitle", - "TelescopePreviewNormal", - "TelescopePreviewBorder", - "TelescopePromptCounter", - }, - extra_groups = {}, -- table: additional groups that should be cleared - exclude_groups = {}, -- table: groups you don't want to clear - }) - end, -} diff --git a/nvim/nvim/lua/wqtt/plugins/tree-sitter.lua b/nvim/nvim/lua/wqtt/plugins/tree-sitter.lua index a384f27..4a60486 100644 --- a/nvim/nvim/lua/wqtt/plugins/tree-sitter.lua +++ b/nvim/nvim/lua/wqtt/plugins/tree-sitter.lua @@ -24,6 +24,7 @@ return { "markdown", "markdown_inline", "graphql", + "gleam", "bash", "lua", "vim", diff --git a/zsh/zsh/.zshrc b/zsh/zsh/.zshrc index 99a46f1..e007898 100644 --- a/zsh/zsh/.zshrc +++ b/zsh/zsh/.zshrc @@ -6,6 +6,10 @@ source $ZSH/oh-my-zsh.sh export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +if [ -f "$HOME/.devcreds" ]; then + source "$HOME/.devcreds" +fi + alias vi="nvim" alias vim="nvim" alias c="clear" @@ -17,6 +21,7 @@ alias tml="tmux list-sessions" alias tma="tmux attach-session -t" alias tmn="tmux new -s" +export SHELL=$(which zsh) export BAT_THEME=ansi export EDITOR=nvim export PATH=$PATH:~/bin @@ -30,3 +35,4 @@ export GOFLAGS="-tags=unit,integration,mage" eval "$(zoxide init zsh)" eval "$(direnv hook zsh)" +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion