From 02842aae26acdf5ee580aff42c46b76aa11ae5a3 Mon Sep 17 00:00:00 2001 From: vx-clutch Date: Fri, 17 Jan 2025 13:01:12 -0500 Subject: [PATCH] the color aint working --- nvim/.config/nvim/lazy-lock.json | 13 +++++----- nvim/.config/nvim/lua/vxclutch/init.lua | 10 ++------ .../nvim/lua/vxclutch/lazy/appearance.lua | 17 ------------- nvim/.config/nvim/lua/vxclutch/lazy/mini.lua | 24 +++++++++++++++++++ nvim/.config/nvim/lua/vxclutch/lazy/oil.lua | 19 --------------- .../nvim/lua/vxclutch/lazy/treesitter.lua | 6 +++++ rofi/themes/.gitkeep | 1 - tmux/.tmux.conf | 13 ++++++++-- zsh/.zshrc | 2 ++ 9 files changed, 52 insertions(+), 53 deletions(-) create mode 100644 nvim/.config/nvim/lua/vxclutch/lazy/mini.lua delete mode 100644 rofi/themes/.gitkeep diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index cee6afc..96349e7 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -6,23 +6,24 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, + "conform.nvim": { "branch": "master", "commit": "6dc21d4ce050c2e592d9635b7983d67baf216e3d" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" }, - "gitsigns.nvim": { "branch": "main", "commit": "9541f5e8e24571723cb02a5c2bf078aeacc5a711" }, + "gitsigns.nvim": { "branch": "main", "commit": "0797734e2bf229cc67b05e82a17e22a18f191913" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "44a3ab2bc6b40edeb7a76359826c9779d5c70cb5" }, "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" }, - "nvim-treesitter": { "branch": "master", "commit": "f0c928dbe93533b7e35894a8f957f40150d1f663" }, + "nvim-treesitter": { "branch": "master", "commit": "5da195ac3dfafd08d8b10756d975f0e01e1d563a" }, "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, "oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" }, - "paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "rose-pine": { "branch": "main", "commit": "719ec67bf51efdd778c3a7855a135a8d6d362959" }, - "snacks.nvim": { "branch": "main", "commit": "09d563e223cf7f51e34d406c0f0e44eae1b4227f" }, + "rose-pine": { "branch": "main", "commit": "42f0724e0bca9f57f0bcfa688787c37b8d4befe8" }, + "snacks.nvim": { "branch": "main", "commit": "706b1abc1697ca050314dc667e0900d53cad8aa4" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, diff --git a/nvim/.config/nvim/lua/vxclutch/init.lua b/nvim/.config/nvim/lua/vxclutch/init.lua index 943296f..48a35db 100644 --- a/nvim/.config/nvim/lua/vxclutch/init.lua +++ b/nvim/.config/nvim/lua/vxclutch/init.lua @@ -1,13 +1,7 @@ vim.g.mapleader = " " --- https://github.com/vx-clutch/ftl -vim.filetype.add { - extension = { - ftl = "ftl", - }, -} - require "vxclutch.set" require "vxclutch.lazy_init" -vim.api.nvim_set_hl(0, "Function", { bold = false }) -- Must be called last. require "vxclutch.remap" +vim.api.nvim_set_hl(0, "Function", { bold = false }) -- Must be called last. +require("nvim-colorizer").setup() diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua index a3099bb..3cf7010 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua @@ -8,23 +8,6 @@ function ColorMyPencils(color) end return { - { - "folke/paint.nvim", - config = function() - require("paint").setup { - highlights = { - { - -- filter can be a table of buffer options that should match, - -- or a function called with buf as param that should return true. - -- The example below will paint @something in comments with Constant - filter = { filetype = "ftl" }, - pattern = "%s*%-%-%-%s*(@%w+)", - hl = "Constant", - }, - }, - } - end, - }, { "erikbackman/brightburn.vim", }, diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/mini.lua b/nvim/.config/nvim/lua/vxclutch/lazy/mini.lua new file mode 100644 index 0000000..8cd794d --- /dev/null +++ b/nvim/.config/nvim/lua/vxclutch/lazy/mini.lua @@ -0,0 +1,24 @@ +return { + "echasnovski/mini.nvim", + version = false, + config = function() + require("mini.ai").setup() + require("mini.surround").setup() + require("mini.pairs").setup() + require("mini.pick").setup { + window = { + config = { + anchor = "NW", + row = 0, + col = 0, + width = 30, + }, + style = 'minimal', + border = 'rounded', + }, + options = { + use_cache = true, + }, + } + end, +} diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/oil.lua b/nvim/.config/nvim/lua/vxclutch/lazy/oil.lua index 1461bf3..e1316be 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/oil.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/oil.lua @@ -21,25 +21,6 @@ return { end, }, } - - -- File navigation split with Oil - vim.api.nvim_create_user_command("Pick", function() - local origin_buf = vim.fn.bufnr() - vim.cmd "new | Oil" - - local oil_opened = false - vim.api.nvim_create_autocmd("BufReadPost", { - pattern = "*", - callback = function() - if vim.bo.filetype == "oil" then - oil_opened = true - end - if vim.bo.filetype ~= "oil" and oil_opened then - vim.api.nvim_buf_delete(origin_buf, { force = true }) - end - end, - }) - end, {}) end, dependencies = { "nvim-tree/nvim-web-devicons" }, } diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/treesitter.lua b/nvim/.config/nvim/lua/vxclutch/lazy/treesitter.lua index 93f220b..906b372 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/treesitter.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/treesitter.lua @@ -12,6 +12,12 @@ return { "java", }, + textobjects = { + select = { + enable = false, + } + }, + -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, diff --git a/rofi/themes/.gitkeep b/rofi/themes/.gitkeep deleted file mode 100644 index 8b13789..0000000 --- a/rofi/themes/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index e8b7b3c..0732a7a 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,5 +1,14 @@ +set -ga terminal-overrides ",screen-256color*:Tc" +set-option -g default-terminal "screen-256color" +set -s escape-time 0 + unbind C-b -unbind i set-option -g prefix C-s bind-key C-s send-prefix -bind-key i run-shell "tmux neww ~/.scripts/tmux-cht.sh" + +set -g status-style 'bg=#333333 fg=#5eacd3' + +bind -r k select-pane -U +bind -r j select-pane -D +bind -r h select-pane -L +bind -r l select-pane -R diff --git a/zsh/.zshrc b/zsh/.zshrc index ae9d913..ec26fba 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -42,3 +42,5 @@ function retake() { function clip() { cat $1 | clip.exe } + +if [ "$TMUX" = "" ]; then tmux; fi