From 8e3ee6a9cc8965700bde3d444b6d321a5e299454 Mon Sep 17 00:00:00 2001
From: Jika <vandechat@tutanota.com>
Date: Fri, 4 Apr 2025 16:17:10 +0200
Subject: [PATCH] Tweak term color / improve solidity dev in nvim / update nvim
 config

---
 alacritty/colors.toml          |  2 +-
 nvim/lua/configs/lspconfig.lua |  3 ++-
 nvim/lua/mappings.lua          |  2 +-
 nvim/lua/plugins/crates.lua    |  1 -
 nvim/lua/plugins/lint.lua      |  4 ++++
 zshrc                          | 11 +++++++++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/alacritty/colors.toml b/alacritty/colors.toml
index d5b6a54..46824a4 100644
--- a/alacritty/colors.toml
+++ b/alacritty/colors.toml
@@ -4,7 +4,7 @@ foreground = '#abb2bf'
 
 # Normal colors
 [colors.normal]
-black = '#0e1013'
+black = '#181c21'
 red = '#e55561'
 green = '#8ebd6b'
 yellow = '#e2b86b'
diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua
index 428ef55..cb6f23d 100644
--- a/nvim/lua/configs/lspconfig.lua
+++ b/nvim/lua/configs/lspconfig.lua
@@ -17,7 +17,8 @@ local servers = {
   "ruff",
   "dockerls",
   "ansiblels",
-  "jsonls"
+  "jsonls",
+  "solidity_ls_nomicfoundation",
 }
 
 for _, lsp in ipairs(servers) do
diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua
index c3bb46b..5cfaf64 100644
--- a/nvim/lua/mappings.lua
+++ b/nvim/lua/mappings.lua
@@ -29,7 +29,7 @@ map("n", "<leader>rd", "<CMD> lua require('rainbow-delimiters').toggle() <CR>",
 map(
   "n",
   "<leader>lf",
-  "<CMD> lua  require('conform').format { lsp_fallback = true }<CR>",
+  "<CMD> lua  require('conform').format { lsp_format = \"last\", }<CR>",
   { desc = "General Format file" }
 )
 map({ "n", "v" }, "<leader>la", require("actions-preview").code_actions, { desc = "Code action" })
diff --git a/nvim/lua/plugins/crates.lua b/nvim/lua/plugins/crates.lua
index 2328036..4ff9a02 100644
--- a/nvim/lua/plugins/crates.lua
+++ b/nvim/lua/plugins/crates.lua
@@ -1,6 +1,5 @@
 return {
   "saecki/crates.nvim",
-  tag = "stable",
   event = { "BufRead Cargo.toml" },
   opts = {
     lsp = {
diff --git a/nvim/lua/plugins/lint.lua b/nvim/lua/plugins/lint.lua
index e5f5160..88a4807 100644
--- a/nvim/lua/plugins/lint.lua
+++ b/nvim/lua/plugins/lint.lua
@@ -3,10 +3,14 @@ return {
     event = { "BufReadPre", "BufNewFile" },
     config = function()
         local lint = require("lint")
+        lint.linters_by_ft = {
+          solidity = {'solhint'},
+        }
 
         vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, {
             group = vim.api.nvim_create_augroup("RunLinter", { clear = true }),
             callback = function()
+                lint.try_lint()
                 lint.try_lint("codespell")
             end,
         })
diff --git a/zshrc b/zshrc
index c469ab0..31c216b 100644
--- a/zshrc
+++ b/zshrc
@@ -123,6 +123,7 @@ alias ohmyzsh="cd ~/.oh-my-zsh"
 alias cat='bat'
 alias grep='rg'
 alias du='dust'
+alias df='dysk'
 
 # ls
 alias ls='eza --icons=always --git'
@@ -143,3 +144,13 @@ alias gp='git push origin master'
 
 #cd
 alias cd..='cd ..'
+
+# yazi
+function y() {
+	local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
+	yazi "$@" --cwd-file="$tmp"
+	if cwd="$(command cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
+		builtin cd -- "$cwd"
+	fi
+	rm -f -- "$tmp"
+}