diff --git a/hm-imports/nvim/config/coc-settings.json b/hm-imports/nvim/config/coc-settings.json index c7c6083f..b0c1ee45 100644 --- a/hm-imports/nvim/config/coc-settings.json +++ b/hm-imports/nvim/config/coc-settings.json @@ -5,7 +5,6 @@ "python.linting.enabled": true, "html.format.enable": true, "html.suggest.html5": true, - "html.suggest.ionic": true, "html.validate.html": true, "html.validate.styles": true, "diagnostic-languageserver.mergeConfig": true, @@ -37,6 +36,13 @@ "nix" ] }, + "csharp-ls": { + "command": "csharp-ls", + "filetypes": [ + "cs", + "razor" + ] + }, "terraform": { "command": "terraform-ls", "args": ["serve"], diff --git a/hm-imports/nvim/config/lua/keybindings.lua b/hm-imports/nvim/config/lua/keybindings.lua index ec32b24c..e2029a78 100644 --- a/hm-imports/nvim/config/lua/keybindings.lua +++ b/hm-imports/nvim/config/lua/keybindings.lua @@ -17,14 +17,18 @@ map { 'n', '', 'l', noremap = true, silent = true} -- buffer binds map { 'n', 'q', ':bd', noremap = false, silent = true} -map { 'n', 'b', ':Buffers', noremap = false, silent = true} +-- telescope +map { 'n', 'fb', 'Telescope buffers', noremap = false, silent = true} +map { 'n', 'ff', 'Telescope find_files', noremap = false, silent = true} +map { 'n', 'fs', 'Telescope live_grep', noremap = false, silent = true} +map { 'n', 'fr', 'Telescope registers', noremap = false, silent = true} +map { 'n', 'pp', 'lua require\'telescope\'.extensions.projects.projects{}', noremap = false, silent = true} -- tab binds map { 'n', '', ':tabnew', noremap = false, silent = true} -- copy paste map { 'v', '', '"+y', noremap = true, silent = true} map { 'n', '', '"+P', noremap = false, silent = true} -map { 'n', '', ':registers', noremap = true, silent = true} -- sudo :w map { 'c', 'w!!', 'w !sudo tee > /dev/null %', noremap = false, silent = false} diff --git a/hm-imports/nvim/config/lua/plugin/project.lua b/hm-imports/nvim/config/lua/plugin/project.lua new file mode 100644 index 00000000..7d14dd92 --- /dev/null +++ b/hm-imports/nvim/config/lua/plugin/project.lua @@ -0,0 +1,3 @@ +require('project_nvim').setup { + detection_methods = { "pattern" }, +} diff --git a/hm-imports/nvim/config/lua/plugin/telescope.lua b/hm-imports/nvim/config/lua/plugin/telescope.lua new file mode 100644 index 00000000..236915cb --- /dev/null +++ b/hm-imports/nvim/config/lua/plugin/telescope.lua @@ -0,0 +1,2 @@ +require('telescope').setup {} +require('telescope').load_extension('projects') diff --git a/hm-imports/nvim/config/nvim.lua b/hm-imports/nvim/config/nvim.lua index ccfd9d10..f4f6bd27 100644 --- a/hm-imports/nvim/config/nvim.lua +++ b/hm-imports/nvim/config/nvim.lua @@ -10,6 +10,8 @@ local opt = vim.opt require('plugin.nnn') require('plugin.rainbow') require('plugin.terminal') +require('plugin.project') +require('plugin.telescope') -- plugins - coc diff --git a/hm-imports/nvim/default.nix b/hm-imports/nvim/default.nix index e0473c56..884d4893 100644 --- a/hm-imports/nvim/default.nix +++ b/hm-imports/nvim/default.nix @@ -62,9 +62,9 @@ incsearch-vim vim-highlightedyank vim-fugitive - fzf-vim + #fzf-vim lualine-nvim - fzfWrapper + #fzfWrapper vim-devicons toggleterm-nvim undotree @@ -73,6 +73,10 @@ ultisnips #dart-vim + plenary-nvim + telescope-nvim + project-nvim + coc-nvim #telescope-coc-nvim diff --git a/hm-imports/zsh/zshrc b/hm-imports/zsh/zshrc index 5fde09bd..2612eac4 100644 --- a/hm-imports/zsh/zshrc +++ b/hm-imports/zsh/zshrc @@ -16,6 +16,7 @@ bindkey -M viins '^[[A' history-beginning-search-backward-end \ hash go 2>/dev/null && export PATH=$PATH:$(go env GOPATH)/bin hash yarn 2>/dev/null && export PATH=$PATH:$HOME/.yarn/bin +hash dotnet 2>/dev/null && export PATH=$PATH:$HOME/.dotnet/tools hash direnv 2>/dev/null && eval "$(direnv hook zsh)" # needed for lorri export PATH=$PATH:$HOME/.local/bin export PATH=$PATH:$HOME/flutter/flutter/bin