From a1ef3c6e1263f74c5f7520759760d980a152da85 Mon Sep 17 00:00:00 2001 From: Josue Zamudio Date: Sat, 29 Nov 2025 11:30:17 -0800 Subject: [PATCH] feat:new nvim config and some other stuff --- .config/nvim/init.lua | 42 +------------- .config/nvim/lazy-lock.json | 13 +---- .config/nvim/lua/config/lazy.lua | 35 ++++++++++++ .config/nvim/lua/plugins/copilot.lua | 12 ---- .config/nvim/lua/plugins/harpoon.lua | 23 -------- .config/nvim/lua/plugins/lsp-config.lua | 12 ---- .config/nvim/lua/plugins/lualine.lua | 46 --------------- .config/nvim/lua/plugins/nvim-lspconfig.lua | 6 ++ .config/nvim/lua/plugins/telescope.lua | 13 +++-- .config/nvim/settings.vim | 56 ------------------ .config/nvim/spell/en.utf-8.add | 10 ---- .config/nvim/spell/en.utf-8.add.spl | Bin 154 -> 0 bytes .config/sway/config | 14 ++++- .config/sway/config.d/swayfx | 60 ++++++++++---------- .config/waybar/config.jsonc | 7 ++- .config/waybar/style.css | 14 +---- 16 files changed, 104 insertions(+), 259 deletions(-) create mode 100644 .config/nvim/lua/config/lazy.lua delete mode 100644 .config/nvim/lua/plugins/copilot.lua delete mode 100644 .config/nvim/lua/plugins/harpoon.lua delete mode 100644 .config/nvim/lua/plugins/lsp-config.lua delete mode 100644 .config/nvim/lua/plugins/lualine.lua create mode 100644 .config/nvim/lua/plugins/nvim-lspconfig.lua delete mode 100644 .config/nvim/settings.vim delete mode 100644 .config/nvim/spell/en.utf-8.add delete mode 100644 .config/nvim/spell/en.utf-8.add.spl diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d8c6be6..11b52c8 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,37 +1,5 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end +require("config.lazy") -vim.opt.rtp:prepend(lazypath) --- coq used for completion -vim.g.coq_settings = { - auto_start = true, - xdg = true, - completion = { - always = false, - }, - keymap = { - manual_complete = '', - } -} - --- code completion -require('lazy').setup('plugins') - -local coq = require 'coq' -require("mason").setup() -- used for automatically enabling lsp and coq -require("mason-lspconfig").setup() - --- Settings ---vim.cmd('source ~/.config/nvim/settings.vim') -- colorscheme vim.o.termguicolors = true @@ -40,6 +8,8 @@ vim.opt.winborder = 'rounded' --vim.cmd("colorscheme gruvbox ") --vim.cmd("colorscheme retrobox") +vim.opt.clipboard = "unnamedplus" -- uses the clipboard register for all operations except yank. + vim.cmd("set nocompatible") vim.cmd("syntax on") vim.cmd("filetype plugin indent on") @@ -67,9 +37,3 @@ vim.cmd("au FileType python set fileformat=unix encoding=utf-8") vim.cmd("au FileType markdown,tex set spell spelllang=en_us") --- keymaps -vim.keymap.set('n', '/', ':nohlsearch') -vim.keymap.set('n', 'b', ':buffers') -vim.keymap.set('n', 'bp', ':bp') -vim.keymap.set('n', 'bn', ':bn') - diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index bd093da..eb29bbc 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,16 +1,9 @@ { "black-metal-theme-neovim": { "branch": "main", "commit": "6d0207871387077f40d5396ab1ae90520e688d36" }, - "copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" }, - "coq_nvim": { "branch": "coq", "commit": "a63d28a9aa59c20a503ce38608fb6bc7cb3842f4" }, - "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, - "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "nvim-lspconfig": { "branch": "master", "commit": "07f4e93de92e8d4ea7ab99602e3a8c9ac0fb778a" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, + "telescope.nvim": { "branch": "master", "commit": "84b9ba066d1860f7a586ce9cd732fd6c4f77d1d9" }, "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" } } diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..731cb05 --- /dev/null +++ b/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,35 @@ +-- 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) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +--vim.g.mapleader = "/\" +--im.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + -- import your plugins + { import = "plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + -- install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua deleted file mode 100644 index 3e92ab6..0000000 --- a/.config/nvim/lua/plugins/copilot.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - 'github/copilot.vim', - config = function() - vim.keymap.set('i', '', 'copilot#Accept("\\")', { - expr = true, - replace_keycodes = false - }) - vim.keymap.set('i', '', '(copilot-accept-word)') - vim.g.copilot_enabled = 'v:false' - end -} - diff --git a/.config/nvim/lua/plugins/harpoon.lua b/.config/nvim/lua/plugins/harpoon.lua deleted file mode 100644 index 54db346..0000000 --- a/.config/nvim/lua/plugins/harpoon.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - 'ThePrimeagen/harpoon', - config = function(_, opts) - require('harpoon').setup(opts) - local mark = require('harpoon'.. ".mark") - local ui = require('harpoon'.. ".ui") - - -- Harpoon marked files 1 through 4. - vim.keymap.set("n", "", function() ui.nav_file(1) end) - vim.keymap.set("n", "", function() ui.nav_file(2) end) - vim.keymap.set("n", "", function() ui.nav_file(3) end) - vim.keymap.set("n", "", function() ui.nav_file(4) end) - - -- Harpoon next and previous. - vim.keymap.set("n", "", function() ui.nav_next() end) - vim.keymap.set("n", "", function() ui.nav_prev() end) - - -- Harpoon user interface. - vim.keymap.set("n", "hq", ui.toggle_quick_menu) - vim.keymap.set("n", "ha", mark.add_file) - - end -} diff --git a/.config/nvim/lua/plugins/lsp-config.lua b/.config/nvim/lua/plugins/lsp-config.lua deleted file mode 100644 index fffe64b..0000000 --- a/.config/nvim/lua/plugins/lsp-config.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "mason-org/mason-lspconfig.nvim", - dependencies = { - "mason-org/mason.nvim", - "neovim/nvim-lspconfig", - "ms-jpq/coq_nvim", -- Optional (auto complete) - }, - config = function() - --vim.lsp.config('lua_ls',coq.lsp_ensure_capabilities()) - --vim.lsp.config('clangd',coq.lsp_ensure_capabilities()) - end -} diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index c6dd481..0000000 --- a/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,46 +0,0 @@ -return{ - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons', opt = true }, - config = function() - require('lualine').setup { - options = { - icons_enabled = true, - theme = 'auto', - component_separators = { left = '', right = ''}, - section_separators = { left = '', right = ''}, - disabled_filetypes = { - statusline = {}, - winbar = {}, - }, - ignore_focus = {}, - always_divide_middle = true, - globalstatus = false, - refresh = { - statusline = 1000, - tabline = 1000, - winbar = 1000, - } - }, - sections = { - lualine_a = {'mode'}, - lualine_b = {'branch', 'diff', 'diagnostics'}, - lualine_c = {'filename'}, - lualine_x = {'encoding', 'fileformat', 'filetype'}, - lualine_y = {'progress'}, - lualine_z = {'location'} - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = {'filename'}, - lualine_x = {'location'}, - lualine_y = {}, - lualine_z = {} - }, - tabline = {}, - winbar = {}, - inactive_winbar = {}, - extensions = {} - } - end -} diff --git a/.config/nvim/lua/plugins/nvim-lspconfig.lua b/.config/nvim/lua/plugins/nvim-lspconfig.lua new file mode 100644 index 0000000..2d78bee --- /dev/null +++ b/.config/nvim/lua/plugins/nvim-lspconfig.lua @@ -0,0 +1,6 @@ +-- plugins/telescope.lua: +return { + 'neovim/nvim-lspconfig', + config = function() + end +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index c28ed36..a459e4f 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -1,12 +1,13 @@ +-- plugins/telescope.lua: return { - 'nvim-telescope/telescope.nvim', tag = '0.1.2', + 'nvim-telescope/telescope.nvim', tag = 'v0.1.9', dependencies = { 'nvim-lua/plenary.nvim' }, config = function() - local builtin = require('telescope.builtin') - vim.keymap.set('n', 'ff', builtin.find_files, {}) - vim.keymap.set('n', 'fg', builtin.live_grep, {}) - vim.keymap.set('n', 'fb', builtin.buffers, {}) - vim.keymap.set('n', 'fh', builtin.help_tags, {}) + local builtin = require('telescope.builtin') + vim.keymap.set('n', 'ff', builtin.find_files, {}) + vim.keymap.set('n', 'fg', builtin.live_grep, {}) + vim.keymap.set('n', 'fb', builtin.buffers, {}) + vim.keymap.set('n', 'fh', builtin.help_tags, {}) require('telescope').setup{ pickers = { diff --git a/.config/nvim/settings.vim b/.config/nvim/settings.vim deleted file mode 100644 index 07c6708..0000000 --- a/.config/nvim/settings.vim +++ /dev/null @@ -1,56 +0,0 @@ -set nocompatible -syntax on -filetype plugin indent on -set number -set relativenumber -set expandtab -set shiftwidth=4 -set softtabstop=4 -set tabstop=4 -set smartindent -set backspace=indent,eol,start - -set colorcolumn=81 -"hi ColorColumn ctermbg=lightgrey guibg=lightgrey -set textwidth=80 -set wrap -set linebreak - -set autoread " Set to auto read when a file is changed from the outside -set path+=** -set wildmenu -set showcmd -set wildmode=longest:full,full -set wildoptions=pum -set wildignore+=*/tmp/*,*.so,*.swp,*.zip -set wildignore+=*\\tmp\\*,*.exe - -set number ruler -set showmatch -set showbreak=↳\ \ -set hidden -set hlsearch -set noswapfile -set mouse= "remove mouse -"set clipboard=unnamedplus - -" Rendering -set ttyfast -set laststatus=1 -set t_Co=256 -let &t_ut='' - -"hi ColorColumn ctermbg=lightgrey guibg=lightgrey - -" Show bad whitespace in an obvious but not obnoxious color -"highlight pythonSpaceError ctermbg=darkgreen guibg=darkgreen -"highlight BadWhitespace ctermbg=darkgreen guibg=darkgreen -"au BufNewFile,BufRead *.py,*.pyw,*.c,*.h,*.cc,*.hh,*.sh match BadWhitespace /\s\+$/ - -au FileType python - \ set fileformat=unix - \ encoding=utf-8 - -au FileType markdown,tex - \ set spell spelllang=en_us - diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add deleted file mode 100644 index 01d2444..0000000 --- a/.config/nvim/spell/en.utf-8.add +++ /dev/null @@ -1,10 +0,0 @@ -Generative -ansible -CXI -HPLC -SED -brokhorst -MOXA -CONFIG -QRIX -EPS diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl deleted file mode 100644 index 950d1f614496a97ded326f06efafb933e1d9c261..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmXAjOAdfA2t=92jTi7BdI}eA-B+#JSbwcCy}gc=1em~MLR&ZCFwT{ah?rb=y_x3q z4A>B0(ZRt$;IU)D%<4IZNO7q>5*i6jP}w)DERNIzZ#Jff#zo+!R*FlP);(=vQksZO MDiZlD2EOsf3q_zD6aWAK diff --git a/.config/sway/config b/.config/sway/config index eeda209..075bb09 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -46,7 +46,7 @@ exec_always --no-startup-id '/home/jozamudi/.config/sway/scripts/clamshell-mode. # before-sleep 'swaylock -f -c 000000' -seat seat0 xcursor_theme Adwaita 25 +seat seat0 xcursor_theme Adwaita 35 # Auto start .desktop files using dex exec pipewire @@ -54,7 +54,19 @@ exec swaync exec waybar exec mpd exec dex -a +exec syncthing #exec wl-paste -t text --watch clipman store --no-persist +# There are two wl-paste processes running, one for the primary and one for the normal clipboard +exec wl-paste -t text --watch clipman store +exec wl-paste -p -t text --watch clipman store +# The keybind to select a clipping +bindsym $mod+y exec clipman --primary pick --tool wofi +# Clear all clippings +bindsym $mod+Shift+y exec clipman clear -a +# Remove a selected clipping +bindsym $mod+Mod1+y exec clipman clear --tool wofi +# Empty the current clipping +bindsym $mod+Ctrl+y exec : | wl-copy -p #better audio #exec easyeffects -w -l Laptop diff --git a/.config/sway/config.d/swayfx b/.config/sway/config.d/swayfx index 48dea80..1039db9 100644 --- a/.config/sway/config.d/swayfx +++ b/.config/sway/config.d/swayfx @@ -1,34 +1,34 @@ #smart_corner_radius on -gaps inner 6 +gaps inner 2 default_border pixel 2 -corner_radius 8 -blur enable -blur_passes 2 -blur_radius 2 -layer_effects "waybar" "blur enable"; shadows enable -shadows on -shadow_blur_radius 5 +#corner_radius 8 +#blur enable +#blur_passes 2 +#blur_radius 2 +#layer_effects "waybar" "blur enable"; shadows enable +#shadows on +#shadow_blur_radius 5 #https://github.com/rkubosz/base16-sway -#set $base00 #031A16 -#set $base01 #0B342D -#set $base02 #184E45 -#set $base03 #2B685E -#set $base04 #5F9C92 -#set $base05 #81B5AC -#set $base06 #A7CEC8 -#set $base07 #D2E7E4 -#set $base08 #3E9688 -#set $base09 #3E7996 -#set $base0A #3E4C96 -#set $base0B #883E96 -#set $base0C #963E4C -#set $base0D #96883E -#set $base0E #4C963E -#set $base0F #3E965B +set $base00 #031A16 +set $base01 #0B342D +set $base02 #184E45 +set $base03 #2B685E +set $base04 #5F9C92 +set $base05 #81B5AC +set $base06 #A7CEC8 +set $base07 #D2E7E4 +set $base08 #3E9688 +set $base09 #3E7996 +set $base0A #3E4C96 +set $base0B #883E96 +set $base0C #963E4C +set $base0D #96883E +set $base0E #4C963E +set $base0F #3E965B #set $base00 #000000 #set $base01 #121212 @@ -48,9 +48,9 @@ shadow_blur_radius 5 #set $base0F #444444 # Property Name Border BG Text Indicator Child Border -#client.focused $base05 $base0D $base00 $base0D $base0D -#client.focused_inactive $base01 $base01 $base05 $base03 $base01 -#client.unfocused $base01 $base00 $base05 $base01 $base01 -#client.urgent $base08 $base08 $base00 $base08 $base08 -#client.placeholder $base00 $base00 $base05 $base00 $base00 -#client.background $base07 +client.focused $base05 $base0D $base00 $base0D $base0D +client.focused_inactive $base01 $base01 $base05 $base03 $base01 +client.unfocused $base01 $base00 $base05 $base01 $base01 +client.urgent $base08 $base08 $base00 $base08 $base08 +client.placeholder $base00 $base00 $base05 $base00 $base00 +client.background $base07 diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 074df32..c97fa55 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -4,20 +4,21 @@ // "position": "bottom", // Waybar position (top|bottom|left|right) //"height": 10, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width - "spacing": 6, // Gaps between modules (4px) + "spacing": 2, // Gaps between modules (4px) // Choose the order of the modules "modules-left": [ "sway/workspaces", "sway/mode", "sway/scratchpad", - "custom/media" + "custom/media", + "sway/window" ], //"modules-center": [ //"sway/window" //], "modules-right": [ "mpd", - "custom/audio_idle_inhibitor", + //"custom/audio_idle_inhibitor", "pulseaudio", "network", //"power-profiles-daemon", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 67edb80..9204eba 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -25,14 +25,6 @@ window#waybar.solo { /*background-color: #FFFFFF;*/ } -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} button { /* Use box-shadow instead of border so the text isn't offset */ @@ -54,8 +46,8 @@ button:hover { } #workspaces button { - padding: 0 5px; - background-color: transparent; + padding: 0 4px; + /*background-color: transparent;*/ color: #ffffff; } @@ -65,7 +57,7 @@ button:hover { #workspaces button.focused { background-color: #64727D; - box-shadow: inset 0 -3px #ffffff; + /*box-shadow: inset 0 -3px #ffffff;*/ } #workspaces button.urgent {