Merge branch 'main' of 192.168.0.184:andrzej/dotfiles

bgs

@@ -1 +1 @@
-Subproject commit cd1971abc93ce4f3c6fe42da7fccbbbe6b44d6d2
+Subproject commit 6f26892e699d04f1a072af50300543fae28d3e77

nvim/.config/nvim/lazy-lock.json

@@ -28,12 +28,9 @@
   "neovim-session-manager": { "branch": "master", "commit": "892c55f7256fe170301a1fdd21752982c75c3507" },
   "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
   "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
-  "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" },
-  "nvim-dap-ui": { "branch": "master", "commit": "71bfe9bd6b3465e169b53bea4f83775034d822dd" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
   "nvim-devdocs": { "branch": "master", "commit": "1ab982d3e069d191d9157b897c8b70cf48b7f77a" },
+  "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" },
   "nvim-lspconfig": { "branch": "master", "commit": "97762065bf7e1ac617d0a8710eb7ec2d656287a9" },
-  "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
   "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" },
   "nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" },
   "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
@@ -41,6 +38,7 @@
   "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
   "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
   "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
   "oil.nvim": { "branch": "master", "commit": "f630887cd845a7341bc16488fe8aaecffe3aaa8a" },
   "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
@@ -53,6 +51,7 @@
   "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "ts-error-translator.nvim": { "branch": "main", "commit": "11ae55b28bde02663b5f983f59b0e3fd9c4e845b" },
   "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
   "vim-pencil": { "branch": "master", "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },

nvim/.config/nvim/lua/options/default.lua

@@ -52,3 +52,5 @@ vim.opt.spell = true
 vim.opt.textwidth = 0 --prevent vim from inserting linebreaks
 vim.opt.linebreak = true
 vim.opt.wrap = true
+
+vim.opt.tabstop = 2

nvim/.config/nvim/lua/plugins/comment.lua

@@ -1,2 +1,13 @@
 --this plugin allows commenting selections
-return { "numToStr/Comment.nvim", opts = {} }
+return {
+	"numToStr/Comment.nvim",
+	dependencies = { "JoosepAlviste/nvim-ts-context-commentstring" },
+	config = function()
+		require("ts_context_commentstring").setup({
+			enable_autocmd = false,
+		})
+		require("Comment").setup({
+			pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
+		})
+	end,
+}

ssh/.ssh/config

@@ -14,3 +14,7 @@ Host gitea
 	Hostname 192.168.0.184
 	User root
 
+Host minecraft
+	Hostname 192.168.0.206
+	User root
+

zsh/.zsh_aliases

@@ -1,6 +1,7 @@
 alias update="apt update && apt upgrade -y" 
 alias tidal="/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=com.mastermindzh.tidal-hifi com.mastermindzh.tidal-hifi &"
-alias tcd= "tmux command-prompt 'attach-session -c \"#{pane_current_path}\"'"
+
+export SUDO_EDITOR="nvim"
 
 ##suffix aliases
 #text formats