Merge branch 'main' of 192.168.0.184:andrzej/dotfiles

bash/.bashrc

@@ -127,3 +127,5 @@ export PATH="$DENO_INSTALL/bin:$PATH"
 
 
 . "$HOME/.cargo/env"
+
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash

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

@@ -6,8 +6,8 @@ local function map(mode, lhs, rhs, opts)
 	vim.keymap.set(mode, lhs, rhs, options)
 end
 
-map({ "i", "v", "t" }, "jk", "<esc>") -- remap escape
-map({ "i", "v", "t" }, "JK", "<esc>") -- remap escape
+map({ "i", "t" }, "jk", "<esc>") -- remap escape
+map({ "i", "t" }, "JK", "<esc>") -- remap escape
 map("n", "<leader>o", "o<esc>")
 
 map("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')

zsh/.zsh_aliases

@@ -4,6 +4,15 @@ alias devsesh="$HOME/scripts/tmux-dev-session.sh"
 alias slides="nohup ${HOME}/.config/hypr/bg-scripts/hyprland-slideshow.sh"
 alias ls="ls --color=auto"
 
+alias fzf='fzf --preview='\''
+    if file --mime-type {} | grep -qF '\''image/'\''; then
+      kitty icat --clear --transfer-mode=memory --stdin=no --place=${FZF_PREVIEW_COLUMNS}x${FZF_PREVIEW_LINES}@0x0 {}
+    else
+      batcat --color=always {}
+    fi
+  '\'''
+
+
 export SUDO_EDITOR="nvim"
 
 ##suffix aliases

zsh/.zshrc

@@ -29,7 +29,7 @@ eval "$(luarocks path --bin)"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 #fzf
-source <(fzf --zsh)
+# source <(fzf --zsh)
 
 #starship
 eval "$(starship init zsh)"
@@ -41,3 +41,5 @@ HISTSIZE=10000
 SAVEHIST=10000
 # Share history in every terminal session
 setopt SHARE_HISTORY
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh