From 2024cb2e1e4c8e01823adbc1bc9a208c2e2fef2f Mon Sep 17 00:00:00 2001 From: Markus Dieckmann Date: Thu, 22 Dec 2022 19:22:41 +0100 Subject: [PATCH] many changes from work laptop --- nvim/init.lua | 1 + nvim/lua/luasnip_config.lua | 1 + nvim/lua/native_commands.lua | 7 ++++++- nvim/lua/new_lsp_conf.lua | 1 + nvim/lua/plugins.lua | 5 +++++ nvim/lua/telescope_config.lua | 13 +++++++++++++ nvim/lua/toggleterm_config.lua | 5 ++--- 7 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 nvim/lua/luasnip_config.lua diff --git a/nvim/init.lua b/nvim/init.lua index 3d232be..63b2570 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -18,3 +18,4 @@ require("nvimtest_config") require("neotest_config") require("trouble_config") require("symbols_outline") +require("luasnip_config") diff --git a/nvim/lua/luasnip_config.lua b/nvim/lua/luasnip_config.lua new file mode 100644 index 0000000..80309d7 --- /dev/null +++ b/nvim/lua/luasnip_config.lua @@ -0,0 +1 @@ +require("luasnip.loaders.from_vscode").lazy_load() diff --git a/nvim/lua/native_commands.lua b/nvim/lua/native_commands.lua index f705c5d..7d5630a 100644 --- a/nvim/lua/native_commands.lua +++ b/nvim/lua/native_commands.lua @@ -1,6 +1,11 @@ vim.cmd('hi CursorLine term=bold cterm=bold ctermbg=darkgrey') -vim.cmd[[colorscheme tokyonight]] +--vim.cmd[[colorscheme tokyonight]] +vim.cmd[[set termguicolors]] +--vim.cmd[[let ayucolor = "light"]] +--vim.cmd[[colorscheme ayu]] +vim.cmd[[set background=light]] +vim.cmd[[colorscheme gruvbox]] vim.cmd([[ runtime macros/sandwich/keymap/surround.vim ]]) diff --git a/nvim/lua/new_lsp_conf.lua b/nvim/lua/new_lsp_conf.lua index 29e04e1..9405dc9 100644 --- a/nvim/lua/new_lsp_conf.lua +++ b/nvim/lua/new_lsp_conf.lua @@ -104,3 +104,4 @@ require('mason-lspconfig').setup_handlers { -- ["rust-analyzer"] = {} -- } --} +require"fidget".setup{} diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 4b3d6a5..9f8d0ac 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -44,9 +44,11 @@ require("packer").startup(function(use) use("hrsh7th/cmp-cmdline") use("saadparwaiz1/cmp_luasnip") use("L3MON4D3/LuaSnip") + use("rafamadriz/friendly-snippets") use("kyazdani42/nvim-web-devicons") use("kyazdani42/nvim-tree.lua") use("tpope/vim-fugitive") + use("shumphrey/fugitive-gitlab.vim") use({ "nvim-treesitter/nvim-treesitter", run = function() @@ -54,6 +56,8 @@ require("packer").startup(function(use) end, }) use("folke/tokyonight.nvim") + use("ayu-theme/ayu-vim") + use("morhetz/gruvbox") use("simrat39/rust-tools.nvim") use({ "akinsho/toggleterm.nvim", @@ -105,4 +109,5 @@ require("packer").startup(function(use) run = ':call doge#install()' } use 'simrat39/symbols-outline.nvim' + use 'j-hui/fidget.nvim' end) diff --git a/nvim/lua/telescope_config.lua b/nvim/lua/telescope_config.lua index ed8d51b..54637cd 100644 --- a/nvim/lua/telescope_config.lua +++ b/nvim/lua/telescope_config.lua @@ -1,5 +1,18 @@ require('telescope').load_extension('lsp_handlers') require('telescope').setup({ + defaults={ + path_display={"smart"}, + }, + pickers={ + find_files={ + theme="dropdown", + layout_config={ + horizontal= {width=0.5} + } + + + } + }, extensions = { lsp_handlers = { code_action = { diff --git a/nvim/lua/toggleterm_config.lua b/nvim/lua/toggleterm_config.lua index 56000a5..2928427 100644 --- a/nvim/lua/toggleterm_config.lua +++ b/nvim/lua/toggleterm_config.lua @@ -1,4 +1,5 @@ -require"toggleterm".setup{ +vim.api.nvim_set_keymap('t', "", [[]], {}) +require "toggleterm".setup { open_mapping = [[]], hide_numbers = true, --direction = 'float', @@ -9,5 +10,3 @@ require"toggleterm".setup{ enabled = false } } - -