diff options
| author | adalessa <dalessandro.ariel@gmail.com> | 2023-01-25 19:52:11 +0100 |
|---|---|---|
| committer | adalessa <dalessandro.ariel@gmail.com> | 2023-01-25 19:52:45 +0100 |
| commit | 2e87884a0df6f966d1e2422395e5662bf14d5a81 (patch) | |
| tree | 89af60a5eb8e1d2847673d03d5be170132630bd4 | |
| parent | a0a9467e57be4754bc9152d225e91a52778f9205 (diff) | |
| download | nvim-conf-2e87884a0df6f966d1e2422395e5662bf14d5a81.tar.gz nvim-conf-2e87884a0df6f966d1e2422395e5662bf14d5a81.zip | |
feat: add nix & server, add parts for home manager
| -rw-r--r-- | lazy-lock.json | 16 | ||||
| -rw-r--r-- | lua/alpha/lsp/servers.lua | 1 | ||||
| -rw-r--r-- | lua/alpha/utils.lua | 10 | ||||
| -rw-r--r-- | lua/config/utils.lua | 7 | ||||
| -rw-r--r-- | lua/plugins/laravel.lua | 2 |
5 files changed, 20 insertions, 16 deletions
diff --git a/lazy-lock.json b/lazy-lock.json index 7d5fe1c..9ad5c18 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -15,7 +15,7 @@ "fidget.nvim": { "branch": "main", "commit": "44585a0c0085765195e6961c15529ba6c5a2a13b" }, "fzf.vim": { "branch": "master", "commit": "bdf48c282ad2174c25c059b3cdb7956427b07a99" }, "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" }, - "gitsigns.nvim": { "branch": "main", "commit": "7b37bd5c2dd4d7abc86f2af096af79120608eeca" }, + "gitsigns.nvim": { "branch": "main", "commit": "c52162b7b34a21bdc476425a4ab562c2f7bf1bb1" }, "harpoon": { "branch": "master", "commit": "8c0bb0a328e57278f4783bb0e2ea32f296d36db1" }, "hydra.nvim": { "branch": "master", "commit": "d00274f05363c13f29ed1fa571026a066a634cce" }, "icon-picker.nvim": { "branch": "master", "commit": "66d37ceae84099ca76235de44466829eb37118c2" }, @@ -23,9 +23,9 @@ "lazy.nvim": { "branch": "main", "commit": "809d67fcf0f6dd5dabdd1c2b88d451cef4695880" }, "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "faeeb5e02eba0aecdf273a50baa164300af33e77" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c29f9a9f9b01528ca6a44cd14814f5af20778f7a" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "27f61f75a71bb3c2504a17e02b571f79cae43676" }, - "mason.nvim": { "branch": "main", "commit": "22c8a1e67adb51179b26f0e37e87af24baf3fb89" }, + "mason.nvim": { "branch": "main", "commit": "52a469a57d4795eacd71f55bc735c6e68075c7e5" }, "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" }, "neogen": { "branch": "main", "commit": "465af9d6c6fb7f360175991dcc23fc10917e3a06" }, "neogit": { "branch": "master", "commit": "de227f740bb29f90d62f9a6112f926de5f052358" }, @@ -37,16 +37,16 @@ "nvim-dap-ui": { "branch": "master", "commit": "b80227ea56a48177786904f6322abc8b2dc0bc36" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "191345947a92a5188d791e9786a5b4f205dcaca3" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "e7c05495934a658c8aa10afd995dacd796f76091" }, - "nvim-lspconfig": { "branch": "master", "commit": "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17" }, + "nvim-lspconfig": { "branch": "master", "commit": "582842c158968a59ed5acf9439bc6eaf637f1839" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" }, "nvim-transparent": { "branch": "main", "commit": "6816751e3d595b3209aa475a83b6fbaa3a5ccc98" }, - "nvim-treesitter": { "branch": "master", "commit": "6fcb2e6a9a22aa111ff34a485ecc944d08a9cbcc" }, + "nvim-treesitter": { "branch": "master", "commit": "f3b8f00143669b7dd8d22f6bedbe98a0ff1a8317" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "2fb97bd6c53d78517d2022a0b84422c18ce5686e" }, - "nvim-web-devicons": { "branch": "master", "commit": "13d06d74afad093d8312fe051633b55f24049c16" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "df2b2b05705a1cf476a1124e7aadfccddba73ec3" }, + "nvim-web-devicons": { "branch": "master", "commit": "3548363849878ef895ce54edda02421279b419d8" }, "php-code-actions.nvim": { "branch": "main", "commit": "a85a695c58f9c5e8033d824ffae366e9797e0b28" }, - "playground": { "branch": "master", "commit": "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6" }, + "playground": { "branch": "master", "commit": "c19bcfd6a3681bc876e1b861f6685bfc04972d0d" }, "plenary.nvim": { "branch": "master", "commit": "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" }, diff --git a/lua/alpha/lsp/servers.lua b/lua/alpha/lsp/servers.lua index de05e0b..b3f70a0 100644 --- a/lua/alpha/lsp/servers.lua +++ b/lua/alpha/lsp/servers.lua @@ -5,6 +5,7 @@ return { "jsonls", "marksman", "phpactor", + "nil_ls", "rust_analyzer", "sumneko_lua", "tsserver", diff --git a/lua/alpha/utils.lua b/lua/alpha/utils.lua index a9c8549..47fd8c6 100644 --- a/lua/alpha/utils.lua +++ b/lua/alpha/utils.lua @@ -1,6 +1,6 @@ -local utils = {} +local M = {} -utils.save_and_exec = function() +M.save_and_exec = function() local source_commands = { lua = "luafi %", vim = "source %", @@ -21,8 +21,4 @@ utils.save_and_exec = function() vim.notify(string.format("File %s Sourced", current_file_name), vim.log.levels.INFO, { title = "Alpha Developer" }) end -utils.use_local = function (plugin_name) - return vim.fn.isdirectory(vim.fn.expand("~/code/plugins/").. plugin_name) == 1 -end - -return utils +return M diff --git a/lua/config/utils.lua b/lua/config/utils.lua new file mode 100644 index 0000000..ebb3eeb --- /dev/null +++ b/lua/config/utils.lua @@ -0,0 +1,7 @@ +local M = {} + +M.use_local = function (name) + return vim.fn.isdirectory(vim.fn.expand("~/code/plugins/").. name) == 1 +end + +return M diff --git a/lua/plugins/laravel.lua b/lua/plugins/laravel.lua index 2fb1958..d3de5d8 100644 --- a/lua/plugins/laravel.lua +++ b/lua/plugins/laravel.lua @@ -8,7 +8,7 @@ return { keys = { {"<leader>pa", ":Artisan<cr>"}, }, - dev = require('alpha.utils').use_local("laravel.nvim"), + dev = require('config.utils').use_local("laravel.nvim"), config = function() require("laravel").setup() require("telescope").load_extension("laravel") |