diff --git a/.gitignore b/.gitignore index a1ab491..46c530b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *tmux/** !tmux/tmux.conf *zsh/.zsh_history +*zsh/.zsh_sessions/ *zed/** diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 256b8c1..eb950cb 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -14,7 +14,7 @@ x = 0 y = 1 [font.normal] -family = "MesloLGS NF" +family = "MesloLGS Nerd Font Mono" [font.italic] style = "Italic" diff --git a/fonts/Anonymous_Pro/AnonymousPro-Bold.ttf b/fonts/Anonymous_Pro/AnonymousPro-Bold.ttf deleted file mode 100644 index f14c18c..0000000 Binary files a/fonts/Anonymous_Pro/AnonymousPro-Bold.ttf and /dev/null differ diff --git a/fonts/Anonymous_Pro/AnonymousPro-BoldItalic.ttf b/fonts/Anonymous_Pro/AnonymousPro-BoldItalic.ttf deleted file mode 100644 index cd7c30a..0000000 Binary files a/fonts/Anonymous_Pro/AnonymousPro-BoldItalic.ttf and /dev/null differ diff --git a/fonts/Anonymous_Pro/AnonymousPro-Italic.ttf b/fonts/Anonymous_Pro/AnonymousPro-Italic.ttf deleted file mode 100644 index 87b1786..0000000 Binary files a/fonts/Anonymous_Pro/AnonymousPro-Italic.ttf and /dev/null differ diff --git a/fonts/Anonymous_Pro/AnonymousPro-Regular.ttf b/fonts/Anonymous_Pro/AnonymousPro-Regular.ttf deleted file mode 100644 index a98da85..0000000 Binary files a/fonts/Anonymous_Pro/AnonymousPro-Regular.ttf and /dev/null differ diff --git a/fonts/Fira_Code/FiraCode-VariableFont_wght.ttf b/fonts/Fira_Code/FiraCode-VariableFont_wght.ttf deleted file mode 100644 index 5655ed5..0000000 Binary files a/fonts/Fira_Code/FiraCode-VariableFont_wght.ttf and /dev/null differ diff --git a/fonts/Fira_Code/static/FiraCode-Bold.ttf b/fonts/Fira_Code/static/FiraCode-Bold.ttf deleted file mode 100644 index 9a3d65f..0000000 Binary files a/fonts/Fira_Code/static/FiraCode-Bold.ttf and /dev/null differ diff --git a/fonts/Fira_Code/static/FiraCode-Light.ttf b/fonts/Fira_Code/static/FiraCode-Light.ttf deleted file mode 100644 index 87ff012..0000000 Binary files a/fonts/Fira_Code/static/FiraCode-Light.ttf and /dev/null differ diff --git a/fonts/Fira_Code/static/FiraCode-Medium.ttf b/fonts/Fira_Code/static/FiraCode-Medium.ttf deleted file mode 100644 index 7a9c38e..0000000 Binary files a/fonts/Fira_Code/static/FiraCode-Medium.ttf and /dev/null differ diff --git a/fonts/Fira_Code/static/FiraCode-Regular.ttf b/fonts/Fira_Code/static/FiraCode-Regular.ttf deleted file mode 100644 index b8a44d2..0000000 Binary files a/fonts/Fira_Code/static/FiraCode-Regular.ttf and /dev/null differ diff --git a/fonts/Fira_Code/static/FiraCode-SemiBold.ttf b/fonts/Fira_Code/static/FiraCode-SemiBold.ttf deleted file mode 100644 index 45cfed7..0000000 Binary files a/fonts/Fira_Code/static/FiraCode-SemiBold.ttf and /dev/null differ diff --git a/fonts/MesloLGSNF/MesloLGS NF Bold Italic.ttf b/fonts/MesloLGSNF/MesloLGS NF Bold Italic.ttf deleted file mode 100644 index be059c0..0000000 Binary files a/fonts/MesloLGSNF/MesloLGS NF Bold Italic.ttf and /dev/null differ diff --git a/fonts/MesloLGSNF/MesloLGS NF Bold.ttf b/fonts/MesloLGSNF/MesloLGS NF Bold.ttf deleted file mode 100644 index 6142dd0..0000000 Binary files a/fonts/MesloLGSNF/MesloLGS NF Bold.ttf and /dev/null differ diff --git a/fonts/MesloLGSNF/MesloLGS NF Italic.ttf b/fonts/MesloLGSNF/MesloLGS NF Italic.ttf deleted file mode 100644 index 90ca569..0000000 Binary files a/fonts/MesloLGSNF/MesloLGS NF Italic.ttf and /dev/null differ diff --git a/fonts/MesloLGSNF/MesloLGS NF Regular.ttf b/fonts/MesloLGSNF/MesloLGS NF Regular.ttf deleted file mode 100644 index e9e4de5..0000000 Binary files a/fonts/MesloLGSNF/MesloLGS NF Regular.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/SourceCodePro-Italic-VariableFont_wght.ttf b/fonts/Source_Code_Pro/SourceCodePro-Italic-VariableFont_wght.ttf deleted file mode 100644 index d3678bc..0000000 Binary files a/fonts/Source_Code_Pro/SourceCodePro-Italic-VariableFont_wght.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/SourceCodePro-VariableFont_wght.ttf b/fonts/Source_Code_Pro/SourceCodePro-VariableFont_wght.ttf deleted file mode 100644 index 19bb671..0000000 Binary files a/fonts/Source_Code_Pro/SourceCodePro-VariableFont_wght.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-Black.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-Black.ttf deleted file mode 100644 index 09078e0..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-Black.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-BlackItalic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-BlackItalic.ttf deleted file mode 100644 index 749bbf6..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-BlackItalic.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-Bold.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-Bold.ttf deleted file mode 100644 index 4653b76..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-Bold.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-BoldItalic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-BoldItalic.ttf deleted file mode 100644 index 59e9319..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-BoldItalic.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraBold.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-ExtraBold.ttf deleted file mode 100644 index b3ba550..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraBold.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraBoldItalic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-ExtraBoldItalic.ttf deleted file mode 100644 index 6b2d4a4..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraBoldItalic.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraLight.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-ExtraLight.ttf deleted file mode 100644 index 9f04a49..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraLight.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraLightItalic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-ExtraLightItalic.ttf deleted file mode 100644 index 03f4a74..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-ExtraLightItalic.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-Italic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-Italic.ttf deleted file mode 100644 index 6260448..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-Italic.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-Light.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-Light.ttf deleted file mode 100644 index ccc3a42..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-Light.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-LightItalic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-LightItalic.ttf deleted file mode 100644 index 9ab74ba..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-LightItalic.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-Medium.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-Medium.ttf deleted file mode 100644 index af3f57c..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-Medium.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-MediumItalic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-MediumItalic.ttf deleted file mode 100644 index ceab90b..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-MediumItalic.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-Regular.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-Regular.ttf deleted file mode 100644 index b1fa336..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-Regular.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-SemiBold.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-SemiBold.ttf deleted file mode 100644 index 834b4d6..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-SemiBold.ttf and /dev/null differ diff --git a/fonts/Source_Code_Pro/static/SourceCodePro-SemiBoldItalic.ttf b/fonts/Source_Code_Pro/static/SourceCodePro-SemiBoldItalic.ttf deleted file mode 100644 index 9c126e3..0000000 Binary files a/fonts/Source_Code_Pro/static/SourceCodePro-SemiBoldItalic.ttf and /dev/null differ diff --git a/fonts/hack/Hack-Bold.ttf b/fonts/hack/Hack-Bold.ttf deleted file mode 100644 index e9920dd..0000000 Binary files a/fonts/hack/Hack-Bold.ttf and /dev/null differ diff --git a/fonts/hack/Hack-BoldItalic.ttf b/fonts/hack/Hack-BoldItalic.ttf deleted file mode 100644 index 077f1c4..0000000 Binary files a/fonts/hack/Hack-BoldItalic.ttf and /dev/null differ diff --git a/fonts/hack/Hack-Italic.ttf b/fonts/hack/Hack-Italic.ttf deleted file mode 100644 index 501306b..0000000 Binary files a/fonts/hack/Hack-Italic.ttf and /dev/null differ diff --git a/fonts/hack/Hack-Regular.ttf b/fonts/hack/Hack-Regular.ttf deleted file mode 100644 index 25578e0..0000000 Binary files a/fonts/hack/Hack-Regular.ttf and /dev/null differ diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 4220ca3..1843655 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,15 +1,14 @@ include themes/Catppuccin_Mocha.conf -font_family MesloLGS NF -bold_font auto -italic_font auto -bold_italic_font auto +font_family "MesloLG Nerd Font Mono" font_size 14.0 cursor_shape beam -background_opacity 0.95 +background_opacity 0.95 +background_blur 8 + enable_audio_bell no # draw_minimal_borders no diff --git a/nvim/init.lua b/nvim/init.lua index 8b5226d..31c21d3 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -26,29 +26,30 @@ I hope you enjoy your Neovim journey, vim.g.mapleader = " " vim.g.maplocalleader = " " + -- netrw settings vim.g.netrw_banner = 0 vim.g.netrw_browse_split = 0 vim.g.netrw_winsize = 25 vim.g.have_nerd_font = true -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" if not (vim.uv or 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, - }) + vim.fn.system { + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + } end vim.opt.rtp:prepend(lazypath) require("lazy").setup({ import = "lilJ/plugins" }, { - change_detection = { - notify = false - } + change_detection = { + notify = false, + }, }) -- The line beneath this is called `modeline`. See `:help modeline` diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 6c8d78f..97bdba1 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,42 +1,43 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, - "SchemaStore.nvim": { "branch": "main", "commit": "8706b99e1253f54f640fbc4f4ae13cdf034c135a" }, + "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, + "SchemaStore.nvim": { "branch": "main", "commit": "de73a884679a2461c53f96035894ef073a5a7f4f" }, "catpuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "59d0dd233a2cafacfa1235ab22054c4d80a72319" }, - "fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" }, - "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, + "conform.nvim": { "branch": "master", "commit": "00f9d91391b04b1935e2f15948bd96cc111e7d3a" }, + "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, + "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" }, + "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, + "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, - "mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" }, - "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" }, - "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, "nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" }, - "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, - "nvim-lint": { "branch": "master", "commit": "f3bcc28ffccb768212247294acccc106e029fc3c" }, - "nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" }, + "nvim-dap-ui": { "branch": "master", "commit": "71bfe9bd6b3465e169b53bea4f83775034d822dd" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" }, + "nvim-lint": { "branch": "master", "commit": "1f98d6c863f91706369d74aeb2eb3f02b2e96861" }, + "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" }, - "nvim-treesitter": { "branch": "master", "commit": "cd626dc48e42b2677d501a740622cf4aed43863f" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" }, + "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "d829aa64059001ee7b2c8c8aa9c4e6df0b17d893" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, "vim-dadbod": { "branch": "master", "commit": "37523ffe0849b51db07fa7f48430c2aca5420a0e" }, - "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, - "vim-dadbod-ui": { "branch": "master", "commit": "b1675d1f56c12b0abac2ef74b94670fe27adcf93" } + "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" }, + "vim-dadbod-ui": { "branch": "master", "commit": "49dabb8717a43d757faaa0ceaadc8ee060709422" } } \ No newline at end of file diff --git a/nvim/lua/lilJ/completions.lua b/nvim/lua/lilJ/completions.lua index 81666a1..7429179 100644 --- a/nvim/lua/lilJ/completions.lua +++ b/nvim/lua/lilJ/completions.lua @@ -4,17 +4,36 @@ luasnip.config.setup { updateevents = "TextChanged,TextChangedI", } +require("luasnip.loaders.from_vscode").lazy_load() + local lspkind = require "lspkind" lspkind.init {} local cmp = require "cmp" cmp.setup { + window = { + documentation = { + border = "rounded", + }, + completion = { + border = "rounded", + }, + }, sources = { { name = "nvim_lsp" }, { name = "path" }, { name = "buffer" }, }, - completion = { completeopt = "menu, menuone, noinsert, noselect" }, + completion = { + completeopt = "menu, menuone, noinsert, noselect", + }, + formatting = { + fields = { "kind", "abbr", "menu" }, + expandable_indicator = true, + format = lspkind.cmp_format { + mode = "symbol", + }, + }, -- No, but seriously. Please read `:help ins-completion`, it is really good! mapping = cmp.mapping.preset.insert { diff --git a/nvim/lua/lilJ/plugins/conform.lua b/nvim/lua/lilJ/plugins/conform.lua index a43d7f3..dbee734 100644 --- a/nvim/lua/lilJ/plugins/conform.lua +++ b/nvim/lua/lilJ/plugins/conform.lua @@ -1,18 +1,22 @@ return { - "stevearc/conform.nvim", - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - local disable_filetypes = {} - return { - timeout_ms = 500, - lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], - } - end, - formatters_by_ft = { - c = { "clang-format" }, - go = { "gofumpt", "goimports_reviser" }, - lua = { "stylua" }, - }, - }, + "stevearc/conform.nvim", + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + local disable_filetypes = {} + return { + timeout_ms = 500, + lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], + } + end, + formatters_by_ft = { + c = { "clang-format" }, + css = { "prettier" }, + go = { "gofumpt", "goimports_reviser" }, + html = { "prettier" }, + lua = { "stylua" }, + typescript = { "prettier" }, + typescriptreact = { "prettier" }, + }, + }, } diff --git a/nvim/lua/lilJ/plugins/debug.lua b/nvim/lua/lilJ/plugins/debug.lua index eebbd69..873000f 100644 --- a/nvim/lua/lilJ/plugins/debug.lua +++ b/nvim/lua/lilJ/plugins/debug.lua @@ -11,6 +11,7 @@ return { dependencies = { "rcarriga/nvim-dap-ui", "nvim-neotest/nvim-nio", + "theHamsta/nvim-dap-virtual-text", "williamboman/mason.nvim", "jay-babu/mason-nvim-dap.nvim", @@ -19,7 +20,27 @@ return { }, config = function() local dap = require "dap" - local dapui = require "dapui" + local ui = require "dapui" + + require("dapui").setup() + require("dap-go").setup() + + require("nvim-dap-virtual-text").setup { + -- This just tries to mitigate the chance that I leak tokens here. Probably won't stop it from happening... + display_callback = function(variable) + local name = string.lower(variable.name) + local value = string.lower(variable.value) + if name:match "secret" or name:match "api" or value:match "secret" or value:match "api" then + return "*****" + end + + if #variable.value > 15 then + return " " .. string.sub(variable.value, 1, 15) .. "... " + end + + return " " .. variable.value + end, + } require("mason-nvim-dap").setup { automatic_setup = true, @@ -33,105 +54,25 @@ return { } -- Basic debugging keymaps, feel free to change to your liking! - vim.keymap.set("n", "", dap.continue, { desc = "Debug: Start/Continue" }) - vim.keymap.set("n", "", dap.step_into, { desc = "Debug: Step Into" }) - vim.keymap.set("n", "", dap.step_over, { desc = "Debug: Step Over" }) - vim.keymap.set("n", "", dap.step_out, { desc = "Debug: Step Out" }) - vim.keymap.set("n", "b", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" }) - vim.keymap.set("n", "B", function() - dap.set_breakpoint(vim.fn.input "Breakpoint condition: ") - end, { desc = "Debug: Set Breakpoint" }) + vim.keymap.set("n", "dc", dap.continue, { desc = "Debug: Start/Continue" }) + vim.keymap.set("n", "", dap.step_into, { desc = "Debug: Step Into" }) + vim.keymap.set("n", "", dap.step_over, { desc = "Debug: Step Over" }) + vim.keymap.set("n", "", dap.step_out, { desc = "Debug: Step Out" }) - -- Dap UI setup - -- For more information, see |:help nvim-dap-ui| - dapui.setup { - controls = { - element = "repl", - enabled = true, - icons = { - pause = "⏸", - play = "▶", - step_into = "⏎", - step_over = "⏭", - step_out = "⏮", - step_back = "b", - run_last = "▶▶", - terminate = "⏹", - disconnect = "⏏", - }, - }, - element_mappings = {}, - expand_lines = true, - floating = { - border = "single", - mappings = { - close = { "q", "" }, - }, - }, - icons = { - expanded = "▾", - collapsed = "▸", - current_frame = "*", - }, - force_buffers = true, - layouts = { - { - elements = { - { - id = "scopes", - size = 0.25, - }, - { - id = "breakpoints", - size = 0.25, - }, - { - id = "stacks", - size = 0.25, - }, - { - id = "watches", - size = 0.25, - }, - }, - position = "left", - size = 40, - }, - { - elements = { - { - id = "repl", - size = 0.5, - }, - { - id = "console", - size = 0.5, - }, - }, - position = "bottom", - size = 10, - }, - }, - mappings = { - edit = "e", - expand = { "", "<2-LeftMouse>" }, - open = "o", - remove = "d", - repl = "r", - toggle = "t", - }, - render = { - indent = 1, - max_value_lines = 100, - }, - } + vim.keymap.set("n", "dt", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" }) - -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. - vim.keymap.set("n", "", dapui.toggle, { desc = "Debug: See last session result." }) - - dap.listeners.after.event_initialized["dapui_config"] = dapui.open - dap.listeners.before.event_terminated["dapui_config"] = dapui.close - dap.listeners.before.event_exited["dapui_config"] = dapui.close + dap.listeners.before.attach.dapui_config = function() + ui.open() + end + dap.listeners.before.launch.dapui_config = function() + ui.open() + end + dap.listeners.before.event_terminated.dapui_config = function() + ui.close() + end + dap.listeners.before.event_exited.dapui_config = function() + ui.close() + end require("dap-go").setup() end, diff --git a/nvim/lua/lilJ/plugins/gitsigns.lua b/nvim/lua/lilJ/plugins/gitsigns.lua index d10bb8d..fa43fe6 100644 --- a/nvim/lua/lilJ/plugins/gitsigns.lua +++ b/nvim/lua/lilJ/plugins/gitsigns.lua @@ -1,5 +1,6 @@ return { "lewis6991/gitsigns.nvim", + event = { "BufReadPre", "BufNewFile" }, opts = { signs = { add = { text = "+" }, @@ -7,6 +8,7 @@ return { delete = { text = "_" }, topdelete = { text = "‾" }, changedelete = { text = "~" }, + untracked = { text = "┆" }, }, }, } diff --git a/nvim/lua/lilJ/plugins/lsp.lua b/nvim/lua/lilJ/plugins/lsp.lua index f0647bc..ea412c1 100644 --- a/nvim/lua/lilJ/plugins/lsp.lua +++ b/nvim/lua/lilJ/plugins/lsp.lua @@ -76,6 +76,12 @@ return { }, } + local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " } + for type, icon in pairs(signs) do + local hl = "DiagnosticSign" .. type + vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) + end + vim.api.nvim_create_autocmd("LspAttach", { group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }), callback = function(event) diff --git a/nvim/lua/lilJ/plugins/treesitter.lua b/nvim/lua/lilJ/plugins/treesitter.lua index f84f3ef..c03ec0f 100644 --- a/nvim/lua/lilJ/plugins/treesitter.lua +++ b/nvim/lua/lilJ/plugins/treesitter.lua @@ -5,7 +5,7 @@ return { "nvim-treesitter/nvim-treesitter-textobjects", }, opts = { - ensure_installed = { "c", "go", "html", "javascript", "lua", "python" }, + ensure_installed = { "c", "go", "html", "lua", "python", "typescript", "tsx" }, auto_install = true, highlight = { enable = true, diff --git a/readme.md b/readme.md index 8ba50f6..6166332 100644 --- a/readme.md +++ b/readme.md @@ -3,18 +3,18 @@ ## brew installs ```bash -brew install --cask aerial alacritty cloudflare-warp discord duckduckgo firefox google-chrome httpie keka kitty linearmouse microsoft-edge obsidian raycast spotify stats telegram +brew install --cask aerial alacritty cloudflare-warp discord duckduckgo firefox font-anonymous-pro font-hack-nerd-font font-meslo-lg-nerd-font google-chrome httpie keka kitty linearmouse microsoft-edge obsidian raycast spotify stats telegram ``` ```bash -brew install docker git go macchina neovim python3 ripgrep starship tmux zsh-syntax-highlighting +brew install awscli docker fastfetch git go neovim node python3 ripgrep starship tmux zsh-syntax-highlighting ``` ## sed nah brew installs -- [Zed](https://zed.dev/) - Spark - [amie](amie.so) +- [Zed](https://zed.dev/) - steam - premiere pro (always a nightmare) diff --git a/zsh/.zshrc b/zsh/.zshrc index 01e11c2..66793a6 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -13,7 +13,7 @@ alias gs='git status' alias python='python3' -# alias ls='colorls' +alias ls='ls --color' alias nv='nvim' # ---- Air GO hot reload ---- @@ -23,8 +23,7 @@ alias air="~/go/bin/air" eval "$(/opt/homebrew/bin/brew shellenv)" # cool to use tools (if ever wanted to) -alias neofetch="macchina" -# neofetch +alias neofetch="fastfetch" # ---- bun ---- export BUN_INSTALL="$HOME/.bun"