From 00ddc5dbcc38c7db3154f8dbf23978c1320ad49b Mon Sep 17 00:00:00 2001
From: whiteman808 <whiteman808@paraboletancza.org>
Date: Sat, 21 Feb 2026 05:10:56 +0100
Subject: [PATCH] [profiles/desktop] modify neovim config

---
 .../.config/nvim/after/ftplugin/bash.lua      |  4 +++
 .../.config/nvim/after/ftplugin/sh.lua        |  4 +++
 .../.config/nvim/after/ftplugin/zsh.lua       |  4 +++
 .../.config/nvim/lua/config/settings.lua      |  5 ----
 .../.config/nvim/lua/plugins/conform.lua      | 29 +++++++++++++++----
 .../.config/nvim/lua/plugins/lspconfig.lua    |  2 +-
 6 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 profiles/desktop/.config/nvim/after/ftplugin/bash.lua
 create mode 100644 profiles/desktop/.config/nvim/after/ftplugin/sh.lua
 create mode 100644 profiles/desktop/.config/nvim/after/ftplugin/zsh.lua

diff --git a/profiles/desktop/.config/nvim/after/ftplugin/bash.lua b/profiles/desktop/.config/nvim/after/ftplugin/bash.lua
new file mode 100644
index 0000000..addbd43
--- /dev/null
+++ b/profiles/desktop/.config/nvim/after/ftplugin/bash.lua
@@ -0,0 +1,4 @@
+-- set default tab width to 2 spaces
+vim.opt_local.tabstop = 2 -- number of spaces that a tab counts for
+vim.opt_local.shiftwidth = 2 -- size of an autoindented shift
+vim.opt_local.softtabstop = 0 -- indentation size
diff --git a/profiles/desktop/.config/nvim/after/ftplugin/sh.lua b/profiles/desktop/.config/nvim/after/ftplugin/sh.lua
new file mode 100644
index 0000000..addbd43
--- /dev/null
+++ b/profiles/desktop/.config/nvim/after/ftplugin/sh.lua
@@ -0,0 +1,4 @@
+-- set default tab width to 2 spaces
+vim.opt_local.tabstop = 2 -- number of spaces that a tab counts for
+vim.opt_local.shiftwidth = 2 -- size of an autoindented shift
+vim.opt_local.softtabstop = 0 -- indentation size
diff --git a/profiles/desktop/.config/nvim/after/ftplugin/zsh.lua b/profiles/desktop/.config/nvim/after/ftplugin/zsh.lua
new file mode 100644
index 0000000..addbd43
--- /dev/null
+++ b/profiles/desktop/.config/nvim/after/ftplugin/zsh.lua
@@ -0,0 +1,4 @@
+-- set default tab width to 2 spaces
+vim.opt_local.tabstop = 2 -- number of spaces that a tab counts for
+vim.opt_local.shiftwidth = 2 -- size of an autoindented shift
+vim.opt_local.softtabstop = 0 -- indentation size
diff --git a/profiles/desktop/.config/nvim/lua/config/settings.lua b/profiles/desktop/.config/nvim/lua/config/settings.lua
index 0dbe4e4..75e91ae 100644
--- a/profiles/desktop/.config/nvim/lua/config/settings.lua
+++ b/profiles/desktop/.config/nvim/lua/config/settings.lua
@@ -94,8 +94,3 @@ vim.opt.cinoptions:append({ 'N-s' })
 vim.g.html_indent_autotags = 'html,thead,tbody,tfoot'
 vim.g.html_indent_script1 = 'auto'
 vim.g.html_indent_style1 = 'auto'
-
--- set cursor shape to underline in the normal and command mode,
--- in the insert mode change shape to vertical bar, and disable
--- blinking in all modes
--- vim.opt.guicursor:append({ 'n-c:hor20', 'i:ver20', 'a:blinkon0' })
diff --git a/profiles/desktop/.config/nvim/lua/plugins/conform.lua b/profiles/desktop/.config/nvim/lua/plugins/conform.lua
index b3009ed..6ecd8d8 100644
--- a/profiles/desktop/.config/nvim/lua/plugins/conform.lua
+++ b/profiles/desktop/.config/nvim/lua/plugins/conform.lua
@@ -4,6 +4,26 @@ return {
   config = function()
     local conform = require('conform')
 
+    local formatters = {
+      stylua = {},
+      clang_format = {},
+      prettier = {},
+      autopep8 = {},
+      isort = {},
+      shfmt = {},
+    }
+
+    local util = require('conform.util')
+    for _, formatter in pairs(formatters) do
+      formatter.cwd = util.root_file({
+        '.git',
+        'pyproject.toml',
+        'package.json',
+        'Makefile',
+        '.editorconfig',
+      })
+    end
+
     conform.setup({
       formatters_by_ft = {
         lua = { 'stylua' },
@@ -13,12 +33,11 @@ return {
         css = { 'prettier' },
         javascript = { 'prettier' },
         python = { 'autopep8', 'isort' },
-        bash = { 'beautysh' },
-        csh = { 'beautysh' },
-        ksh = { 'beautysh' },
-        sh = { 'beautysh' },
-        zsh = { 'beautysh' },
+        bash = { 'shfmt' },
+        ksh = { 'shfmt' },
+        sh = { 'shfmt' },
       },
+      formatters = formatters,
       -- format_on_save = {
       --   lsp_fallback = true,
       --   async = false,
diff --git a/profiles/desktop/.config/nvim/lua/plugins/lspconfig.lua b/profiles/desktop/.config/nvim/lua/plugins/lspconfig.lua
index 41e1749..a1ef477 100644
--- a/profiles/desktop/.config/nvim/lua/plugins/lspconfig.lua
+++ b/profiles/desktop/.config/nvim/lua/plugins/lspconfig.lua
@@ -11,7 +11,7 @@ return {
     require('mason-lspconfig').setup({
       automatic_enable = true,
     })
-
+    
     vim.lsp.config('*', {
       capabilities = {
         textDocument = {