From 2eb7df6dbd6e4b3011916b036e7cb7459b0ec76f Mon Sep 17 00:00:00 2001 From: Dustin Stiles Date: Wed, 14 Aug 2024 18:23:15 -0400 Subject: [PATCH] more updates --- nvim/nvim/lazy-lock.json | 8 ----- nvim/nvim/lua/theme.lua | 4 +-- nvim/nvim/lua/wqtt/plugins/autopairs.lua | 25 ---------------- nvim/nvim/lua/wqtt/plugins/lsp/lspconfig.lua | 6 ---- nvim/nvim/lua/wqtt/plugins/luarocks.lua | 5 ---- nvim/nvim/lua/wqtt/plugins/neodev.lua | 1 - nvim/nvim/lua/wqtt/plugins/neorg.lua | 31 -------------------- nvim/nvim/lua/wqtt/plugins/neoscroll.lua | 6 ---- tmux/tmux/.tmux.conf | 11 +------ zsh/zsh/.zshrc | 4 +-- 10 files changed, 5 insertions(+), 96 deletions(-) delete mode 100644 nvim/nvim/lua/wqtt/plugins/autopairs.lua delete mode 100644 nvim/nvim/lua/wqtt/plugins/luarocks.lua delete mode 100644 nvim/nvim/lua/wqtt/plugins/neodev.lua delete mode 100644 nvim/nvim/lua/wqtt/plugins/neorg.lua delete mode 100644 nvim/nvim/lua/wqtt/plugins/neoscroll.lua diff --git a/nvim/nvim/lazy-lock.json b/nvim/nvim/lazy-lock.json index 4f35230..6635a32 100644 --- a/nvim/nvim/lazy-lock.json +++ b/nvim/nvim/lazy-lock.json @@ -14,25 +14,18 @@ "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, - "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, - "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, "lush.nvim": { "branch": "main", "commit": "6a254139d077ad53be7e4f3602c8da0c84447fd9" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" }, "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" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lint": { "branch": "master", "commit": "ad0fe35e80f5cd31a0f19176d7b30e5c3011119d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, "nvim-lspconfig": { "branch": "master", "commit": "ad32182cc4a03c8826a64e9ced68046c575fdb7d" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, "nvim-treesitter": { "branch": "master", "commit": "3de418e73d5b912096229aaeea8bb7aef5094e0d" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, @@ -40,7 +33,6 @@ "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "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": "256d086c218a282ae5de79d2c091b1e592a65367" }, "seoul256.vim": { "branch": "master", "commit": "b21c9e63f7c2d543db8b34a393a0b42ec7e9b891" }, diff --git a/nvim/nvim/lua/theme.lua b/nvim/nvim/lua/theme.lua index f25f418..c93b2c4 100644 --- a/nvim/nvim/lua/theme.lua +++ b/nvim/nvim/lua/theme.lua @@ -1,3 +1,3 @@ -vim.opt.background = "dark" +vim.opt.background = "light" -vim.cmd("colorscheme rose-pine-moon") +vim.cmd("colorscheme rosebones") diff --git a/nvim/nvim/lua/wqtt/plugins/autopairs.lua b/nvim/nvim/lua/wqtt/plugins/autopairs.lua deleted file mode 100644 index 50274c1..0000000 --- a/nvim/nvim/lua/wqtt/plugins/autopairs.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - "windwp/nvim-autopairs", - event = { "InsertEnter" }, - dependencies = { - "hrsh7th/nvim-cmp", - }, - config = function() - local autopairs = require("nvim-autopairs") - - autopairs.setup({ - check_ts = true, - ts_config = { - lua = { "string" }, - javascript = { "template_string" }, - java = false, - }, - }) - - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - - local cmp = require("cmp") - - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, -} diff --git a/nvim/nvim/lua/wqtt/plugins/lsp/lspconfig.lua b/nvim/nvim/lua/wqtt/plugins/lsp/lspconfig.lua index 53e7e81..b16d2ae 100644 --- a/nvim/nvim/lua/wqtt/plugins/lsp/lspconfig.lua +++ b/nvim/nvim/lua/wqtt/plugins/lsp/lspconfig.lua @@ -70,12 +70,6 @@ return { filetypes = { "html", "ts", "tsx", "js", "jsx", "elm", "gleam" }, }) end, - ["clangd"] = function() - lspconfig["clangd"].setup({ - capabilities = capabilities, - filetypes = { "c", "cpp" }, - }) - end, ["lua_ls"] = function() lspconfig["lua_ls"].setup({ capabilities = capabilities, diff --git a/nvim/nvim/lua/wqtt/plugins/luarocks.lua b/nvim/nvim/lua/wqtt/plugins/luarocks.lua deleted file mode 100644 index e877dae..0000000 --- a/nvim/nvim/lua/wqtt/plugins/luarocks.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "vhyrro/luarocks.nvim", - priority = 1000, -- Very high priority is required, luarocks.nvim should run as the first plugin in your config. - config = true, -} diff --git a/nvim/nvim/lua/wqtt/plugins/neodev.lua b/nvim/nvim/lua/wqtt/plugins/neodev.lua deleted file mode 100644 index 4d802a0..0000000 --- a/nvim/nvim/lua/wqtt/plugins/neodev.lua +++ /dev/null @@ -1 +0,0 @@ -return { "folke/neodev.nvim", opts = {} } diff --git a/nvim/nvim/lua/wqtt/plugins/neorg.lua b/nvim/nvim/lua/wqtt/plugins/neorg.lua deleted file mode 100644 index 1c8f4db..0000000 --- a/nvim/nvim/lua/wqtt/plugins/neorg.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - "nvim-neorg/neorg", - lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default - version = "*", -- Pin Neorg to the latest stable release - config = function() - require("neorg").setup({ - load = { - ["core.defaults"] = {}, - ["core.dirman"] = { - config = { - workspaces = { - stablekernel = "~/repos/notes/stablekernel", - }, - }, - }, - ["core.concealer"] = {}, - ["core.summary"] = {}, - ["core.completion"] = { - config = { - engine = "nvim-cmp", - }, - }, - ["core.integrations.nvim-cmp"] = {}, - }, - }) - - vim.keymap.set("n", "ni", ":Neorg inject-metadata", { desc = "Inject neorg metadata" }) - vim.keymap.set("n", "nu", ":Neorg update-metadata", { desc = "Update neorg metadata" }) - vim.keymap.set("n", "nt", ":Neorg toc", { desc = "Update neorg metadata" }) - end, -} diff --git a/nvim/nvim/lua/wqtt/plugins/neoscroll.lua b/nvim/nvim/lua/wqtt/plugins/neoscroll.lua deleted file mode 100644 index b79bc5a..0000000 --- a/nvim/nvim/lua/wqtt/plugins/neoscroll.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "karb94/neoscroll.nvim", - config = function() - require("neoscroll").setup({}) - end, -} diff --git a/tmux/tmux/.tmux.conf b/tmux/tmux/.tmux.conf index 8fe9ca6..586f2cb 100644 --- a/tmux/tmux/.tmux.conf +++ b/tmux/tmux/.tmux.conf @@ -2,19 +2,10 @@ set -g base-index 1 # start indexing windows at 1 instead of 0 set -g detach-on-destroy off # don't exit from tmux when closing a session set -g escape-time 0 # zero-out escape time delay set -g history-limit 1000000 # increase history size (from 2,000) -set -g mouse on # enable mouse support set -g renumber-windows on # renumber all windows when any window is closed set -g set-clipboard on # use system clipboard -set -g status-interval 3 # update the status bar every 3 seconds -# Persist sessions across machine shutdowns -set -g @plugin 'tmux-plugins/tmux-resurrect' - -# SessionX session management set -g @plugin 'omerxx/tmux-sessionx' - - -# Tmux Plugin Manager - set -g @plugin 'tmux-plugins/tpm' + run '~/.tmux/plugins/tpm/tpm' diff --git a/zsh/zsh/.zshrc b/zsh/zsh/.zshrc index e007898..8902130 100644 --- a/zsh/zsh/.zshrc +++ b/zsh/zsh/.zshrc @@ -15,8 +15,8 @@ alias vim="nvim" alias c="clear" alias lg="lazygit" alias ldr="lazydocker" -alias ls="eza --icons always --git-repos" -alias cat=bat +# alias ls="eza --icons always --git-repos" +# alias cat=bat alias tml="tmux list-sessions" alias tma="tmux attach-session -t" alias tmn="tmux new -s"