Merge branch 'main' of 192.168.0.184:andrzej/dotfiles

sync laptop with desktop

nvim/.config/nvim/lua/keymaps.lua

@@ -41,9 +41,9 @@ vim.keymap.set({ "i", "n" }, "<M-->", "<cmd>b#<cr>", { desc = "Previous buffer."
 
 --SUPER COMMA
 -- go to next comma and press enter
-vim.keymap.set("n", "<M-,>", "f,a<cr><esc>")
+vim.keymap.set("n", "<C-,>", "f,a<cr><esc>")
 -- add a comma at end of line and CR
-vim.keymap.set("i", "<M-,>", "<esc>A,<cr><esc>")
+vim.keymap.set("i", "<M-,>", "<esc>A,<cr>")
 
 --TOGGLE TABSTOP
 vim.keymap.set("n", "<M-t>", function()

nvim/.config/nvim/lua/plugins/oil.lua

@@ -9,9 +9,9 @@ return {
 			-- See :help oil-columns
 			columns = {
 				"icon",
-				-- "permissions",
-				-- "size",
-				-- "mtime",
+				"permissions",
+				"size",
+				"mtime",
 			},
 			-- Buffer-local options to use for oil buffers
 			buf_options = {
@@ -32,7 +32,7 @@ return {
 			-- Send deleted files to the trash instead of permanently deleting them (:help oil-trash)
 			delete_to_trash = false,
 			-- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits)
-			skip_confirm_for_simple_edits = false,
+			skip_confirm_for_simple_edits = true,
 			-- Selecting a new/moved/renamed file or directory will prompt you to save changes first
 			-- (:help prompt_save_on_select_new_entry)
 			prompt_save_on_select_new_entry = true,
@@ -61,8 +61,8 @@ return {
 			keymaps = {
 				["g?"] = "actions.show_help",
 				["<CR>"] = "actions.select",
-				["<C-s>"] = "actions.select_vsplit",
-				["<C-h>"] = "actions.select_split",
+				["<C-v>"] = "actions.select_vsplit",
+				["<C-x>"] = "actions.select_split",
 				["<C-t>"] = "actions.select_tab",
 				["<C-p>"] = "actions.preview",
 				["<C-c>"] = "actions.close",
@@ -80,7 +80,7 @@ return {
 			use_default_keymaps = true,
 			view_options = {
 				-- Show files and directories that start with "."
-				show_hidden = false,
+				show_hidden = true,
 				-- This function defines what is considered a "hidden" file
 				is_hidden_file = function(name, bufnr)
 					return vim.startswith(name, ".")

ssh/.ssh/config

@@ -10,3 +10,7 @@ Host jenkins
 	Hostname 192.168.0.119
 	User andrzej
 
+Host gitea
+	Hostname 192.168.0.184
+	User root
+

tmux/.tmux.conf

@@ -8,6 +8,9 @@ set -g @rose_pine_date_time '%a %e %B | %R'
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'christoomey/vim-tmux-navigator'
+
+set -g mouse on
+setw -g mode-keys vi
 # Other examples:
 # set -g @plugin 'github_username/plugin_name'
 # set -g @plugin 'github_username/plugin_name#branch'

zsh/.zsh_aliases

@@ -1,10 +1,6 @@
-alias cuqui="wakeonlan B8:AE:ED:74:C8:B7 && sleep 5 && ssh cuqui@192.168.0.57"
-alias cheese="~/scripts/cheesecake.sh"
-alias work="~/scripts/sfw.sh"
 alias update="apt update && apt upgrade -y" 
-alias b="~/scripts/switch-bg.sh"
-alias icat="kitty +kitten icat"
 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}\"'"
 
 ##suffix aliases
 #text formats