Fix issue with clangd and LSP offset error

erichlf · Apr 30, 2024 · 62ebe8d · 62ebe8d
1 parent 6d00263
commit 62ebe8d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/config/lvim/lua/user/options.lua b/config/lvim/lua/user/options.lua
@@ -74,10 +74,14 @@ table.insert(lvim.builtin.alpha.dashboard.section.buttons.entries,
 -- LSP
 require("lvim.lsp.null-ls.formatters").setup {
   { name = "black" },
-  { name = "clang-format" },
+  { name = "clang-format",
+    filetype = { "c", "cpp", "cs", "java" },
+    extra_args = { "--style", "file:~/.clang-format" }
+  },
   { name = "isort" },
   { name = "yamlfmt" },
 }
+
 require("lvim.lsp.null-ls.linters").setup {
   { name = "cmakelint" },
   { name = "cpplint" },
@@ -87,3 +91,7 @@ require("lvim.lsp.null-ls.linters").setup {
   { name = "pylint" },
   { name = "yamllint" },
 }
+
+lvim.lsp.null_ls.setup.on_init = function(new_client, _)
+  new_client.offset_encoding = "utf-8"
+end
diff --git a/config/lvim/lua/user/plugins.lua b/config/lvim/lua/user/plugins.lua
@@ -21,6 +21,8 @@ lvim.plugins = {
   {
     "erichlf/devcontainer-cli.nvim",
     branch = "main",
+    branch = "specify-window-location",
+    dependencies = { 'akinsho/toggleterm.nvim' },
     opts = {
       interactive = false,
       dotfiles_repository = "https://github.com/erichlf/dotfiles.git",
@@ -38,24 +40,29 @@ lvim.plugins = {
       },
       {
         "<leader>De",
-        "<CMD>DevcontainerExec<CR>",
+        "<CMD>DevcontainerExec direction='horizontal'<CR>",
         desc = "Execute a command in the DevContainer",
       },
       {
         "<leader>Db",
-        "<CMD>DevcontainerExec colcon build --symlink-install --merge-install<CR>",
+        "<CMD>DevcontainerExec cmd='colcon build --symlink-install --merge-install' direction='horizontal'<CR>",
         desc = "ROS2 build in the DevContainer",
       },
       {
         "<leader>Dt",
-        "<CMD>DevcontainerExec source install/setup.zsh && colcon test --merge-install<CR>",
+        "<CMD>DevcontainerExec cmd='source install/setup.zsh && colcon test --merge-install' direction='horizontal'<CR>",
         desc = "ROS2 test in the DevContainer",
       },
       {
         "<leader>Dc",
         "<CMD>DevcontainerConnect<CR>",
         desc = "Connect to DevContainer",
       },
+      {
+        "<leader>DT",
+        "<CMD>DevcontainerToggle<CR>",
+        desc = "Toggle the current DevContainer Terminal"
+      },
     }
   },
 

diff --git a/my-home/dot-exports b/my-home/dot-exports
@@ -28,4 +28,6 @@ if [ -d $HOME/bin ] ; then
 fi
 
 export PATH="$PATH:$HOME/.local/bin"
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"
 export ROS_DOMAIN_ID="3"
diff --git a/my-home/dot-zshrc b/my-home/dot-zshrc
@@ -78,5 +78,4 @@ setopt nonomatch
 
 eval "$(starship init zsh)"
 
-# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
-export PATH="$PATH:$HOME/.rvm/bin"
+set -o vi