From 0dc4a431c231c60a5c3765905815f4b6616fa95a Mon Sep 17 00:00:00 2001 From: Greg Date: Wed, 6 Nov 2024 00:15:00 +0200 Subject: [PATCH] changes --- .config/nvim/init.lua | 27 +++++++++++++++++++++++++-- .config/nvim/lazy-lock.json | 6 ++++-- .config/sway/config | 3 ++- .config/waybar/config | 1 + 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 60fc503..2666887 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -89,10 +89,15 @@ P.S. You can delete this when you're done too. It's your config now! :) -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = " " vim.g.maplocalleader = " " +-- disable netrw at the very start of your init.lua +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 + +-- optionally enable 24-bit colour +vim.opt.termguicolors = true -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true - -- [[ Setting options ]] -- See `:help vim.opt` -- NOTE: You can change these options as you wish! @@ -173,6 +178,8 @@ vim.keymap.set("n", "q", "") -- Ctrl+s to save vim.keymap.set("n", "", ":w") vim.keymap.set("i", "", ":wa") +-- NvimTree +vim.keymap.set("n", "", ":NvimTreeFocus ") -- ; for command mode vim.keymap.set("n", ";", ":") @@ -217,6 +224,12 @@ vim.api.nvim_create_autocmd("TextYankPost", { end, }) +vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { + desc = "diagnostics on hold", + group = vim.api.nvim_create_augroup("diagnostics", { clear = true }), + callback = vim.diagnostic.open_float, +}) + -- [[ Install `lazy.nvim` plugin manager ]] -- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" @@ -243,7 +256,17 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). "tpope/vim-sleuth", -- Detect tabstop and shiftwidth automatically - + { + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("nvim-tree").setup {} + end, + }, -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following -- keys can be used to configure plugin behavior/loading/etc. diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index f596a0d..55a7827 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,13 +1,13 @@ { - "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "278376b953bcab65e2ab9508b5575d1f9a2cbac1" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, + "luasnip": { "branch": "master", "commit": "29417eea5b7c4b6beda105ced072855101d9680e" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "7446f47b3dfb7df801f31a6f6783c2ad119a6935" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, @@ -15,7 +15,9 @@ "mini.nvim": { "branch": "main", "commit": "919b953f044d97a2243cc2d1f0b316a199434127" }, "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, "nvim-lspconfig": { "branch": "master", "commit": "28b205ebe73a18f401e040585106f9bafd8ff21f" }, + "nvim-tree.lua": { "branch": "master", "commit": "14039337a563f4efd72831888f332a15585f0ea1" }, "nvim-treesitter": { "branch": "master", "commit": "00d219068385a4aa80859d4606ad6e03af6faa83" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/.config/sway/config b/.config/sway/config index 9976b86..5e40e61 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -15,7 +15,8 @@ workspace_layout default # titlebar_padding 1 # titlebar_border_thickness 1 # smart_borders off -# gaps inner 5 +gaps inner 5 +gaps outer 5 for_window [app_id="kitty_shell"] floating enable, move center diff --git a/.config/waybar/config b/.config/waybar/config index 0c13e14..66e87c9 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -96,6 +96,7 @@ "on-click": "swaymsg input type:keyboard xkb_switch_layout next" }, "idle_inhibitor": { + "start-activated": true, "format": "{icon}", "format-icons": { "activated": "",