brew_cask: removed hiddenbar

Signed-off-by: Marcin Woźniak <y0rune@aol.com>

.brew_programs

@@ -22,6 +22,7 @@ telnet
 texinfo
 tmux
 tree
+watch
 wget
 zoxide
 zsh

.brew_programs_cask

@@ -1,6 +1,5 @@
-akiflow
 alacritty
-alfred
+brave
 chatterino
 dbeaver-community
 discord
@@ -9,8 +8,6 @@ docker
 firefox@nightly
 font-hack-nerd-font
 gimp
-google-chrome
-hiddenbar
 karabiner-elements
 keepassxc
 megasync
@@ -21,7 +18,6 @@ obsidian
 platypus
 postman
 qbittorrent
-qview
 rustdesk
 scroll-reverser
 signal
@@ -33,6 +29,6 @@ transfer
 twingate
 visual-studio-code
 vlc
+whatsapp
 winbox
-wine-crossover
 wireshark

.config/alacritty/alacritty.toml

@@ -15,6 +15,9 @@ bindings = [
   { key = "V", mods = "Control|Shift", action = "Paste" },
 ]
 
+[window]
+opacity = 0.95
+
 [font]
 size = 20
 

.config/lazygit/config.yml

@@ -1,6 +1,7 @@
 refresher:
   refreshInterval: 60
 gui:
+  useHunkModeInStagingView: false
   mainPanelSplitMode: "horizontal"
   theme:
     selectedLineBgColor:

.config/nvim/init.vim

@@ -178,178 +178,89 @@ call plug#end()
 lua<<EOF
 local opts = { noremap=true, silent=true }
 
-local capabilities = vim.lsp.protocol.make_client_capabilities()
+-- capabilities for nvim-cmp
-capabilities = require('cmp_nvim_lsp').default_capabilities()
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
-local lspconfig = require('lspconfig')
 
-local on_attach = function(client, bufnr)
+-- Prefer LspAttach instead of per-server on_attach
-  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+vim.api.nvim_create_autocmd('LspAttach', {
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+  callback = function(args)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+    local bufnr = args.buf
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'ge', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts)
-  --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-  --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-  --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-  --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-  --vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
-end
 
--- LSP settings (for overriding per client)
+    vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
-local handlers =  {
-  ["textDocument/hover"] =  vim.lsp.with(vim.lsp.handlers.hover, {border = border}),
-  ["textDocument/signatureHelp"] =  vim.lsp.with(vim.lsp.handlers.signature_help, {border = border }),
-}
 
--- Use a loop to conveniently call 'setup' on multiple servers and
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { buffer = bufnr, silent = true })
--- map buffer local keybindings when the language server attaches
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { buffer = bufnr, silent = true })
-local servers = { 'clangd', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph', 'terraformls', 'tflint', 'marksman', 'rust_analyzer' }
+    vim.keymap.set('n', '<space>K', vim.lsp.buf.hover, { buffer = bufnr, silent = true })
-for _, lsp in pairs(servers) do
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { buffer = bufnr, silent = true })
-  require('lspconfig')[lsp].setup {
+    vim.keymap.set('n', 'ge', vim.diagnostic.setqflist, { buffer = bufnr, silent = true })
-    on_attach = on_attach,
+    vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { buffer = bufnr, silent = true })
-    handlers=handlers,
+    vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, { buffer = bufnr, silent = true })
-    capabilities = capabilities,
+    vim.keymap.set('n', 'gr', vim.lsp.buf.references, { buffer = bufnr, silent = true })
-    flags = {
+  end,
-      debounce_text_changes = 150,
+})
-    }
-  }
-end
 
+-- If you want borders, define one (your old code referenced `border` but never defined it)
+local border = 'rounded'
 
--- Handlers when you are in the insert mode you see the errors
+vim.lsp.config('*', {
-vim.lsp.handlers["textDocument/publishDiagnostics"] =
+  capabilities = capabilities,
-    vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics,
+  handlers = {
-                 {update_in_insert = true})
+    ["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }),
+    ["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }),
+  },
+})
 
--- Setup a yamlls plugin
+-- Server-specific overrides
-require'lspconfig'.yamlls.setup{
+vim.lsp.config('yamlls', {
   settings = {
     json = {
-        schemas = {
+      schemas = {
-            ["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"]= "conf/**/*catalog*",
+        ["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"]= "conf/**/*catalog*",
-            ["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*",
+        ["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*",
-            ["https://github.com/ansible/schemas/blob/main/f/ansible.json"] = "*.yaml,*.yml"
+        ["https://github.com/ansible/schemas/blob/main/f/ansible.json"] = "*.yaml,*.yml",
-        }
+      }
     },
-    yaml = {
+    yaml = { keyOrdering = false },
-        keyOrdering = false
-    },
-  }
-}
-
--- Setup GoLang
-require'lspconfig'.gopls.setup {
-    cmd = {"gopls", "serve"},
-    filetypes = { "go", "gomod", "gowork", "gotmpl" },
-    on_attach = on_attach,
-    handlers=handlers,
-    capabilities = capabilities,
-    settings = {
-        gopls = {
-            analyses = {
-                unusedparams = true,
-            },
-            staticcheck = true,
-            linksInHover = false,
-            codelenses = {
-                generate = true,
-                gc_details = true,
-                regenerate_cgo = true,
-                tidy = true,
-                upgrade_depdendency = true,
-                vendor = true,
-            },
-            completeUnimported = true,
-            usePlaceholders = true,
-            analyses = {
-                unusedparams = true,
-            },
-        },
-    },
-}
-
--- Setup Python (ruff)
-require('lspconfig').ruff.setup({})
-
--- luasnip setup
-local luasnip = require 'luasnip'
-
--- nvim-cmp setup
-local cmp = require 'cmp'
-cmp.setup {
-  snippet = {
-    expand = function(args)
-      luasnip.lsp_expand(args.body)
-    end,
   },
+})
+
+vim.lsp.config('gopls', {
+  cmd = {"gopls", "serve"},
+  filetypes = { "go", "gomod", "gowork", "gotmpl" },
+  settings = {
+    gopls = {
+      analyses = { unusedparams = true },
+      staticcheck = true,
+      linksInHover = false,
+      codelenses = {
+        generate = true,
+        gc_details = true,
+        regenerate_cgo = true,
+        tidy = true,
+        upgrade_depdendency = true,
+        vendor = true,
+      },
+      completeUnimported = true,
+      usePlaceholders = true,
+    },
+  },
+})
+
+vim.lsp.config('ruff', {}) -- keep as you had it
+
+-- Finally, enable servers (this replaces the setup() loop)
+vim.lsp.enable({
+  'clangd', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph',
+  'terraformls', 'tflint', 'marksman', 'rust_analyzer', 'ruff',
+})
+
+local cmp = require('cmp')
+cmp.setup({
   mapping = cmp.mapping.preset.insert({
-    ['<C-a>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-s>'] = cmp.mapping.scroll_docs(4),
     ['<C-Space>'] = cmp.mapping.complete(),
-    ['<CR>'] = cmp.mapping.confirm {
-      behavior = cmp.ConfirmBehavior.Replace,
-      select = true,
-    },
-    ['<Tab>'] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif luasnip.expand_or_jumpable() then
-        luasnip.expand_or_jump()
-      else
-        fallback()
-      end
-    end, { 'i', 's' }),
-    ['<S-Tab>'] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif luasnip.jumpable(-1) then
-        luasnip.jump(-1)
-      else
-        fallback()
-      end
-    end, { 'i', 's' }),
   }),
-  sources = {
+  sources = { { name = 'buffer' } },
-    { name = 'nvim_lsp' },
-    { name = 'luasnip' },
-    { name = 'vsnip' },
-    { name = 'ultisnips' },
-    { name = 'snippy' },
-    { name = 'path' },
-    { name = 'buffer' }
-  },
-}
-
-cmp.setup.cmdline(':', {
-  mapping = cmp.mapping.preset.cmdline(),
-  sources = cmp.config.sources({
-
-    { name = 'path' }
-  }, {
-    { name = 'cmdline' }
-  })
 })
-
-cmp.setup.cmdline('/', {
-
-  mapping = cmp.mapping.preset.cmdline(),
-  sources = {
-    { name = 'buffer' }
-  }
-})
-
-require("nvim-tree").setup({
-})
-
-require'treesitter-context'.setup{}
-
-require("nvim-autopairs").setup {}
-
-require'lspconfig'.rust_analyzer.setup {}
 EOF
 
 " Added popout window to see diagnostic

.config/pip/pip.conf

@@ -0,0 +1,2 @@
+[global]
+break-system-packages = true

.local/bin/mount-synology

@@ -1,13 +1,23 @@
 #!/bin/bash
 ~/.local/bin/sidebar-restore-macos
 open -gj "afp://10.0.0.14/Downloads"
+sleep 10
 open -gj "afp://10.0.0.14/Anime"
+sleep 2
 open -gj "afp://10.0.0.14/Music"
+sleep 2
 open -gj "afp://10.0.0.14/Video"
+sleep 2
 open -gj "afp://10.0.0.14/Series"
+sleep 2
 open -gj "afp://10.0.0.14/Photos"
+sleep 2
 open -gj "afp://10.0.0.14/Backups"
+sleep 2
 open -gj "afp://10.0.0.14/Recordings"
+sleep 2
+open -gj "afp://10.0.0.14/Work"
+sleep 2
 
 /usr/local/bin/mysides add Synology file:///Volumes/Recordings/
 /usr/local/bin/mysides add Synology file:///Volumes/Backups/
@@ -17,3 +27,4 @@ open -gj "afp://10.0.0.14/Recordings"
 /usr/local/bin/mysides add Synology file:///Volumes/Series/
 /usr/local/bin/mysides add Synology file:///Volumes/Photos/
 /usr/local/bin/mysides add Synology file:///Volumes/Anime/
+/usr/local/bin/mysides add Synology file:///Volumes/Work

.local/bin/sidebar-restore-macos

@@ -1,11 +1,10 @@
 #!/bin/bash
 /usr/local/bin/mysides remove all
-/usr/local/bin/mysides add yorune file:///Users/yorune/
+/usr/local/bin/mysides add Home file://"$HOME"/
-/usr/local/bin/mysides add Git file:///Users/yorune/git/
+/usr/local/bin/mysides add Git file://"$HOME"/git/
-/usr/local/bin/mysides add Linux file:///Users/yorune/MEGA/Systems/Linux/
+/usr/local/bin/mysides add Linux file://"$HOME"/MEGA/Systems/Linux/
-/usr/local/bin/mysides add Downloads file:///Users/yorune/Downloads/
+/usr/local/bin/mysides add Downloads file://"$HOME"/Downloads/
-/usr/local/bin/mysides add Aplikacje file:///Applications/
+# /usr/local/bin/mysides add Aplications file:///Applications/
-/usr/local/bin/mysides add Pictures file:///Users/yorune/Pictures/
+# /usr/local/bin/mysides add Aplications file:///"$HOME"/Applications/
-/usr/local/bin/mysides add Screenshots file:///Users/yorune/Screenshots/
+/usr/local/bin/mysides add Screenshots file://"$HOME"/Screenshots/
-/usr/local/bin/mysides add Movies file:///Users/yorune/Movies/
+/usr/local/bin/mysides add Desktop file://"$HOME"/Desktop/
-/usr/local/bin/mysides add Desktop file:///Users/yorune/Desktop/

.zshrc

@@ -162,7 +162,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
     alias ls="ls -Gh"
     alias mpv="mpv --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo+bestaudio/best'"
     alias code="open -a 'Visual Studio Code'"
-    alias xclip="pbcopy"
+    alias xclip="sed $'s,\x1b\\[[0-9;]*[a-zA-Z],,g' | pbcopy"
     alias mtr="sudo /opt/homebrew/opt/mtr/sbin/mtr"
     alias sleep-lid-off="sudo pmset -b sleep 0; sudo pmset -b disablesleep 1"
     alias sleep-lid-on="sudo pmset -b sleep 5; sudo pmset -b disablesleep 0"
@@ -172,13 +172,13 @@ if [[ "$(uname)" == "Darwin" ]]; then
     # Terraform
     export TFENV_ARCH=amd64
     export TFENVVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/ |
-        grep -iEo '[0-9]\.[0-9]\.[0-9]' |
+        grep -iEo '[0-9]+\.[0-9]+\.[0-9]+' |
         sort |
-        tail -n1)
+        head -n1)
     export TFVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/*/versions |
-        grep -iEo '[0-9]\.[0-9]\.[0-9]' |
+        grep -iEo '[0-9]+\.[0-9]+\.[0-9]+' |
         sort |
-        tail -n1)
+        head -n1)
     export PATH=$PATH:/opt/homebrew/Cellar/tfenv/$TFENVVERSION/versions/$TFVERSION/
 
     # Unset browser
@@ -229,7 +229,7 @@ alias neofetch=fastfetch
 [ -f $(which zoxide) ] && {eval "$(zoxide init zsh)"; alias cd='z'}
 
 # GoLang
-alias go-mod="go mod edit -go $(go version | grep -oE 'go[0-9]*\.[0-9]*\.[0-9]*' | sed 's/go//g');  go get -u; go mod verify; go get -x -v; go mod verify; go mod tidy"
+alias go-mod="go mod edit -go=$(go version | grep -oE 'go[0-9]*\.[0-9]*\.[0-9]*' | sed 's/go//g');  go get -u; go mod verify; go get -x -v; go mod verify; go mod tidy"
 
 # Resolve problem with - zsh: no matches found
 setopt +o nomatch

Library/Application Support/lazygit/config.yml

@@ -0,0 +1,16 @@
+refresher:
+  refreshInterval: 60
+gui:
+  useHunkModeInStagingView: false
+  mainPanelSplitMode: "horizontal"
+  theme:
+    selectedLineBgColor:
+      - "#413660"
+git:
+  autoFetch: true
+  pagers:
+    - colorArg: always
+  commit:
+    signOff: true
+  pull:
+    mode: "rebase"