From 089fcab83b50d50442bad18efd1a642a19ecd452 Mon Sep 17 00:00:00 2001 From: Wesley Irvin Date: Fri, 15 May 2026 06:47:51 -0400 Subject: [PATCH 1/3] Changed tokyo night theme (#34) Changed the tokyonight theme off of powerkit as powerkit was way to slow. Needed something more snappy. Reviewed-on: https://git.wesirvin.com/wesley/dotfiles/pulls/34 --- tmux/dot-config/tmux/tmux.conf | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tmux/dot-config/tmux/tmux.conf b/tmux/dot-config/tmux/tmux.conf index 6d4a311..94dde2a 100644 --- a/tmux/dot-config/tmux/tmux.conf +++ b/tmux/dot-config/tmux/tmux.conf @@ -2,23 +2,20 @@ set -g prefix ^A set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'fabioluciano/tmux-powerkit' +set -g @plugin 'janoamaral/tokyo-night-tmux' # Tokyo Night config -set -g @powerkit_plugin_theme "tokyo-night" -set -g @powerkit_plugin_theme_variant "storm" -set -g @powerkit_plugins "cpu,memory,netspeed,datetime" -set -g @powerkit_plugin_netspeed_iface "wlp4s0" -set -g @powerkit_plugin_datetime_format "%m/%d/%y %H:%M" -set -g @powerkit_plugin_cache_enabled "true" -set -g @powerkit_separator_style "rounded" +set -g @tokyo-night-tmux_theme 'storm' +set -g @tokyo-night-tmux_show_netspeed 1 +set -g @tokyo-night-tmux_netspeed_iface "wlp4s0" +set -g @tokyo-night-tmux_window_id_style dsquare # Set mouse on so that we can scroll with the mouse set -g mouse on +# Set status bar to bottom +set -g status-position bottom + #set -g @theme_plugin_datetime_format '%a %d %b %Y' run '~/.tmux/plugins/tpm/tpm' - -# Status bar position -set -g status-position bottom -- 2.52.0 From 419a2cdc2c4fe7d72a745e276e534454d53a4c6f Mon Sep 17 00:00:00 2001 From: Wesley Irvin Date: Mon, 18 May 2026 18:48:49 -0400 Subject: [PATCH 2/3] General Fixes (#36) Fixed issue where when opening a second terminal it'd open in the same tmux session making it so that it's just a mirror of the first terminal. Closing that terminal would close all terminals. Also added an alias to vim which calls nvim Reviewed-on: https://git.wesirvin.com/wesley/dotfiles/pulls/36 --- wezterm/dot-wezterm.lua | 2 +- zsh/dot-zshrc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/wezterm/dot-wezterm.lua b/wezterm/dot-wezterm.lua index 82f43b5..43090d8 100644 --- a/wezterm/dot-wezterm.lua +++ b/wezterm/dot-wezterm.lua @@ -10,6 +10,6 @@ config.enable_tab_bar = false config.initial_cols = 205 config.initial_rows = 45 config.font_size = 10 -config.default_prog = { "tmux", "new-session", "-A", "-s", "main" } +config.default_prog = { "tmux", "new-session" } return config diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc index 1a4cb41..5f633b7 100644 --- a/zsh/dot-zshrc +++ b/zsh/dot-zshrc @@ -17,6 +17,9 @@ alias cat="bat" # Alias cd to z for zoxide alias cd="z" +# Alias vim to nvim +alias vim="nvim" + ############### END ALIASES ############### ############### BEGIN EXPORTS ############# -- 2.52.0 From 2c994818e3c39127402b4839dcc519a787daa90f Mon Sep 17 00:00:00 2001 From: Wesley Irvin Date: Mon, 18 May 2026 18:51:16 -0400 Subject: [PATCH 3/3] Cleaning up neovim configuration (#37) Due to the fact that this config is not used we are going to clean this up. Going forward only the plugins directory will be used so that any custom plugins I want to add can be added here and managed locally. This leaves the neovim distribution (if wanted) up to the user. Reviewed-on: https://git.wesirvin.com/wesley/dotfiles/pulls/37 --- nvim/dot-config/nvim/init.lua | 19 ------- nvim/dot-config/nvim/lua/plugins/barbar.lua | 19 ------- .../nvim/lua/plugins/completions.lua | 52 ------------------- .../nvim/lua/plugins/lsp-config.lua | 48 ----------------- nvim/dot-config/nvim/lua/plugins/lualine.lua | 10 ---- nvim/dot-config/nvim/lua/plugins/markdown.lua | 11 ---- nvim/dot-config/nvim/lua/plugins/neotree.lua | 13 ----- nvim/dot-config/nvim/lua/plugins/none-ls.lua | 19 ------- .../dot-config/nvim/lua/plugins/telescope.lua | 43 --------------- .../nvim/lua/plugins/tokyonight.lua | 10 ---- .../nvim/lua/plugins/treesitter.lua | 13 ----- nvim/dot-config/nvim/lua/vim-options.lua | 10 ---- 12 files changed, 267 deletions(-) delete mode 100644 nvim/dot-config/nvim/init.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/barbar.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/completions.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/lsp-config.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/lualine.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/markdown.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/neotree.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/none-ls.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/telescope.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/tokyonight.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/treesitter.lua delete mode 100644 nvim/dot-config/nvim/lua/vim-options.lua diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua deleted file mode 100644 index 98dabae..0000000 --- a/nvim/dot-config/nvim/init.lua +++ /dev/null @@ -1,19 +0,0 @@ --- Bootstrap lazy.nvim -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - -require("vim-options") -require("lazy").setup("plugins") diff --git a/nvim/dot-config/nvim/lua/plugins/barbar.lua b/nvim/dot-config/nvim/lua/plugins/barbar.lua deleted file mode 100644 index ee8dce9..0000000 --- a/nvim/dot-config/nvim/lua/plugins/barbar.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "romgrk/barbar.nvim", - config = function() - require("barbar").setup({ - init = function() vim.g.barbar_auto_setup = false end, - dependencies = { - 'lewis6991/gitsigns.nvim', -- Optional, for git status signs - 'nvim-tree/nvim-web-devicons', -- Optional, for file icons - }, - opts = { - - }, - vim.keymap.set('n', '', ':BufferPrevious', {}), - vim.keymap.set('n', '', ':BufferNext', {}), - vim.keymap.set('n', '', ':BufferMovePrevious', {}), - vim.keymap.set('n', '', ':BufferMoveNext', {}), - }) - end -} diff --git a/nvim/dot-config/nvim/lua/plugins/completions.lua b/nvim/dot-config/nvim/lua/plugins/completions.lua deleted file mode 100644 index 986110f..0000000 --- a/nvim/dot-config/nvim/lua/plugins/completions.lua +++ /dev/null @@ -1,52 +0,0 @@ -return { - { - "hrsh7th/cmp-nvim-lsp", - }, - { - "L3MON4D3/LuaSnip", - dependencies = { - "saadparwaiz1/cmp_luasnip", - "rafamadriz/friendly-snippets", - }, - }, - { - "hrsh7th/nvim-cmp", - config = function() - local cmp = require("cmp") - require("luasnip.loaders.from_vscode").lazy_load() - - cmp.setup({ - snippet = { - -- REQUIRED - you must specify a snippet engine - expand = function(args) - -- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. - require("luasnip").lsp_expand(args.body) -- For `luasnip` users. - -- require('snippy').expand_snippet(args.body) -- For `snippy` users. - -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. - -- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+) - end, - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - -- { name = 'vsnip' }, -- For vsnip users. - { name = "luasnip" }, -- For luasnip users. - -- { name = 'ultisnips' }, -- For ultisnips users. - -- { name = 'snippy' }, -- For snippy users. - }, { - { name = "buffer" }, - }), - }) - end, - }, -} diff --git a/nvim/dot-config/nvim/lua/plugins/lsp-config.lua b/nvim/dot-config/nvim/lua/plugins/lsp-config.lua deleted file mode 100644 index 834c02d..0000000 --- a/nvim/dot-config/nvim/lua/plugins/lsp-config.lua +++ /dev/null @@ -1,48 +0,0 @@ -return { - { - "williamboman/mason.nvim", - config = function() - require("mason").setup() - end, - }, - { - "williamboman/mason-lspconfig.nvim", - config = function() - require("mason-lspconfig").setup({ - ensure_installed = { - "clangd", - "lua_ls", - "pyright", - "rust_analyzer", - "taplo", - }, - }) - end, - }, - { - "neovim/nvim-lspconfig", - config = function() - local capabilities = require("cmp_nvim_lsp").default_capabilities() - local lspconfig = require("lspconfig") - lspconfig.clangd.setup({ - capabilities = capabilities - }) - lspconfig.lua_ls.setup({ - capabilities = capabilities - }) - lspconfig.pyright.setup({ - capabilities = capabilities - }) - lspconfig.rust_analyzer.setup({ - capabilities = capabilities - }) - lspconfig.taplo.setup({ - capabilities = capabilities - }) - - vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) - vim.keymap.set("n", "gd", vim.lsp.buf.definition, {}) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, {}) - end, - }, -} diff --git a/nvim/dot-config/nvim/lua/plugins/lualine.lua b/nvim/dot-config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index e6f8d42..0000000 --- a/nvim/dot-config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "nvim-lualine/lualine.nvim", - config = function() - require('lualine').setup({ - options = { - theme = 'palenight' - } - }) - end -} diff --git a/nvim/dot-config/nvim/lua/plugins/markdown.lua b/nvim/dot-config/nvim/lua/plugins/markdown.lua deleted file mode 100644 index a7361fa..0000000 --- a/nvim/dot-config/nvim/lua/plugins/markdown.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "MeanderingProgrammer/render-markdown.nvim", - config = function () - require("render-markdown").setup({ - dependencies = { - 'nvim-treesitter/nvim-treesitter', - 'nvim-tree/nvim-web-devicons', - }, - }) - end -} diff --git a/nvim/dot-config/nvim/lua/plugins/neotree.lua b/nvim/dot-config/nvim/lua/plugins/neotree.lua deleted file mode 100644 index 8f8de9e..0000000 --- a/nvim/dot-config/nvim/lua/plugins/neotree.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information - }, - config = function() - vim.keymap.set('n', 'fe', ':Neotree filesystem reveal toggle left', {}) - end -} diff --git a/nvim/dot-config/nvim/lua/plugins/none-ls.lua b/nvim/dot-config/nvim/lua/plugins/none-ls.lua deleted file mode 100644 index 6ab0d85..0000000 --- a/nvim/dot-config/nvim/lua/plugins/none-ls.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "nvimtools/none-ls.nvim", - config = function() - local null_ls = require("null-ls") - - null_ls.setup({ - sources = { - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.clang_format, - null_ls.builtins.formatting.gersemi, - null_ls.builtins.formatting.stylua, - null_ls.builtins.diagnostics.cpplint, - null_ls.builtins.diagnostics.pylint, - }, - }) - - vim.keymap.set("n", "gf", vim.lsp.buf.format, {}) - end, -} diff --git a/nvim/dot-config/nvim/lua/plugins/telescope.lua b/nvim/dot-config/nvim/lua/plugins/telescope.lua deleted file mode 100644 index 22e4660..0000000 --- a/nvim/dot-config/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,43 +0,0 @@ -return { - { - 'nvim-telescope/telescope.nvim', - branch = '0.1.x', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - local builtin = require('telescope.builtin') - vim.keymap.set('n', '', builtin.find_files, {}) - vim.keymap.set('n', 'fg', builtin.live_grep, {}) - end - }, - { - 'nvim-telescope/telescope-ui-select.nvim', - config = function () - -- This is your opts table - require("telescope").setup { - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown { - -- even more opts - } - -- pseudo code / specification for writing custom displays, like the one - -- for "codeactions" - -- specific_opts = { - -- [kind] = { - -- make_indexed = function(items) -> indexed_items, width, - -- make_displayer = function(widths) -> displayer - -- make_display = function(displayer) -> function(e) - -- make_ordinal = function(e) -> string - -- }, - -- -- for example to disable the custom builtin "codeactions" display - -- do the following - -- codeactions = false, - -- } - } - } - } - -- To get ui-select loaded and working with telescope, you need to call - -- load_extension, somewhere after setup function: - require("telescope").load_extension("ui-select") - end - } -} diff --git a/nvim/dot-config/nvim/lua/plugins/tokyonight.lua b/nvim/dot-config/nvim/lua/plugins/tokyonight.lua deleted file mode 100644 index a5be3bb..0000000 --- a/nvim/dot-config/nvim/lua/plugins/tokyonight.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, - config = function() - vim.cmd.colorscheme "tokyonight-storm" - end -} - diff --git a/nvim/dot-config/nvim/lua/plugins/treesitter.lua b/nvim/dot-config/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 6dba589..0000000 --- a/nvim/dot-config/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,13 +0,0 @@ -return{ - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - config = function() - local configs = require("nvim-treesitter.configs") - configs.setup({ - ensure_installed = { "c", "cmake", "cpp", "lua", "markdown", "markdown_inline", "python", "rust", "toml" }, - auto_install = true, - highlight = { enable = true }, - indent = { enable = true }, - }) - end -} diff --git a/nvim/dot-config/nvim/lua/vim-options.lua b/nvim/dot-config/nvim/lua/vim-options.lua deleted file mode 100644 index 941d76d..0000000 --- a/nvim/dot-config/nvim/lua/vim-options.lua +++ /dev/null @@ -1,10 +0,0 @@ -vim.cmd("set shiftwidth=2") -vim.cmd("set tabstop=2") -vim.g.mapleader = " " -vim.wo.relativenumber = true -vim.wo.number = true -vim.cmd("set list") -vim.keymap.set('n', '', 'h', {}) -vim.keymap.set('n', '', 'j', {}) -vim.keymap.set('n', '', 'k', {}) -vim.keymap.set('n', '', 'l', {}) -- 2.52.0