From 0f5e21404dc909e2cf1291e94bb4e4520f79cda0 Mon Sep 17 00:00:00 2001 From: doman Date: Tue, 29 Aug 2023 23:17:39 +0200 Subject: [PATCH] tmux and nvim --- .config/nvim/lazy-lock.json | 39 ++++++++++ .config/nvim/lua/plugins/flutter.lua | 11 +++ .config/nvim/lua/plugins/lsp.lua | 105 +++++++++++++++------------ .config/tmux/tmux.conf | 4 +- 4 files changed, 111 insertions(+), 48 deletions(-) create mode 100644 .config/nvim/lazy-lock.json create mode 100644 .config/nvim/lua/plugins/flutter.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..c2f51dd --- /dev/null +++ b/.config/nvim/lazy-lock.json @@ -0,0 +1,39 @@ +{ + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, + "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, + "bufferline.nvim": { "branch": "main", "commit": "9961d87bb3ec008213c46ba14b3f384a5f520eb5" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" }, + "dressing.nvim": { "branch": "master", "commit": "c7b035de7f91bb6b62b4308f105c56d1a968b8c5" }, + "flutter-tools.nvim": { "branch": "main", "commit": "561d85b16d8ca2938820a9c26b2fe74096d89c81" }, + "gitsigns.nvim": { "branch": "main", "commit": "d8590288417fef2430f85bc8b312fae8b1cf2c40" }, + "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, + "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, + "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "f084f4a6a716f55bf9c4026e73027bb24a0325a3" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, + "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" }, + "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, + "neo-tree.nvim": { "branch": "main", "commit": "2c992760f154285dff9f798647954b363cf35963" }, + "noice.nvim": { "branch": "main", "commit": "c8a9b712ac7e7d07b9e90444299858c4a520a74c" }, + "nui.nvim": { "branch": "main", "commit": "aa1b4c1e05983ff7debd2b4b2788651db099de2f" }, + "nvim-base16": { "branch": "master", "commit": "6247ca9aa9f34644dfa290a6df3f6feefb73eb97" }, + "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, + "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" }, + "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, + "nvim-treesitter": { "branch": "master", "commit": "6def3eea22c213a475fc42644cd48c924b67a03f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "e3e2b6de4ccf781fb653a3a1d397aeb4a0095609" }, + "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, + "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, + "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, + "telescope.nvim": { "branch": "master", "commit": "32e6792f865221dfaf2a3751fd3cfeac96557433" }, + "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, + "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, + "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, + "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, + "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, + "window-picker": { "branch": "main", "commit": "fd5d3348b3e254ca3134f97793b4a8c702c4ad1d" } +} \ No newline at end of file diff --git a/.config/nvim/lua/plugins/flutter.lua b/.config/nvim/lua/plugins/flutter.lua new file mode 100644 index 0000000..04daaca --- /dev/null +++ b/.config/nvim/lua/plugins/flutter.lua @@ -0,0 +1,11 @@ +return { + { + 'akinsho/flutter-tools.nvim', + lazy = false, + dependencies = { + 'nvim-lua/plenary.nvim', + 'stevearc/dressing.nvim', -- optional for vim.ui.select + }, + config = true, + } +} diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 9277b5e..697d30b 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -1,54 +1,67 @@ return { - { - "VonHeikemen/lsp-zero.nvim", - branch = "v2.x", - lazy = true, - config = function() - require("lsp-zero.settings").preset({}) - end, - }, - { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - dependencies = { - { "L3MON4D3/LuaSnip" }, - }, - config = function() - require("lsp-zero.cmp").extend() - local cmp = require("cmp") - local cmp_action = require("lsp-zero.cmp").action() + { + "VonHeikemen/lsp-zero.nvim", + branch = "v2.x", + lazy = true, + config = function() + require("lsp-zero.settings").preset({}) + end, + }, + { + "hrsh7th/nvim-cmp", + event = "InsertEnter", + dependencies = { + { "L3MON4D3/LuaSnip" }, + }, + config = function() + require("lsp-zero.cmp").extend() + local cmp = require("cmp") + local cmp_action = require("lsp-zero.cmp").action() - cmp.setup({ - mapping = { - [""] = cmp.mapping.complete(), - [""] = cmp_action.luasnip_jump_forward(), - [""] = cmp_action.luasnip_jump_backward(), + cmp.setup({ + mapping = { + [""] = cmp.mapping.complete(), + [""] = cmp_action.luasnip_jump_forward(), + [""] = cmp_action.luasnip_jump_backward(), [''] = cmp.mapping.confirm({ select = true }), - }, - }) - end, - }, + }, + }) + end, + }, - -- LSP - { - "neovim/nvim-lspconfig", - cmd = "LspInfo", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - { "hrsh7th/cmp-nvim-lsp" }, - { "williamboman/mason-lspconfig.nvim" }, - { "williamboman/mason.nvim" }, - }, - config = function() - local lsp = require("lsp-zero") + -- LSP + { + "neovim/nvim-lspconfig", + cmd = "LspInfo", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + { "hrsh7th/cmp-nvim-lsp" }, + { "williamboman/mason-lspconfig.nvim" }, + { "williamboman/mason.nvim" }, + }, + config = function() + local lsp = require("lsp-zero") - lsp.on_attach(function(client, bufnr) - lsp.default_keymaps({ buffer = bufnr }) - end) + lsp.ensure_installed( + { + "pylsp", + "ruff_lsp", + "gopls", + } + ) - require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls()) + lsp.on_attach(function(client, bufnr) + lsp.default_keymaps({ buffer = bufnr }) + end) - lsp.setup() - end, - }, + nvim_lsp = require("lspconfig") + nvim_lsp.lua_ls.setup(lsp.nvim_lua_ls()) + nvim_lsp.ruff_lsp.setup({}) + nvim_lsp.gopls.setup({}) + nvim_lsp.dartls.setup({}) + nvim_lsp.pylsp.setup({}) + + lsp.setup() + end, + }, } diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 7631cce..e24261b 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -2,8 +2,8 @@ set-option -sa terminal-overrides ",xterm*:Tc" set -g mouse on unbind C-b -set -g prefix C-i -bind C-i send-prefix +set -g prefix C-o +bind C-o send-prefix # export session name set -g status-interval 0