diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml index 4c35277..58c35df 100644 --- a/alacritty/.config/alacritty/alacritty.toml +++ b/alacritty/.config/alacritty/alacritty.toml @@ -1,9 +1,7 @@ live_config_reload = true working_directory = "None" -import = [ - "~/.config/alacritty/themes/gnome_terminal.toml" -] +import = ["~/.config/alacritty/themes/gnome_terminal.toml"] [env] TERM = "xterm-256color" diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index b8ca0cc..dfcd782 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -1,28 +1,33 @@ { "LazyVim": { "branch": "main", "commit": "9eefc6a3aaeb1a0742e676ba32c6963d649d3ca9" }, + "SchemaStore.nvim": { "branch": "main", "commit": "2580d32172f66fa37c0e57fb14e1b5bc94ed9e15" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, "catppuccin": { "branch": "main", "commit": "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "conform.nvim": { "branch": "master", "commit": "310e2e95a4f832163f3f7a9fedebb1a4afc0db69" }, + "crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, "flash.nvim": { "branch": "main", "commit": "25ba3f4d1e0b080213b39518ebcfbb693a23c957" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "2a7b39f4d282935f8b44cbe82879af69c7472f5c" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "lazy.nvim": { "branch": "main", "commit": "b02c9eae6a250f98908c146d1dc1a891f5019f0a" }, "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" }, "mini.icons": { "branch": "main", "commit": "9d9d21868841ce0a26fb2b8ef0eba7021055145c" }, "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" }, - "noice.nvim": { "branch": "main", "commit": "3b5ea551448bd769976428458c11ae3f5849b7ba" }, + "noice.nvim": { "branch": "main", "commit": "90844cfdf8c1d2edcb2e56c21e2724e7c6ea4c41" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, @@ -30,16 +35,20 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "4836c1df6516cc2f895e362f3d00a15a236407b3" }, + "nvim-treesitter": { "branch": "master", "commit": "14dff71d381737f29df9a6e5335e16d3d9815309" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "26c365cc7d58d0da17b13e747855d331eb26fcf0" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, "persistence.nvim": { "branch": "main", "commit": "40a137dd9240c9c6760c53df48d2b155f52c252b" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "refactoring.nvim": { "branch": "master", "commit": "d07218748c48e756c27aa6859bfa6e62a3d271af" }, + "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, "tokyonight.nvim": { "branch": "main", "commit": "6adfcde66e8af2f22dd5d76060980abd8daa0df8" }, "trouble.nvim": { "branch": "main", "commit": "bf99ea71a39e322336b7f8be965f86dbf5c65540" }, "ts-comments.nvim": { "branch": "main", "commit": "80eec3b9663ac3c4743b584f361099b061d0a9e5" }, - "which-key.nvim": { "branch": "main", "commit": "21f3465ecd68b4e7cf84bb0b88c72cc23ff7838b" } + "venv-selector.nvim": { "branch": "regexp", "commit": "47159757b334343fe60f16d52478f827ccefa09d" }, + "which-key.nvim": { "branch": "main", "commit": "4390015b265adf69cf3e344cc13167539f732b2f" } } diff --git a/nvim/dot-config/nvim/lazyvim.json b/nvim/dot-config/nvim/lazyvim.json index b1aed37..7282527 100644 --- a/nvim/dot-config/nvim/lazyvim.json +++ b/nvim/dot-config/nvim/lazyvim.json @@ -1,6 +1,16 @@ { "extras": [ - + "lazyvim.plugins.extras.editor.refactoring", + "lazyvim.plugins.extras.lang.docker", + "lazyvim.plugins.extras.lang.elixir", + "lazyvim.plugins.extras.lang.erlang", + "lazyvim.plugins.extras.lang.git", + "lazyvim.plugins.extras.lang.go", + "lazyvim.plugins.extras.lang.python", + "lazyvim.plugins.extras.lang.rust", + "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.lang.yaml", + "lazyvim.plugins.extras.ui.alpha" ], "news": { "NEWS.md": "6077" diff --git a/nvim/dot-config/nvim/lua/config/keymaps.lua b/nvim/dot-config/nvim/lua/config/keymaps.lua index 2c134f7..05e0c68 100644 --- a/nvim/dot-config/nvim/lua/config/keymaps.lua +++ b/nvim/dot-config/nvim/lua/config/keymaps.lua @@ -1,3 +1,9 @@ -- Keymaps are automatically loaded on the VeryLazy event -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here +vim.keymap.set( + "n", + "sx", + require("telescope.builtin").resume, + { noremap = false, silent = false, desc = "Resume" } +) diff --git a/nvim/dot-config/nvim/lua/config/options.lua b/nvim/dot-config/nvim/lua/config/options.lua index 3ea1454..5c23ba2 100644 --- a/nvim/dot-config/nvim/lua/config/options.lua +++ b/nvim/dot-config/nvim/lua/config/options.lua @@ -1,3 +1,4 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here +vim.opt.winbar = "%=%m %f" diff --git a/nvim/dot-config/nvim/lua/plugins/alpha.lua b/nvim/dot-config/nvim/lua/plugins/alpha.lua new file mode 100644 index 0000000..055a3b8 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/alpha.lua @@ -0,0 +1,16 @@ +return { + "goolord/alpha-nvim", + opts = function(_, opts) + local logo = [[ + ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ + ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ + ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ + ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ + ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ + ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ + + [ @elijahmanor ] + ]] + opts.section.header.val = vim.split(logo, "\n", { trimempty = true }) + end, +} diff --git a/nvim/dot-config/nvim/lua/plugins/catppuchin.lua b/nvim/dot-config/nvim/lua/plugins/catppuchin.lua new file mode 100644 index 0000000..625cdfc --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/catppuchin.lua @@ -0,0 +1,9 @@ +return { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + ---@class CatppuccinOptions + opts = { + transparent_background = true, + }, +} diff --git a/nvim/dot-config/nvim/lua/plugins/disabled.lua b/nvim/dot-config/nvim/lua/plugins/disabled.lua new file mode 100644 index 0000000..cabc4f0 --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/disabled.lua @@ -0,0 +1,3 @@ +return { + { "windwp/nvim-spectre", enabled = false }, +} diff --git a/nvim/dot-config/nvim/lua/plugins/file-browser.lua b/nvim/dot-config/nvim/lua/plugins/file-browser.lua new file mode 100644 index 0000000..ce3abcb --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/file-browser.lua @@ -0,0 +1,13 @@ +return { + "nvim-telescope/telescope-file-browser.nvim", + keys = { + { + "sB", + ":Telescope file_browser path=%:p:h=%:p:h", + desc = "Browser Files", + }, + }, + config = function() + require("telescope").load_extension("file_browser") + end, +} diff --git a/nvim/dot-config/nvim/lua/plugins/lazyvim.lua b/nvim/dot-config/nvim/lua/plugins/lazyvim.lua new file mode 100644 index 0000000..987ca4b --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/lazyvim.lua @@ -0,0 +1,6 @@ +return { + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin", + }, +} diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index b335609..1e0efb0 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -6,6 +6,7 @@ set -g renumber-window on set -g base-index 1 setw -g pane-base-index 1 bind c new-window -c "#{pane_current_path}" +set-option -a terminal-features 'xterm-256color:RGB' # List of plugins set -g @plugin 'tmux-plugins/tpm'