Merge branch 'main' of tildegit.org:drwasabi/my-dotfiles

.bash_aliases

@@ -11,7 +11,10 @@
 if [ $HOSTNAME != 'tilde' ]
 then
 	alias ls='lsd'
+	# bat, cat with wings
+	alias cat='batcat'
 fi
+
 alias ll='ls -alF'
 alias la='ls -a'
 # alias l='ls -CF'
@@ -38,8 +41,8 @@ alias gb='git branch'
 
 # vi and nvim aliases
 
-alias vim='nvim'
-alias vi='nvim'
+#alias vim='nvim'
+#alias vi='nvim'
 alias ni='nvim'
 
 # bat, cat with wings
@@ -47,6 +50,8 @@ alias ni='nvim'
 [ -f /usr/bin/bat ] && alias cat='bat'
 [ -f /usr/bin/batcat] && alias cat='batcat'
 
+
+
 # apt aliass
 alias aptud='sudo apt update'
 alias aptudls='sudo apt list --upgradeable'

.gitconfig

@@ -4,3 +4,5 @@
 	signingkey = B30FB26E1B0663C6
 [core]
 	editor = vim
+[pull]
+	rebase = false