updates

.bin/up

@@ -1,26 +1,40 @@
 #!/bin/bash
 
 # Homebrew (covers most compilers)
-brew update && brew upgrade
+brew update
+brew upgrade
 
 # Rust
 rustup update
+cargo install-update --all
+
+# Node libs
+npm-check -yug
+
+# Python libs
+pipx upgrade-all
+pip list -o | cut -d ' ' -f 1 | xargs -I{} pip install -U {}
+
+# Go dependencies
+goup
+
+# MacOS and app store
+softwareupdate -i --all --agree-to-license
 
 # V
 v up
+v update
 
-# Node libs
-npm-check -yg
-# Python libs
-# Problem with this is that it upgrade each individual package independent of the whole and then ends up with conflicts preventing the ones I've actually installed from being upgraded. No capability like npm's depth.
-# Can I use poetry for global package installation?
-# pip3 list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip3 install -U
+# Neovim
+nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
+# TS?
 
 # OCaml libs
-# opam update && opam upgrade -y
+# opam update
+# opam upgrade -all -y --fixup
 
-# Go dependencies
-# https://go.dev/doc/go-get-install-deprecation
+# Ruby
+# gem update
 
-# Finish with some good fun
-# genact
+# PERL
+# cpan update???

.config/helix/config.toml

@@ -10,19 +10,22 @@ select = "underline"
 C-d = ":q"
 C-p = "file_picker"
 K = "hover"
-[keys.normal.C-v]
+N = "goto_next_buffer"
+P = "goto_previous_buffer"
+
+[keys.normal.C-o]
 w = ":w"
-n = "goto_next_buffer"
-p = "goto_previous_buffer"
 
 
 [keys.insert]
 j = { k = "normal_mode" }
 C-d = ":q"
-[keys.insert.C-v]
+
+[keys.insert.C-o]
 w = ":w"
 
 [keys.select]
 C-d = ":q"
-[keys.select.C-v]
+
+[keys.select.C-o]
 w = ":w"

.config/helix/themes/nord.toml

@@ -8,7 +8,6 @@
 
 # Polar Night
 # nord0 - background color
-"ui.background" = { bg = "nord0" }
 "ui.statusline.inactive" = { fg = "nord8", bg = "nord1" }
 
 

.config/nvim/init.lua

@@ -48,7 +48,7 @@ o.foldenable = false
 o.grepprg = "rg --color=never"
 o.guicursor = "a:blinkon0,i:ver25-iCursor"
 o.ignorecase = true
--- o.laststatus = 2
+o.laststatus = 3
 o.cmdheight = 0
 o.linebreak = true
 o.mouse = "a"
@@ -85,9 +85,6 @@ vim.diagnostic.config({
 	severity_sort = false,
 })
 
--- Plugins that use settings for config
-g.better_escape_shortcut = "jk"
-
 -- Nord colorscheme settings
 g.nord_contrast = true
 g.nord_borders = true

.config/nvim/lua/config/cmp.lua

@@ -1,13 +1,24 @@
 return function()
 	local cmp = require("cmp")
 	local luasnip = require("luasnip")
+	local lspkind = require("lspkind")
 
 	local function has_words_before()
 		local line, col = unpack(vim.api.nvim_win_get_cursor(0))
 		return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
 	end
 
 	cmp.setup({
+		formatting = {
+			format = lspkind.cmp_format({
+				mode = "symbol",
+				maxwidth = 50,
+				ellipsis_char = "...",
+				before = function(_, vim_item)
+					return vim_item
+				end,
+			}),
+		},
 		view = {
 			entries = "native",
 		},
@@ -18,7 +29,6 @@ return function()
 		},
 		sources = cmp.config.sources({
 			{ name = "nvim_lsp" },
-			{ name = "cmp_tabnine" },
 			{ name = "luasnip" },
 		}, {
 			{ name = "buffer" },

.config/nvim/lua/config/cokeline.lua

@@ -60,7 +60,7 @@ return function()
 				end,
 			},
 			{
-				text = "",
+				text = "󰅖",
 				delete_buffer_on_left_click = true,
 			},
 			{

.config/nvim/lua/config/color.lua

@@ -36,7 +36,7 @@ return function()
 	vim.api.nvim_set_hl(0, "Float", { link = "Number" })
 	vim.api.nvim_set_hl(0, "Boolean", { link = "Number" })
 
-	-- Cursorline
+	-- CursorLine
 	vim.api.nvim_set_hl(0, "CursorLine", { bg = "#282E39", fg = "#282E39" })
 	vim.api.nvim_set_hl(0, "CursorLineNr", { bg = "#282E39", fg = "#282E39" })
 

.config/nvim/lua/config/feline.lua

@@ -248,7 +248,6 @@ return function()
 					comps.git.remove,
 					comps.git.sep,
 				},
-				{},
 				{
 					-- Diag
 					comps.diag.status,
@@ -265,19 +264,7 @@ return function()
 					comps.right,
 				},
 			},
-			inactive = {
-				{
-					-- comps.left,
-					-- File info
-					-- comps.file.folder,
-					-- comps.file.filename,
-				},
-				{},
-				{
-					-- comps.location.percentage,
-					-- comps.right,
-				},
-			},
+			inactive = {},
 		},
 	})
 end

.config/nvim/lua/config/lsp.lua

@@ -57,19 +57,9 @@ return function()
 	end
 
 	lsp.ansiblels.setup(config({ format = true }))
-	lsp.cssls.setup(config())
 	lsp.gopls.setup(config())
 	lsp.html.setup(config({ format = true }))
 	lsp.jsonls.setup(config())
-	lsp.pyright.setup(config())
-	lsp.robotframework_ls.setup(config({ format = true }))
-	lsp.rust_analyzer.setup(config())
-	lsp.sourcekit.setup(config({ format = true }))
-	lsp.tailwindcss.setup(config())
-	lsp.terraformls.setup(config())
-	lsp.tsserver.setup(config())
-	lsp.vls.setup(config({ format = true }))
-	lsp.zls.setup(config())
 	lsp.lua_ls.setup({
 		on_attach = on_attach(),
 		capabilities = capabilities,
@@ -84,6 +74,18 @@ return function()
 			},
 		},
 	})
+	lsp.pyright.setup(config()) -- Python
+	lsp.robotframework_ls.setup(config({ format = true })) -- Robot
+	lsp.rome.setup(config({ format = true })) -- JS, TS, CSS, etc
+	-- lsp.rust_analyzer.setup(config()) -- Rust
+	lsp.tailwindcss.setup(config()) -- Tailwind
+	lsp.terraformls.setup(config()) -- Terraform
+	lsp.tsserver.setup(config()) -- Typescript
+	-- lsp.vls.setup(config({ format = true }))
+	-- lsp.zls.setup(config())
+
+	local rt = require("rust-tools")
+	rt.setup(config(true))
 
 	local null_ls = require("null-ls")
 	-- local actions = null_ls.builtins.code_actions
@@ -96,38 +98,38 @@ return function()
 
 			-- Diagnostics
 			diagnostics.ansiblelint,
-			diagnostics.curlylint,
-			diagnostics.eslint_d,
-			diagnostics.flake8,
-			diagnostics.hadolint,
-			diagnostics.npm_groovy_lint,
-			diagnostics.revive,
+			diagnostics.curlylint, -- Jinja, etc
+			-- diagnostics.eslint_d,
+			diagnostics.flake8, -- Python
+			diagnostics.hadolint, -- Dockerfile
+			diagnostics.npm_groovy_lint, -- Jenkinsfile
+			diagnostics.revive, -- Go
 
 			-- Formatting
 			formatting.black,
-			formatting.csharpier,
-			formatting.fixjson,
-			formatting.golines,
-			formatting.isort,
-			formatting.npm_groovy_lint,
+			formatting.fixjson, -- JSON
+			formatting.golines, -- Go
+			formatting.isort, -- Python
+			formatting.npm_groovy_lint, -- Jenkinsfile
 			formatting.prettierd.with({
 				filetypes = {
-					"css",
+					-- Handled by rome
+					-- "css",
+					-- "javascript",
+					-- "javascriptreact",
+					-- "typescript",
+					-- "typescriptreact",
 					"markdown",
-					"javascript",
-					"javascriptreact",
-					"typescript",
-					"typescriptreact",
 					"yaml",
 				},
 			}),
-			formatting.rustfmt,
-			formatting.shfmt,
-			formatting.stylua,
-			formatting.terraform_fmt,
+			formatting.rustfmt, -- Rust
+			formatting.shfmt, -- Shell
+			formatting.stylua, -- Lua
+			formatting.terraform_fmt, -- Terraform
 			formatting.trim_newlines,
 			formatting.trim_whitespace,
-			formatting.xmllint,
+			formatting.xmllint, -- XML
 		},
 	})
 end

.config/nvim/lua/config/neotree.lua

@@ -1,5 +1,8 @@
 return function()
 	require("neo-tree").setup({
+		filesystem = {
+			follow_current_file = true,
+		},
 		default_component_configs = {
 			name = {
 				use_git_status_colors = false,