Merge branch 'main' of github.com:aalbaali/workstation_setup

Author: aalbaali

ansible/tasks/setup_nvim.yaml

@@ -24,10 +24,11 @@
         remote_src: true
         creates: "/opt/nvim-linux64-{{ nvim_version }}"
 
-    - name: Move from temp to opt
-      ansible.builtin.command: mv /tmp/nvim-linux64 "/opt/nvim-linux64-{{ nvim_version }}"
-      args:
-        creates: "/opt/nvim-linux64-{{ nvim_version }}"
+    - name: Copy from temp to opt
+      ansible.builtin.copy:
+        src: /tmp/nvim-linux64/
+        dest:  "/opt/nvim-linux64-{{ nvim_version }}"
+        remote_src: true
 
     - name: Symlink nvim
       ansible.builtin.file:

stow/nvim/.config/nvim/lua/user/lsp/mason.lua

@@ -4,48 +4,49 @@ local servers = {
   "cmake",
   "rust_analyzer",
   "lua_ls",
-	"jsonls",
+  "jsonls",
   "pyright",
+  "ruff",
 }
 
 local settings = {
-	ui = {
-		border = "none",
-		-- icons = {
-		-- 	package_installed = "◍",
-		-- 	package_pending = "◍",
-		-- 	package_uninstalled = "◍",
-		-- },
-	},
-	log_level = vim.log.levels.INFO,
-	max_concurrent_installers = 4,
+  ui = {
+    border = "none",
+    -- icons = {
+    -- 	package_installed = "◍",
+    -- 	package_pending = "◍",
+    -- 	package_uninstalled = "◍",
+    -- },
+  },
+  log_level = vim.log.levels.INFO,
+  max_concurrent_installers = 4,
 }
 
 require("mason").setup(settings)
 require("mason-lspconfig").setup({
-	ensure_installed = servers,
-	automatic_installation = true,
+  ensure_installed = servers,
+  automatic_installation = true,
 })
 
 local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig")
- if not lspconfig_status_ok then
-   return
- end
+if not lspconfig_status_ok then
+  return
+end
 
 local opts = {}
 
 for _, server in pairs(servers) do
-	opts = {
-		on_attach = require("user.lsp.handlers").on_attach,
-		capabilities = require("user.lsp.handlers").capabilities,
-	}
+  opts = {
+    on_attach = require("user.lsp.handlers").on_attach,
+    capabilities = require("user.lsp.handlers").capabilities,
+  }
 
-	server = vim.split(server, "@")[1]
+  server = vim.split(server, "@")[1]
 
-	local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server)
-	if require_ok then
-		opts = vim.tbl_deep_extend("force", conf_opts, opts)
-	end
+  local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server)
+  if require_ok then
+    opts = vim.tbl_deep_extend("force", conf_opts, opts)
+  end
 
 	lspconfig[server].setup(opts)
 end

stow/nvim/.config/nvim/lua/user/lsp/settings/ruff.lua

@@ -0,0 +1,19 @@
+return {
+  settings = {
+    pyright = {
+      -- Using Ruff's import organizer
+      disableOrganizeImports = false,
+    },
+    python = {
+      analysis = {
+        -- Ignore all files for analysis to exclusively use Ruff for linting
+        ignore = { '*' },
+      },
+    },
+  },
+  init_options = {
+    settings = {
+      logLevel = 'info', -- Defaults to 'info'
+    }
+  }
+}

stow/nvim/.config/nvim/lua/user/whichkey.lua

@@ -201,7 +201,7 @@ local mappings = {
       "Workspace Diagnostics",
     },
     f = { "<cmd>lua vim.lsp.buf.format{async=true}<cr>", "Format" },
-    F = { "<cmd>!python -m ruff check % --fix --select F841 --fixable F841 --select F401 --fixable F401 && python -m ruff format %<cr>", "Format" },
+    F = { "<cmd>!python -m ruff check % --fix && python -m ruff format %<cr>", "Format" },
     J = { "<cmd>!prettier --write % --log-level warn<cr>", "Format" },
     i = { "<cmd>LspInfo<cr>", "Info" },
     I = { "<cmd>Mason<cr>", "Installer Info" },