[all] change stuff in a lot of things
This commit is contained in:
parent
a929ef7de2
commit
c17e4f87a8
SSH key fingerprint:
SHA256:PQTRDHPH3yALEGtHXnXBp3Orfcn21pK20t0tS1kHg54
14 changed files with 200 additions and 222 deletions
|
|
@ -1,4 +1,8 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
|
||||
"runtime.version": "LuaJIT"
|
||||
"runtime.version": "LuaJIT",
|
||||
"diagnostics.globals": [
|
||||
"vim",
|
||||
"numbers"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,4 +2,3 @@ require("core.variables")
|
|||
require('core.package_manager')
|
||||
require('winbar')
|
||||
require('core.theme')
|
||||
require('impatient')
|
||||
|
|
|
|||
|
|
@ -1,64 +1,56 @@
|
|||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "8f3d3465ba5c7ade0a8adb41eca5736f291a3fa8" },
|
||||
"ale": { "branch": "master", "commit": "d19b238aa2d7c426e71c5de083bd61328d5c4fd4" },
|
||||
"catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" },
|
||||
"LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" },
|
||||
"blame.nvim": { "branch": "main", "commit": "dedbcdce857f708c63f261287ac7491a893912d0" },
|
||||
"catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
|
||||
"cinnamon.nvim": { "branch": "master", "commit": "a011e84b624cd7b609ea928237505d31b987748a" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
|
||||
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||
"conform.nvim": { "branch": "master", "commit": "4660e534bf7678ee0f85879aa75fdcb6855612c2" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
|
||||
"fzf": { "branch": "master", "commit": "4a68eac99bb3814f912d236fa9356516ebda2fa5" },
|
||||
"gruvbox-material": { "branch": "master", "commit": "80331fbbec9ba18590a17bc6b7d277d96c05c2b6" },
|
||||
"conform.nvim": { "branch": "master", "commit": "5c9b6a6a50f3ec2c01f729dac872679fa6ea813f" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
|
||||
"fzf-lua": { "branch": "main", "commit": "a9e5755721c0f24cd1635ea4ff181df5b1bd5dd4" },
|
||||
"gruvbox-material": { "branch": "master", "commit": "aa8096277690db1e1807ec57812c2cf3d54bb37f" },
|
||||
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
|
||||
"impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
|
||||
"instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" },
|
||||
"jq.nvim": { "branch": "master", "commit": "b9879798f25a9318894456dc7464af0904c08958" },
|
||||
"keylab.nvim": { "branch": "main", "commit": "9686b09253b5dde40e18554d189deb1b0c47f437" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
|
||||
"ltex-extra.nvim": { "branch": "master", "commit": "4296c2c7aefbca721d02a011366a1de30598046c" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
|
||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
|
||||
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
|
||||
"nvim-bqf": { "branch": "main", "commit": "52703d7adc3be3f7c09eea9a80c5b8caa615fb25" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
|
||||
"mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
|
||||
"nvim-bqf": { "branch": "main", "commit": "7751b6ef9fbc3907478eaf23e866c4316a2ed1b4" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
||||
"nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
|
||||
"nvim-dap-go": { "branch": "main", "commit": "36abe1d320cb61bfdf094d4e0fe815ef58f2302a" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
|
||||
"nvim-ghost.nvim": { "branch": "main", "commit": "a1ca0b2dac59881066d7ac9373cf64d59ba29d6a" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" },
|
||||
"nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
|
||||
"nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" },
|
||||
"nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "eadcee1573ca9d0e0cd36a49f620186a8dfdc607" },
|
||||
"nvim-nio": { "branch": "master", "commit": "def97d9351bf423f4302b9b76fd4e9729e85086c" },
|
||||
"nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "0883ff05655117a3fc79ab295a640c4984cfd415" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "4fe0a54e86859744968e1a5c7867b49c86855774" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" },
|
||||
"oil.nvim": { "branch": "master", "commit": "f3a31eba24587bc038592103d8f7e64648292115" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "30de5e7e9486fb1b1b8c2a1e71052b13f94f1cb0" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
|
||||
"oil.nvim": { "branch": "master", "commit": "259b1fbc84734bfb74225b2c2f408dd7ed9cf474" },
|
||||
"pastify.nvim": { "branch": "main", "commit": "47317b9bb7bf5fb7dfd994a6eb9bec8f00628dc0" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
|
||||
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
|
||||
"tla.nvim": { "branch": "master", "commit": "e419c75e805ab6d9967c7325bf35734c372d3d4b" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
|
||||
"undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
|
||||
"vim-alloy": { "branch": "master", "commit": "5bd57c4890be39e221dd3e1f6735457dce454bbd" },
|
||||
"vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
|
||||
"vim-jukit": { "branch": "master", "commit": "73214c9a8abc4b6aa7a6266b5bc2ddbf8b3e3c00" },
|
||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
||||
"vim-tpipeline": { "branch": "master", "commit": "5dd3832bd6e239feccb11cadca583cdcf9d5bda1" },
|
||||
"vimtex": { "branch": "master", "commit": "6c01660a99c0cc0906b39094f4a2d086b28fa995" },
|
||||
"vimtex": { "branch": "master", "commit": "9665df7f51ee24aa81dbd81782e0a22480209753" },
|
||||
"zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
require("conform").setup({
|
||||
formatters_by_ft = {
|
||||
python = { "black" },
|
||||
haskell = { "fourmolu" },
|
||||
javascript = { "prettierd" },
|
||||
markdown = { "mdformat" },
|
||||
go = { "gofmt" },
|
||||
|
|
|
|||
|
|
@ -2,28 +2,27 @@ local lazy = require("lazy")
|
|||
|
||||
lazy.setup({
|
||||
|
||||
"lewis6991/impatient.nvim",
|
||||
|
||||
-------------------------------------------THEMES------------------------------------------
|
||||
{
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
event = "VeryLazy",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {},
|
||||
},
|
||||
|
||||
"sainnhe/gruvbox-material",
|
||||
|
||||
-------------------------------------------------------MFP---------------------------------
|
||||
{
|
||||
"susliko/tla.nvim",
|
||||
opts = {},
|
||||
"sainnhe/gruvbox-material",
|
||||
event = "VeryLazy",
|
||||
priority = 1000,
|
||||
},
|
||||
|
||||
-------------------------------------------------------QOL---------------------------------
|
||||
|
||||
{
|
||||
"jbyuki/instant.nvim",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
vim.g.instant_username = "afonso"
|
||||
end,
|
||||
|
|
@ -31,6 +30,7 @@ lazy.setup({
|
|||
|
||||
{
|
||||
"iamcco/markdown-preview.nvim",
|
||||
event = "VeryLazy",
|
||||
cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
|
||||
ft = { "markdown" },
|
||||
build = function() vim.fn["mkdp#util#install"]() end,
|
||||
|
|
@ -38,6 +38,7 @@ lazy.setup({
|
|||
|
||||
{
|
||||
"ThePrimeagen/harpoon",
|
||||
event = "VeryLazy",
|
||||
branch = "harpoon2",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
config = function()
|
||||
|
|
@ -52,8 +53,17 @@ lazy.setup({
|
|||
end
|
||||
},
|
||||
|
||||
{
|
||||
"FabijanZulj/blame.nvim",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("blame").setup()
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
"TobinPalmer/pastify.nvim",
|
||||
event = "VeryLazy",
|
||||
cmd = { "Pastify" },
|
||||
opts = {},
|
||||
},
|
||||
|
|
@ -61,6 +71,7 @@ lazy.setup({
|
|||
--Python notebooks
|
||||
{
|
||||
"luk400/vim-jukit",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("plugins.jukit")
|
||||
end,
|
||||
|
|
@ -68,7 +79,7 @@ lazy.setup({
|
|||
},
|
||||
|
||||
--Nvim to browser
|
||||
"subnut/nvim-ghost.nvim",
|
||||
--"subnut/nvim-ghost.nvim",
|
||||
|
||||
{
|
||||
"declancm/cinnamon.nvim",
|
||||
|
|
@ -126,17 +137,19 @@ lazy.setup({
|
|||
},
|
||||
|
||||
-- Rename variable pop up
|
||||
"stevearc/dressing.nvim",
|
||||
{
|
||||
"stevearc/dressing.nvim",
|
||||
event = "VeryLazy",
|
||||
},
|
||||
|
||||
{
|
||||
"windwp/nvim-autopairs",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("plugins.autopairs")
|
||||
end,
|
||||
},
|
||||
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons", opt = true },
|
||||
|
|
@ -153,6 +166,7 @@ lazy.setup({
|
|||
-------------------------------------------------------LSP----------------------------------------------
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-nvim-lsp", -- lsp
|
||||
"hrsh7th/cmp-nvim-lua", -- Nvim API completions
|
||||
|
|
@ -205,6 +219,7 @@ lazy.setup({
|
|||
},
|
||||
{
|
||||
"mfussenegger/nvim-dap",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("plugins.dap")
|
||||
end,
|
||||
|
|
@ -212,53 +227,52 @@ lazy.setup({
|
|||
|
||||
{
|
||||
'leoluz/nvim-dap-go',
|
||||
event = "VeryLazy",
|
||||
opts = {}
|
||||
},
|
||||
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
config = function()
|
||||
require("plugins.mason")
|
||||
end,
|
||||
},
|
||||
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
event = { "BufReadPost", "BufNewFile" },
|
||||
dependencies = {
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
dependencies = {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
config = function()
|
||||
require("plugins.mason")
|
||||
end,
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
require("plugins.mason-lspconfig")
|
||||
end
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
require("plugins.lspconfig")
|
||||
end,
|
||||
},
|
||||
|
||||
--Better quick fix
|
||||
{
|
||||
'kevinhwang91/nvim-bqf',
|
||||
event = "VeryLazy",
|
||||
ft = 'qf'
|
||||
},
|
||||
'junegunn/fzf',
|
||||
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("plugins.conform")
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
'dense-analysis/ale',
|
||||
config = function()
|
||||
vim.g.ale_linters_explicit = 1
|
||||
vim.g.ale_echo_msg_error_str = 'E'
|
||||
vim.g.ale_echo_msg_warning_str = 'W'
|
||||
vim.g.ale_echo_msg_format = '[%linter%] %s [%severity%]'
|
||||
--vim.g.ale_linters = {
|
||||
-- go = { 'golangci-lint' },
|
||||
--}
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
"lervag/vimtex",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("plugins.vimtex")
|
||||
end,
|
||||
|
|
@ -272,12 +286,16 @@ lazy.setup({
|
|||
-- ft = { "rust" },
|
||||
-- },
|
||||
|
||||
"barreiroleo/ltex-extra.nvim",
|
||||
{
|
||||
"barreiroleo/ltex-extra.nvim",
|
||||
event = "VeryLazy",
|
||||
},
|
||||
|
||||
-------------------------------------------------------------------------------------------
|
||||
-- Syntax Highlighting
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
event = { "BufReadPost", "BufNewFile" },
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter-textobjects'
|
||||
},
|
||||
|
|
@ -295,34 +313,33 @@ lazy.setup({
|
|||
end,
|
||||
},
|
||||
|
||||
"runoshun/vim-alloy",
|
||||
|
||||
--does so much
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
tag = "0.1.4",
|
||||
-- or , branch = '0.1.x',
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }
|
||||
},
|
||||
"ibhagwan/fzf-lua",
|
||||
event = "VeryLazy",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
config = function()
|
||||
require("plugins.telescope")
|
||||
end,
|
||||
require('plugins.fzf-lua')
|
||||
end
|
||||
},
|
||||
|
||||
--Discord Rich Presence
|
||||
"andweeb/presence.nvim",
|
||||
|
||||
--Vim be good
|
||||
'ThePrimeagen/vim-be-good',
|
||||
{
|
||||
'ThePrimeagen/vim-be-good',
|
||||
event = "VeryLazy",
|
||||
},
|
||||
|
||||
|
||||
--JQ
|
||||
'jrop/jq.nvim',
|
||||
|
||||
{
|
||||
'BooleanCube/keylab.nvim',
|
||||
opts = {}
|
||||
}
|
||||
'jrop/jq.nvim',
|
||||
event = "VeryLazy",
|
||||
},
|
||||
|
||||
-- {
|
||||
-- 'BooleanCube/keylab.nvim',
|
||||
-- opts = {}
|
||||
-- }
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
local mason_lspconfig = require("mason-lspconfig")
|
||||
local lspconfig = require("lspconfig")
|
||||
|
||||
mason_lspconfig.setup({
|
||||
automatic_installation = false,
|
||||
})
|
||||
|
||||
-- Use an on_attach function to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
|
|
@ -14,33 +9,28 @@ vim.api.nvim_create_autocmd("LspAttach", {
|
|||
vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc"
|
||||
vim.opt_local.signcolumn = numbers
|
||||
|
||||
local telescope = require("telescope.builtin")
|
||||
local fzflua = require("fzf-lua")
|
||||
local conform = require("conform")
|
||||
|
||||
local client = vim.lsp.get_client_by_id(ev.data.client_id)
|
||||
client.server_capabilities.semanticTokensProvider = nil
|
||||
|
||||
--Enable inlay hints
|
||||
--vim.lsp.inlay_hint.enable(ev.buf,true)
|
||||
|
||||
-- Mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local bufopts = { noremap = true, silent = true, buffer = ev.buf }
|
||||
vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, bufopts)
|
||||
vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, bufopts)
|
||||
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set("n", "gd", telescope.lsp_definitions, bufopts)
|
||||
vim.keymap.set("n", "gr", telescope.lsp_references, bufopts)
|
||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set("n", "gr", fzflua.lsp_references, bufopts)
|
||||
vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set("n", "gi", telescope.lsp_implementations, bufopts)
|
||||
vim.keymap.set("n", "gi", fzflua.lsp_implementations, bufopts)
|
||||
vim.keymap.set("n", "<space>k", vim.lsp.buf.signature_help, bufopts)
|
||||
vim.keymap.set("n", "<space>D", vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set("n", "<space>ge", function() vim.diagnostic.goto_next() end, bufopts)
|
||||
vim.keymap.set("n", "<space>gE", function() vim.diagnostic.goto_prev() end, bufopts)
|
||||
vim.keymap.set("n", "<space>ge", vim.diagnostic.goto_next, bufopts)
|
||||
vim.keymap.set("n", "<space>gE", vim.diagnostic.goto_prev, bufopts)
|
||||
vim.keymap.set("n", "<space>fo", function() conform.format({ lsp_fallback = true }) end, bufopts)
|
||||
vim.keymap.set("n", "<space>n", "<cmd>!toke check<cr>")
|
||||
end,
|
||||
})
|
||||
|
||||
|
|
@ -49,101 +39,7 @@ local lsp_defaults = lspconfig.util.default_config
|
|||
local capabilities =
|
||||
vim.tbl_deep_extend("force", lsp_defaults.capabilities, require("cmp_nvim_lsp").default_capabilities())
|
||||
|
||||
mason_lspconfig.setup_handlers({
|
||||
-- This is a default handler that will be called for each installed server (also for new servers that are installed during a session)
|
||||
function(server_name)
|
||||
lspconfig[server_name].setup({
|
||||
capabilities = capabilities,
|
||||
})
|
||||
end,
|
||||
["gopls"] = function()
|
||||
lspconfig["gopls"].setup({
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
gopls = {
|
||||
["ui.completion.usePlaceholders"] = true,
|
||||
["ui.diagnostic.staticcheck"] = true,
|
||||
["ui.inlayhint.hints"] = {
|
||||
assignVariablesTypes = true,
|
||||
compositeLiteralFields = true,
|
||||
compositeLiteralTypes = true,
|
||||
constantValues = true,
|
||||
functionTypeParameters = true,
|
||||
parameterNames = true,
|
||||
rangeVariableTypes = true
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
end,
|
||||
["lua_ls"] = function()
|
||||
lspconfig["lua_ls"].setup({
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
|
||||
version = "LuaJIT",
|
||||
},
|
||||
diagnostics = {
|
||||
-- Get the language server to recognize the `vim` global
|
||||
globals = { "vim" },
|
||||
},
|
||||
workspace = {
|
||||
-- Make the server aware of Neovim runtime files
|
||||
library = vim.api.nvim_get_runtime_file("", true),
|
||||
},
|
||||
hint = { enable = true }
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
["ltex"] = function()
|
||||
lspconfig["ltex"].setup({
|
||||
capabilities = capabilities,
|
||||
--Local on attach
|
||||
on_attach = function(_, _)
|
||||
-- rest of your on_attach process.
|
||||
require("ltex_extra").setup()
|
||||
end,
|
||||
settings = {
|
||||
ltex = {
|
||||
language = "en-US",
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
["basedpyright"] = function()
|
||||
lspconfig["basedpyright"].setup({
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
verboseOutput = true,
|
||||
autoImportCompletion = true,
|
||||
basedpyright = {
|
||||
analysis = {
|
||||
typeCheckingMode = "all",
|
||||
autoSearchPaths = true,
|
||||
useLibraryCodeForTypes = true,
|
||||
diagnosticMode = "openFilesOnly",
|
||||
indexing = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
||||
|
||||
lspconfig["hls"].setup({
|
||||
capabilities = capabilities,
|
||||
filetypes = { 'haskell', 'lhaskell', 'cabal' },
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
--vim.g.rustaceanvim = {
|
||||
-- server = {
|
||||
-- capabilities = capabilities,
|
||||
-- },
|
||||
--}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,13 @@
|
|||
local present, mason = pcall(require, "mason")
|
||||
|
||||
local mason = require("mason")
|
||||
vim.api.nvim_create_augroup("_mason", { clear = true })
|
||||
|
||||
local options = {
|
||||
PATH = "skip",
|
||||
|
||||
ui = {
|
||||
icons = {
|
||||
package_pending = " ",
|
||||
package_installed = " ",
|
||||
package_uninstalled = " ",
|
||||
},
|
||||
|
||||
keymaps = {
|
||||
toggle_server_expand = "<CR>",
|
||||
install_server = "i",
|
||||
|
|
@ -23,9 +19,6 @@ local options = {
|
|||
cancel_installation = "<C-c>",
|
||||
},
|
||||
},
|
||||
|
||||
max_concurrent_installers = 10,
|
||||
}
|
||||
|
||||
|
||||
mason.setup(options)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ local actions = require("telescope.actions")
|
|||
telescope.setup {
|
||||
defaults = {
|
||||
layout_strategy = "horizontal",
|
||||
path_display = { "filename_first" },
|
||||
mappings = {
|
||||
i = {
|
||||
["<esc>"] = actions.close,
|
||||
|
|
@ -32,10 +33,10 @@ telescope.setup {
|
|||
}
|
||||
telescope.load_extension('fzf')
|
||||
telescope.load_extension("ui-select")
|
||||
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
||||
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
|
||||
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
|
||||
vim.keymap.set('n', '<leader>fs', builtin.treesitter, {})
|
||||
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
|
||||
--local builtin = require('telescope.builtin')
|
||||
--vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
||||
--vim.keymap.set('n', '<leader>fe', builtin.diagnostics, {})
|
||||
--vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
|
||||
--vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
|
||||
--vim.keymap.set('n', '<leader>fs', builtin.treesitter, {})
|
||||
--vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
|
||||
|
|
|
|||
|
|
@ -60,9 +60,10 @@ function M.render()
|
|||
' ',
|
||||
prefix,
|
||||
table.concat(
|
||||
vim.iter.map(function(segment)
|
||||
vim.iter(vim.split(path, '/'))
|
||||
:map(function(segment)
|
||||
return string.format('%%#Winbar#%s', segment)
|
||||
end, vim.split(path, '/')),
|
||||
end):totable(),
|
||||
separator
|
||||
),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ cmd - return : yabai -m window --swap west
|
|||
cmd - u : yabai --load-sa && yabai --restart # Assuming you have scripting additions installed
|
||||
|
||||
# Window Management
|
||||
cmd - h : yabai -m window --resize right:-20:0
|
||||
cmd - l : yabai -m window --resize left:20:0
|
||||
#cmd - h : yabai -m window --resize right:-20:0
|
||||
#cmd - l : yabai -m window --resize left:20:0
|
||||
|
||||
|
||||
# Focus workspaces 1 through 6
|
||||
|
|
|
|||
|
|
@ -106,3 +106,38 @@ pure_prompt_colors() {
|
|||
for color in $(pure_prompt_colors); do
|
||||
zstyle ":prompt:pure:$color" color "$color"
|
||||
done
|
||||
|
||||
# FZF
|
||||
# # Scheme name: Gruvbox dark, hard
|
||||
# Scheme system: base16
|
||||
# Scheme author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
|
||||
# Template author: Tinted Theming (https://github.com/tinted-theming)
|
||||
|
||||
_gen_fzf_default_opts() {
|
||||
|
||||
local color00='#1d2021'
|
||||
local color01='#3c3836'
|
||||
local color02='#504945'
|
||||
local color03='#665c54'
|
||||
local color04='#bdae93'
|
||||
local color05='#d5c4a1'
|
||||
local color06='#ebdbb2'
|
||||
local color07='#fbf1c7'
|
||||
local color08='#fb4934'
|
||||
local color09='#fe8019'
|
||||
local color0A='#fabd2f'
|
||||
local color0B='#b8bb26'
|
||||
local color0C='#8ec07c'
|
||||
local color0D='#83a598'
|
||||
local color0E='#d3869b'
|
||||
local color0F='#d65d0e'
|
||||
|
||||
export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\
|
||||
" --color=bg+:$color01,bg:$color00,spinner:$color0C,hl:$color0D"\
|
||||
" --color=fg:$color04,header:$color0D,info:$color0A,pointer:$color0C"\
|
||||
" --color=marker:$color0C,fg+:$color06,prompt:$color0A,hl+:$color0D"
|
||||
|
||||
}
|
||||
|
||||
_gen_fzf_default_opts
|
||||
|
||||
|
|
|
|||
|
|
@ -102,3 +102,38 @@ pure_prompt_colors() {
|
|||
for color in $(pure_prompt_colors); do
|
||||
zstyle ":prompt:pure:$color" color "$color"
|
||||
done
|
||||
|
||||
|
||||
#FZF
|
||||
# Scheme name: Gruvbox light, soft
|
||||
# Scheme system: base16
|
||||
# Scheme author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
|
||||
# Template author: Tinted Theming (https://github.com/tinted-theming)
|
||||
|
||||
_gen_fzf_default_opts() {
|
||||
|
||||
local color00='#f2e5bc'
|
||||
local color01='#ebdbb2'
|
||||
local color02='#d5c4a1'
|
||||
local color03='#bdae93'
|
||||
local color04='#665c54'
|
||||
local color05='#504945'
|
||||
local color06='#3c3836'
|
||||
local color07='#282828'
|
||||
local color08='#9d0006'
|
||||
local color09='#af3a03'
|
||||
local color0A='#b57614'
|
||||
local color0B='#79740e'
|
||||
local color0C='#427b58'
|
||||
local color0D='#076678'
|
||||
local color0E='#8f3f71'
|
||||
local color0F='#d65d0e'
|
||||
|
||||
export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\
|
||||
" --color=bg+:$color01,bg:$color00,spinner:$color0C,hl:$color0D"\
|
||||
" --color=fg:$color04,header:$color0D,info:$color0A,pointer:$color0C"\
|
||||
" --color=marker:$color0C,fg+:$color06,prompt:$color0A,hl+:$color0D"
|
||||
|
||||
}
|
||||
|
||||
_gen_fzf_default_opts
|
||||
|
|
|
|||
|
|
@ -32,3 +32,5 @@
|
|||
rebase = false
|
||||
[init]
|
||||
defaultBranch = main
|
||||
[alias]
|
||||
count-lines = "! git log --author=\"$1\" --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s, removed lines: %s, total lines: %s\\n\", add, subs, loc }' #"
|
||||
|
|
|
|||
2
.zshrc
2
.zshrc
|
|
@ -9,6 +9,8 @@ export PATH="$HOME/.cargo/bin:$PATH"
|
|||
export PATH="$HOME/.ghcup/bin:$PATH"
|
||||
export PATH="$HOME/.miniforge3/bin:$PATH"
|
||||
export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
|
||||
export PATH="/opt/homebrew/opt/texlive/bin:$PATH"
|
||||
export PATH="$HOME/.cabal/bin:$PATH"
|
||||
|
||||
export GOPATH=$HOME/.go
|
||||
export PATH=$PATH:$GOPATH/bin
|
||||
|
|
|
|||
Loading…
Reference in a new issue