diff options
| author | moorenix <nicholasvmoore@gmail.com> | 2025-05-15 07:30:01 -0500 |
|---|---|---|
| committer | Nick Moore <nicholasvmoore@gmail.com> | 2025-10-29 07:38:18 -0500 |
| commit | 0b125b350a98c38c751e4fc40e0b7412c03e0aff (patch) | |
| tree | 8b07d02d1ba4dc75ad4f935a555a5ecb75f24d84 | |
| parent | b66e4efa7caae614335c694275133ef42384a98a (diff) | |
Adding window rules
46 files changed, 325 insertions, 154 deletions
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..e1ab1b0 --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml @@ -0,0 +1,47 @@ +[font] +size = 10 + +[font.normal] +family = "Dejavu Sans Mono" +style = "Regular" + +[window] +opacity = 0.95 + +[window.padding] +x = 5 +y = 5 + +[selection] +save_to_clipboard = true + +# Colors (Doom One) + +# Default colors +[colors.primary] +foreground = '#bbc2cf' +background ='#282c34' + +[colors.cursor] +cursor = '#51afef' +text = '#282c34' + +[colors.normal] +black = '#282c34' +red = '#ff6c6b' +green = '#98be65' +yellow = '#ecbe7b' +blue = '#51afef' +magenta = '#a9a1e1' +cyan = '#46d9ff' +white = '#bbc2cf' + +[colors.bright] +black = '#3f444a' +red = '#ff6c6b' +green = '#98be65' +yellow = '#da8548' +blue = '#51afef' +magenta = '#a9a1e1' +cyan = '#46d9ff' +white = '#efefef' diff --git a/alacritty/.config/alacritty/alacritty.toml.bak b/alacritty/.config/alacritty/alacritty.toml.bak new file mode 100644 index 0000000..7523299 --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml.bak @@ -0,0 +1,34 @@ +[font] +size = 10 + +[font.normal] +family = "Dejavu Sans Mono" +style = "Regular" + +[window] +opacity = 0.95 + +[window.padding] +x = 5 +y = 5 + +[selection] +save_to_clipboard = true + +# Colors (Doom One) + +# Default colors +[colors.primary] +background = '#282c34' +foreground = '#bbc2cf' + +# Normal colors +[colors.normal] +black = '#282c34' +red = '#ff6c6b' +green = '#98be65' +yellow = '#ecbe7b' +blue = '#51afef' +magenta = '#c678dd' +cyan = '#46d9ff' +white = '#bbc2cf' diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml deleted file mode 100644 index 4b13d76..0000000 --- a/alacritty/alacritty.toml +++ /dev/null @@ -1,16 +0,0 @@ -[font] -size = 16 - -[font.normal] -family = "Hack Nerd Font Mono" -style = "Regular" - -[window] -opacity = 0.8 - -[window.padding] -x = 5 -y = 5 - -[selection] -save_to_clipboard = true diff --git a/hypr/conf/environments.conf b/hypr/conf/environments.conf index a0f6146..8d77d8f 100644 --- a/hypr/conf/environments.conf +++ b/hypr/conf/environments.conf @@ -17,6 +17,7 @@ env = MOZ_ENABLE_WAYLAND,1 # Set the cursor size for xcursor env = XCURSOR_SIZE,24 +env = XCURSOR_THEME,rose-pine-hyprcursor # Disable appimage launcher by default env = APPIMAGELAUNCHER_DISABLE,1 diff --git a/hypr/conf/monitor.conf b/hypr/conf/monitor.conf index f0bb326..96234be 100644 --- a/hypr/conf/monitor.conf +++ b/hypr/conf/monitor.conf @@ -1,3 +1,4 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=eDP-1,2880x1920@60,auto,1 +monitor=eDP-1,2880x1920@60,0x0,2 monitor=DP-1,3440x1440@60,auto,1 +monitor=DP-2,3440x1440@59.97,-960x-1440,1 diff --git a/hypr/conf/windowrules.conf b/hypr/conf/windowrules.conf index 1da6531..30e2810 100644 --- a/hypr/conf/windowrules.conf +++ b/hypr/conf/windowrules.conf @@ -1 +1,2 @@ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
\ No newline at end of file +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +#windowrule= fullscreen, class:Alacritty diff --git a/nvim/.config/nvim/.nvmrc b/nvim/.config/nvim/.nvmrc new file mode 100644 index 0000000..1a2f5bd --- /dev/null +++ b/nvim/.config/nvim/.nvmrc @@ -0,0 +1 @@ +lts/*
\ No newline at end of file diff --git a/nvim/.stylua.toml b/nvim/.config/nvim/.stylua.toml index 139e939..139e939 100644 --- a/nvim/.stylua.toml +++ b/nvim/.config/nvim/.stylua.toml diff --git a/nvim/.config/nvim/AGENTS.md b/nvim/.config/nvim/AGENTS.md new file mode 100644 index 0000000..9a4708c --- /dev/null +++ b/nvim/.config/nvim/AGENTS.md @@ -0,0 +1,27 @@ +# Agent Guidelines for Neovim Configuration + +## Build/Test/Lint Commands +- No build commands - this is a Neovim configuration +- Format Lua code: `stylua .` (uses `.stylua.toml` config) +- No test suite - configuration only + +## Code Style & Conventions +- **Language**: Lua for all configuration files +- **Formatting**: Use `stylua` with 2-space indentation, Unix line endings +- **Imports**: Use `require('module')` syntax, prefer local assignments +- **Comments**: Use `--` for single-line, `--[[]]` for multi-line blocks +- **Naming**: snake_case for variables/functions, prefer descriptive names +- **Plugin loading**: Use lazy.nvim format with proper dependencies +- **Settings**: Use `vim.opt` for options, `vim.keymap.set` for keymaps + +## Project Structure +- `init.lua`: Main configuration entry point (single-file approach) +- `lua/custom/plugins/`: Custom plugin configurations +- `lua/kickstart/plugins/`: Kickstart-provided plugin configs +- `.stylua.toml`: Lua formatting configuration + +## Key Patterns +- Leader key is `<space>` (vim.g.mapleader) +- Plugin specs in table format with dependencies/opts/config +- LSP configuration via mason + lspconfig pattern +- Autocommands use `nvim_create_autocmd` with proper groups
\ No newline at end of file diff --git a/nvim/LICENSE.md b/nvim/.config/nvim/LICENSE.md index 9cf1062..9cf1062 100644 --- a/nvim/LICENSE.md +++ b/nvim/.config/nvim/LICENSE.md diff --git a/nvim/README.md b/nvim/.config/nvim/README.md index 8ace8b9..8ace8b9 100644 --- a/nvim/README.md +++ b/nvim/.config/nvim/README.md diff --git a/nvim/doc/kickstart.txt b/nvim/.config/nvim/doc/kickstart.txt index cb87ac3..cb87ac3 100644 --- a/nvim/doc/kickstart.txt +++ b/nvim/.config/nvim/doc/kickstart.txt diff --git a/nvim/doc/tags b/nvim/.config/nvim/doc/tags index 687ae77..687ae77 100644 --- a/nvim/doc/tags +++ b/nvim/.config/nvim/doc/tags diff --git a/nvim/init.lua b/nvim/.config/nvim/init.lua index b3dbdb7..39c445a 100644 --- a/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -80,7 +80,7 @@ vim.opt.scrolloff = 10 vim.opt.confirm = true -- Set the column width to 80 to match coding conventions -vim.opt.colorcolumn = '80' +vim.opt.colorcolumn = '120' -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` @@ -315,12 +315,18 @@ require('lazy').setup({ -- You can put your default mappings / updates / etc. in here -- All the info you're looking for is in `:help telescope.setup()` -- - -- defaults = { - -- mappings = { - -- i = { ['<c-enter>'] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} + defaults = { + vimgrep_arguments = { + 'rg', + '--color=never', + '--no-heading', + '--with-filename', + '--line-number', + '--column', + '--smart-case', + '--hidden', + }, + }, extensions = { ['ui-select'] = { require('telescope.themes').get_dropdown(), @@ -336,7 +342,9 @@ require('lazy').setup({ local builtin = require 'telescope.builtin' vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', '<leader>sf', function() + builtin.find_files { hidden = true } + end, { desc = '[S]earch [F]iles' }) vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) @@ -631,6 +639,7 @@ require('lazy').setup({ 'pylsp', 'bashls', 'jinja_lsp', + 'clangd', }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } @@ -791,34 +800,6 @@ require('lazy').setup({ signature = { enabled = true }, }, }, - - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'rose-pine/neovim', - name = 'rose-pine', - config = function() - -- vim.cmd 'colorscheme rose-pine-moon' - end, - }, - { - 'catppuccin/nvim', - name = 'catppuccin', - priority = 1000, - config = function() - require('catppuccin').setup { - flavour = 'macchiato', - transparent_background = true, - integrations = { - notify = true, - }, - } - vim.cmd 'colorscheme catppuccin' - end, - }, - -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, @@ -865,7 +846,7 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'python', 'go' }, -- Autoinstall languages that are not installed auto_install = true, highlight = { diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..1b9afbf --- /dev/null +++ b/nvim/.config/nvim/lazy-lock.json @@ -0,0 +1,30 @@ +{ + "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "conform.nvim": { "branch": "master", "commit": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081" }, + "doom-one.nvim": { "branch": "main", "commit": "beae92173315c7282f6897e666cfd67fbf0f3ac9" }, + "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" }, + "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, + "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, + "lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" }, + "lazydev.nvim": { "branch": "main", "commit": "c2dfe354571a8255c5d3e96a9a4c297c89ce2347" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "35ec9e1425c2f9a36f556893336af4f302c63214" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "mini.nvim": { "branch": "main", "commit": "ee4a4a4abed25e3d108d985b0553c5271f2f71aa" }, + "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, + "nvim-lspconfig": { "branch": "master", "commit": "cbd1e91296189a765094810de1b71a04e2597579" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "tinygo.nvim": { "branch": "main", "commit": "5c097bba3e6dd5ebb5b52001e1e9cfba0c81849d" }, + "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } +} diff --git a/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua b/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua new file mode 100644 index 0000000..ef3d14a --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua @@ -0,0 +1,37 @@ +return { + 'NTBBloodbath/doom-one.nvim', + config = function() + -- Add color to cursor + vim.g.doom_one_cursor_coloring = true + -- Set :terminal colors + vim.g.doom_one_terminal_colors = true + -- Enable italic comments + vim.g.doom_one_italic_comments = false + -- Enable TS support + vim.g.doom_one_enable_treesitter = true + -- Color whole diagnostic text or only underline + vim.g.doom_one_diagnostics_text_color = false + -- Enable transparent background + vim.g.doom_one_transparent_background = false + + -- Pumblend transparency + vim.g.doom_one_pumblend_enable = false + vim.g.doom_one_pumblend_transparency = 20 + + -- Plugins integration + vim.g.doom_one_plugin_neorg = true + vim.g.doom_one_plugin_barbar = false + vim.g.doom_one_plugin_telescope = false + vim.g.doom_one_plugin_neogit = true + vim.g.doom_one_plugin_nvim_tree = true + vim.g.doom_one_plugin_dashboard = true + vim.g.doom_one_plugin_startify = true + vim.g.doom_one_plugin_whichkey = true + vim.g.doom_one_plugin_indent_blankline = true + vim.g.doom_one_plugin_vim_illuminate = true + vim.g.doom_one_plugin_lspsaga = false + + -- Load the colorscheme + vim.cmd.colorscheme 'doom-one' + end, +} diff --git a/nvim/lua/custom/plugins/filetypes.lua b/nvim/.config/nvim/lua/custom/plugins/filetypes.lua index 73c99f2..73c99f2 100644 --- a/nvim/lua/custom/plugins/filetypes.lua +++ b/nvim/.config/nvim/lua/custom/plugins/filetypes.lua diff --git a/nvim/lua/custom/plugins/harppon.lua b/nvim/.config/nvim/lua/custom/plugins/harppon.lua index 1fc29bb..1fc29bb 100644 --- a/nvim/lua/custom/plugins/harppon.lua +++ b/nvim/.config/nvim/lua/custom/plugins/harppon.lua diff --git a/nvim/.config/nvim/lua/custom/plugins/headlines.lua b/nvim/.config/nvim/lua/custom/plugins/headlines.lua new file mode 100644 index 0000000..9555327 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/headlines.lua @@ -0,0 +1,5 @@ +return { + 'lukas-reineke/headlines.nvim', + dependencies = 'nvim-treesitter/nvim-treesitter', + config = true, -- or `opts = {}` +} diff --git a/nvim/lua/custom/plugins/init.lua b/nvim/.config/nvim/lua/custom/plugins/init.lua index be0eb9d..be0eb9d 100644 --- a/nvim/lua/custom/plugins/init.lua +++ b/nvim/.config/nvim/lua/custom/plugins/init.lua diff --git a/nvim/.config/nvim/lua/custom/plugins/lualine.lua b/nvim/.config/nvim/lua/custom/plugins/lualine.lua new file mode 100644 index 0000000..23ea0a0 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/lualine.lua @@ -0,0 +1,16 @@ +return { + { + 'nvim-lualine/lualine.nvim', + dependencies = { + 'nvim-tree/nvim-web-devicons', + }, + config = function() + require('lualine').setup { + options = { + icons_enabled = true, + theme = 'moonfly', + }, + } + end, + }, +} diff --git a/nvim/lua/custom/plugins/remap.lua b/nvim/.config/nvim/lua/custom/plugins/remap.lua index 367d21c..367d21c 100644 --- a/nvim/lua/custom/plugins/remap.lua +++ b/nvim/.config/nvim/lua/custom/plugins/remap.lua diff --git a/nvim/.config/nvim/lua/custom/plugins/tinygo.lua b/nvim/.config/nvim/lua/custom/plugins/tinygo.lua new file mode 100644 index 0000000..8115326 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/tinygo.lua @@ -0,0 +1,8 @@ +return { + { + 'pcolladosoto/tinygo.nvim', + config = function() + require('tinygo').setup() + end, + }, +} diff --git a/nvim/lua/custom/plugins/toggleterm.lua b/nvim/.config/nvim/lua/custom/plugins/toggleterm.lua index cc40f75..c5a32c0 100644 --- a/nvim/lua/custom/plugins/toggleterm.lua +++ b/nvim/.config/nvim/lua/custom/plugins/toggleterm.lua @@ -3,8 +3,8 @@ return { 'akinsho/toggleterm.nvim', version = '*', opts = { - start_in_insert = false, - persistent_mode = true, + start_in_insert = true, + persistent_mode = false, shell = vim.o.shell, auto_scroll = true, diff --git a/nvim/lua/custom/plugins/vim-be-good.lua b/nvim/.config/nvim/lua/custom/plugins/vim-be-good.lua index 7e5c709..7e5c709 100644 --- a/nvim/lua/custom/plugins/vim-be-good.lua +++ b/nvim/.config/nvim/lua/custom/plugins/vim-be-good.lua diff --git a/nvim/lua/custom/plugins/vim-sleuth.lua b/nvim/.config/nvim/lua/custom/plugins/vim-sleuth.lua index 123ac6a..123ac6a 100644 --- a/nvim/lua/custom/plugins/vim-sleuth.lua +++ b/nvim/.config/nvim/lua/custom/plugins/vim-sleuth.lua diff --git a/nvim/lua/custom/plugins/which-key.lua b/nvim/.config/nvim/lua/custom/plugins/which-key.lua index 1f73adc..1f73adc 100644 --- a/nvim/lua/custom/plugins/which-key.lua +++ b/nvim/.config/nvim/lua/custom/plugins/which-key.lua diff --git a/nvim/lua/kickstart/health.lua b/nvim/.config/nvim/lua/kickstart/health.lua index b59d086..b59d086 100644 --- a/nvim/lua/kickstart/health.lua +++ b/nvim/.config/nvim/lua/kickstart/health.lua diff --git a/nvim/lua/kickstart/plugins/autopairs.lua b/nvim/.config/nvim/lua/kickstart/plugins/autopairs.lua index 386d392..386d392 100644 --- a/nvim/lua/kickstart/plugins/autopairs.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/autopairs.lua diff --git a/nvim/lua/kickstart/plugins/debug.lua b/nvim/.config/nvim/lua/kickstart/plugins/debug.lua index 753cb0c..753cb0c 100644 --- a/nvim/lua/kickstart/plugins/debug.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/debug.lua diff --git a/nvim/lua/kickstart/plugins/gitsigns.lua b/nvim/.config/nvim/lua/kickstart/plugins/gitsigns.lua index cbbd22d..cbbd22d 100644 --- a/nvim/lua/kickstart/plugins/gitsigns.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/gitsigns.lua diff --git a/nvim/lua/kickstart/plugins/indent_line.lua b/nvim/.config/nvim/lua/kickstart/plugins/indent_line.lua index ed7f269..ed7f269 100644 --- a/nvim/lua/kickstart/plugins/indent_line.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/indent_line.lua diff --git a/nvim/lua/kickstart/plugins/lint.lua b/nvim/.config/nvim/lua/kickstart/plugins/lint.lua index 907c6bf..907c6bf 100644 --- a/nvim/lua/kickstart/plugins/lint.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/lint.lua diff --git a/nvim/lua/kickstart/plugins/neo-tree.lua b/nvim/.config/nvim/lua/kickstart/plugins/neo-tree.lua index bd44226..bd44226 100644 --- a/nvim/lua/kickstart/plugins/neo-tree.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/neo-tree.lua diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json deleted file mode 100644 index e9fd5da..0000000 --- a/nvim/lazy-lock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "blink.cmp": { "branch": "main", "commit": "54cbaac2064fe6198ec55b636b53cc8c9791ead3" }, - "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, - "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" }, - "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "e399f9748d7cfd8859747c8d6c4e9c8b4d50a1bd" }, - "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, - "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, - "mini.nvim": { "branch": "main", "commit": "009435c6c3653d54bc62997ca6b2e8513bc52cf4" }, - "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" }, - "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, - "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } -} diff --git a/tmux/.config/tmux/plugins/tmux b/tmux/.config/tmux/plugins/tmux new file mode 160000 +Subproject d85b2658c4f199720408f91f869591ae3a0704b diff --git a/tmux/.config/tmux/plugins/tmux-resurrect b/tmux/.config/tmux/plugins/tmux-resurrect new file mode 160000 +Subproject cff343cf9e81983d3da0c8562b01616f12e8d54 diff --git a/tmux/.config/tmux/plugins/tmux-sensible b/tmux/.config/tmux/plugins/tmux-sensible new file mode 160000 +Subproject 25cb91f42d020f675bb0a2ce3fbd3a5d96119ef diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm new file mode 160000 +Subproject 99469c4a9b1ccf77fade25842dc7bafbc8ce994 diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf new file mode 100644 index 0000000..479dfb9 --- /dev/null +++ b/tmux/.config/tmux/tmux.conf @@ -0,0 +1,69 @@ +# Set terminal colors +set-option -sa terminal-overrides ",xterm*:Tc" + +#set-option -g status-style bg=default +#set-option -g status-justify left +#set-option -g status-left-length 50 +#set-option -g status-interval 2 +#set-option -g status-left '[ #[fg=white,bright]#h ] #[default]' +#set-option -g status-right-length 80 +#set-option -g status-right '[ #($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -a 1 --interval 2) | #{battery_percentage} #{battery_remain} | #[fg=white,bright]%m/%d %H:%M #[fg=default]]' +#set-window-option -g window-status-current-format '#[fg=red,bg=default]( #[fg=white,bright,bg=default]#I:#W#[fg=red,nobright,bg=default] )#[fg=default]' +set -as terminal-features ",alacritty*:RGB" +source /usr/share/powerline/bindings/tmux/powerline.conf + +set -g mouse on +set -g base-index 1 +set -g pane-base-index 1 + +# Map prefix to A +unbind C-b +set-option -g prefix C-a +bind-key C-a send-prefix + +unbind % +bind | split-window -h + +unbind '"' +bind - split-window -v + +set-window-option -g mode-keys vi +bind -T copy-mode-vi v send-keys -X begin-selection +bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' + +# vim-like pane switching +bind -r ^ last-window +bind -r k select-pane -U +bind -r j select-pane -D +bind -r h select-pane -L +bind -r l select-pane -R + +# vim-linke pane resizing +bind -r K resize-pane -U 5 +bind -r J resize-pane -D 5 +bind -r H resize-pane -L 5 +bind -r L resize-pane -R 5 +bind -r m resize-pane -Z + +bind-key -T copy-mode-vi 'v' send -X begin-selection # start selecting text with "v" +bind-key -T copy-mode-vi 'y' send -X copy-selection # copy text with "y" + +unbind -T copy-mode-vi MouseDragEnd1Pane # don't exit copy mode when dragging with mouse + +# List of plugins +set -g @tpm_plugins ' \ + tmux-plugins/tpm \ + tmux-plugins/tmux-sensible \ + tmux-plugins/tmux-resurrect \ + git@github.com:dracula/tmux \ + ' + # thewtex/tmux-mem-cpu-load \ + # tmux-plugins/tmux-battery \ +#' + +set -g @dracula-plugins "cpu-usage battery time" +set -g @dracula-show-powerline true +set -g @dracula-battery-label " " +set -g @dracula-refresh-rate 1 + +run '$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm' diff --git a/tmux/plugins/tmux-battery b/tmux/plugins/tmux-battery deleted file mode 160000 -Subproject 48fae59ba4503cf345d25e4e66d79685aa3ceb7 diff --git a/tmux/tmux.conf b/tmux/tmux.conf deleted file mode 100644 index 2acbb83..0000000 --- a/tmux/tmux.conf +++ /dev/null @@ -1,60 +0,0 @@ -# Set terminal colors -set-option -sa terminal-overrides ",xterm*:Tc" - -set-option -g status-style bg=default -set-option -g status-justify left -set-option -g status-left-length 50 -set-option -g status-interval 2 -set-option -g status-left '[ #[fg=white,bright]#h ] #[default]' -set-option -g status-right-length 80 -set-option -g status-right '[ #($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -a 1 --interval 2) | #{battery_percentage} #{battery_remain} | #[fg=white,bright]%m/%d %H:%M #[fg=default]]' -set-window-option -g window-status-current-format '#[fg=red,bg=default]( #[fg=white,bright,bg=default]#I:#W#[fg=red,nobright,bg=default] )#[fg=default]' - -set -g mouse on -set -g base-index 1 -set -g pane-base-index 1 - -# Map prefix to A -unbind C-b -set-option -g prefix C-a -bind-key C-a send-prefix - -unbind % -bind | split-window -h - -unbind '"' -bind - split-window -v - -set-window-option -g mode-keys vi -bind -T copy-mode-vi v send-keys -X begin-selection -bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' - -# vim-like pane switching -bind -r ^ last-window -bind -r k select-pane -U -bind -r j select-pane -D -bind -r h select-pane -L -bind -r l select-pane -R - -# vim-linke pane resizing -bind -r K resize-pane -U 5 -bind -r J resize-pane -D 5 -bind -r H resize-pane -L 5 -bind -r L resize-pane -R 5 -bind -r m resize-pane -Z - -bind-key -T copy-mode-vi 'v' send -X begin-selection # start selecting text with "v" -bind-key -T copy-mode-vi 'y' send -X copy-selection # copy text with "y" - -unbind -T copy-mode-vi MouseDragEnd1Pane # don't exit copy mode when dragging with mouse - -# List of plugins -set -g @tpm_plugins ' \ - tmux-plugins/tpm \ - tmux-plugins/tmux-sensible \ - tmux-plugins/tmux-resurrect \ - thewtex/tmux-mem-cpu-load \ - tmux-plugins/tmux-battery \ -' - -run '$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm' diff --git a/waybar/config b/waybar/config index 1296a1b..6bc1e84 100644 --- a/waybar/config +++ b/waybar/config @@ -20,6 +20,7 @@ "modules-center": [ ], "modules-right": [ + "bluetooth", "mpd", "pulseaudio", "network", diff --git a/waybar/modules.json.bak b/waybar/modules.json.bak index 5f68b50..9c6eeee 100644 --- a/waybar/modules.json.bak +++ b/waybar/modules.json.bak @@ -137,7 +137,7 @@ "tooltip-format-ethernet": " {ifname} ({ipaddr}/{cidr})", "tooltip-format-disconnected": "Disconnected", "max-length": 50, - "on-click": "alacritty -e nmtui" + "on-click": "alacritty -e nmtui-connect" }, // Battery diff --git a/waybar/modules.jsonc b/waybar/modules.jsonc index c775bd7..a2aa2f0 100644 --- a/waybar/modules.jsonc +++ b/waybar/modules.jsonc @@ -8,10 +8,10 @@ "clock" ], "modules-right": [ + "network", "pulseaudio", "backlight", "battery", - "network", "cpu", "memory", "tray", @@ -43,12 +43,21 @@ "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "format": "{:%m/%d/%Y - %H:%M}" }, + "bluetooth": { + "on-click": "alacritty -e bluetui" + }, "network": { "format-wifi": " {signalStrength}%", - "format-ethernet": " {bandwidthDownBits}", + "format-ethernet": "", "format-disconnected": " No Network", "interval": 5, - "tooltip": false + "tooltip": true, + "family": "ipv4", + "tooltip-format": " {ifname} via {gwaddri}", + "tooltip-format-wifi": " {essid} ({signalStrength}%) \n {ifname}: {ipaddr}/{cidr}", + "tooltip-format-ethernet": " {ifname} ({ipaddr}/{cidr})", + "tooltip-format-disconnected": "Disconnected", + "on-click": "alacritty -e nmtui-connect" }, "cpu": { "interval": 1, @@ -56,7 +65,9 @@ }, "memory": { "interval": 30, - "format": "{used:0.1f}G / {total:0.1f}G" + "format": "{used:0.1f}G / {total:0.1f}G", + "on-click": "alacritty -e btop", + "tooltip": true }, "pulseaudio": { "format": "{icon} {volume}%", diff --git a/waybar/style.css b/waybar/style.css index a1c4596..7db2f56 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,6 +1,6 @@ * { font-family: JetbrainsMono Nerd Font; - font-size: 18px; + font-size: 12px; min-height: 0; padding-right: 2px; padding-left: 2px; @@ -36,13 +36,13 @@ border-radius: 5px; } +#network, #custom-music, #tray, #backlight, #clock, #battery, #pulseaudio, -#network, #cpu, #memory, #custom-lock, @@ -53,7 +53,7 @@ } #memory { - border-radius: 0px 5px 5px 0px; + border-radius: 0px 0px 0px 0px; } #clock { @@ -83,9 +83,14 @@ border-radius: 0; } +#bluetooth, #bluetooth.on, #bluetooth.connected #bluetooth.disabled #bluetooth.off { + border-radius: 0px 0px 0px 0%; + margin-left: 1rem; +} + #pulseaudio { color: #ea999c; - border-radius: 5px 0px 0px 5%; + border-radius: 0px 0px 0px 0%; margin-left: 1rem; } |
