Merge branch 'master' of git.sr.ht:~hedy/dotfiles

.config/fish/functions/cat.fish

@@ -1,7 +1,7 @@
 function cat --wraps=ccat --description 'alias cat=ccat'
-	if which ccat > /dev/null
-		ccat  $argv;
+  if command -sq ccat
+		ccat $argv;
   else
 	  /usr/bin/cat $argv;
-	end
+  end
 end

.config/fish/functions/ll.fish

@@ -1,5 +1,5 @@
 function ll
-	if which exa > /dev/null
+	if command -sq exa
 		exa -lahg --git -t modified $argv
 	else
 		ls -Al $argv

.config/fish/functions/rm.fish

@@ -1,6 +1,6 @@
 function rm --wraps=trash --description 'alias rm=trash'
-  if which trash > /dev/null
-	  trash  $argv;
+  if command -sq trash
+	  trash $argv;
   else
 	  /usr/bin/rm $argv;
   end

.gitconfig

@@ -11,6 +11,7 @@
 [alias]
 	s = status
 	c = commit
+	cm = commit  # scheduled for "deprecation" lol
 	b = branch
 	ls-alias = config --get-regexp alias
 	l = log --oneline

paths.json

@@ -1,12 +0,0 @@
-{
-	"git": [".gitconfig", ".gitignore_global"],
-	"irb": ".irbrc",
-	"vim": [".vimrc", "iswsl.vim"],
-	"nvim": ["iswsl.vim", ".config/nvim"],
-	"fish": {
-		"config": ".config/fish/config.fish",
-		"functions": ".config/fish/functions"
-	},
-	"aerc": ".config/aerc",
-	"bin": "bin/"
-}