* Merge files into platform.fish

	deleted:    conf.d/00paths.fish
	deleted:    conf.d/01common.fish
	new file:   conf.d/02platform.fish
	deleted:    conf.d/03freebsd.fish
	deleted:    conf.d/03linux.fish
	deleted:    conf.d/03macos.fish
	deleted:    conf.d/03netbsd.fish
	deleted:    conf.d/03openbsd.fish
	deleted:    conf.d/04package.fish

9 files changed, 283 insertions, 290 deletions

diff --git a/conf.d/00paths.fish b/conf.d/00paths.fish
deleted file mode 100644
index ddab1fd..0000000
--- a/conf.d/00paths.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-if test -d '/opt/homebrew/bin'; and string match -q -e 'Darwin' (uname)
-  fish_add_path --prepend --global --path '/opt/homebrew/bin'
-end
diff --git a/conf.d/01common.fish b/conf.d/01common.fish
deleted file mode 100644
index 2d93d9c..0000000
--- a/conf.d/01common.fish
+++ /dev/null
@@ -1,15 +0,0 @@
-if status is-interactive
-
-alias_if doas sudo
-
-alias l 'ls'
-alias du 'du -h'
-alias md 'mkdir'
-alias rd 'rmdir'
-
-if command -sq tree
-  alias lta 'tree -a'
-  alias llta 'tree -apugsh'
-end
-
-end
diff --git a/conf.d/02platform.fish b/conf.d/02platform.fish
new file mode 100644
index 0000000..b633fc0
--- /dev/null
+++ b/conf.d/02platform.fish
@@ -0,0 +1,283 @@
+if status is-interactive
+
+  ### All platforms
+   
+  alias_if doas sudo
+
+  alias l 'ls'
+  alias md 'mkdir'
+  alias rd 'rmdir'
+  alias du 'du -h'
+
+  if command -sq tree
+    alias lta 'tree -a'
+    alias llta 'tree -apugsh'
+  end
+
+  ### Linux
+
+  function handle_linux
+
+    if command -sq dircolors; and test -f ~/.config/dircolors
+      eval (dircolors -c ~/.config/dircolors)
+    end
+
+    alias ls 'ls --color=auto -F'
+    alias la 'ls --color=auto -F -a'
+    alias ll 'ls --color=auto -F -l'
+    alias lla 'ls --color=auto -F -l -a'
+
+    alias grep 'grep --color=auto'
+    alias diff 'diff --color=auto'
+    alias ff 'find . -type f -name'
+    alias fd 'find . -type d -name'
+    alias fbs 'find . -xtype l'
+
+    alias who 'who -H -w -u'
+    alias free 'free -h'
+    alias df 'df -Th'
+    alias ps 'ps -ejH'
+    alias lsof 'lsfd'
+
+    # If we have iproute2
+    if command -sq ip
+      alias ip "ip -c"
+      alias sockstat "ss -4 -6 -l -r -p"
+
+      alias_if_not route ip route
+      alias_if_not ifconfig ip link
+      alias_if_not netstat ss -4 -6 -l -r -p
+    end
+
+    # If we have pacman
+    if command -sq pacman
+      alias lspkg 'pacman -Q --color=always | rawpager'
+      alias lspkgi 'pacman -Qett --color=always | rawpager'
+      alias lspkgo 'pacman -Qdt'
+      alias pkginfo 'pacman -Qi'
+      alias pkgsearch 'pacman -Ss'
+      alias whatpkg 'pacman -Qo'
+
+      if fish_is_root_user
+        alias pkgadd 'pacman -S'
+        alias pkgrm 'pacman -Rs'
+        alias pkgupd 'pacman -Syyu'
+        alias pkgclean 'paccache -k 0 -r'
+        alias confnew 'find /etc -type f -name "*.pacnew"'
+      else
+        alias pkgadd 'sudo pacman -S'
+        alias pkgrm 'sudo pacman -Rs'
+        alias pkgupd 'sudo pacman -Syyu'
+        alias pkgclean 'sudo paccache -k 0 -r'
+        alias confnew 'sudo find /etc -type f -name "*.pacnew"'
+      end
+
+      function is-installed
+        pacman -Qq $argv &>/dev/null
+      end
+    end
+
+    # If we have apk 
+
+    # If we have systemd
+    if command -sq systemctl
+      alias pss "systemd-cgls"
+      alias ipconfig "networkctl -a status"
+
+      if not fish_is_root_user
+        alias showdnscache "sudo resolvectl show-cache"
+        alias cleardnscache "sudo resolvectl flush-caches"
+      else
+        alias showdnscache "resolvectl show-cache"
+        alias cleardnscache "resolvectl flush-caches"
+      end
+
+      alias_if_not nslookup systemd-resolve
+    end
+
+  end # handle_linux
+
+  ### macOS
+
+  function handle_macos
+
+    if test -d '/opt/homebrew/bin'
+      fish_add_path --prepend --global --path '/opt/homebrew/bin'
+    end
+
+    alias ff "find . -type f -name"
+    alias fd "find . -type d -name"
+    alias grep "grep --color=auto"
+
+    alias nproc "sysctl -n hw.ncpu"
+    alias lsblk "diskutil list"
+    alias route "netstat -nr"
+
+    # If we have Homebrew
+    if command -sq brew
+      alias lspkg 'brew list ; echo ; brew info'
+      alias pkginfo 'brew info'
+      alias pkgsearch 'brew search'
+
+      alias pkgadd 'brew install'
+      alias pkgrm 'brew uninstall'
+      alias pkgupd 'brew update ; echo ; brew upgrade'
+    end
+
+    # If we have MacPorts
+    if command -sq port
+      alias lspkg 'port installed'
+      alias lspkgo 'port list rleaves'
+      alias pkginfo 'port info'
+      alias pkgsearch 'port search'
+
+      if fish_is_root_user
+        alias pkgadd 'port install'
+        alias pkgrm 'port uninstall'
+        alias pkgupd 'port upgrade outdated'
+      else
+        alias pkgadd 'sudo port install'
+        alias pkgrm 'sudo port uninstall'
+        alias pkgupd 'sudo port upgrade outdated'
+      end
+    end
+
+  end # handle_macos
+
+  ### NetBSD
+
+  function handle_netbsd
+
+    if command -sq colorls
+      alias ls 'colorls -G -F'
+      alias ll 'colorls -G -F -l'
+      alias la 'colorls -G -F -a'
+      alias lla 'colorls -G -F -l -a'
+    else
+      alias ls 'ls -F'
+      alias la 'ls -F -a'
+      alias ll 'ls -F -l'
+      alias lla 'ls -F -l -a'
+    end
+
+    alias nproc "sysctl -n hw.ncpu"
+    alias free "vmstat"
+    alias lsusb "usbdevs"
+    alias lspci "pcictl pci0 list"
+
+    alias lspkg 'pkgin list'
+    alias pkginfo 'pkgin pkg-descr'
+    alias pkgsearch 'pkgin search'
+
+    if fish_is_root_user
+      alias pkgadd 'pkgin install'
+      alias pkgrm 'pkgin remove'
+      alias pkgupd 'pkgin upgrade'
+      alias pkgclean 'pkgin clean'
+    else
+      alias pkgadd 'doas pkgin install'
+      alias pkgrm 'doas pkgin remove'
+      alias pkgupd 'doas pkgin upgrade'
+      alias pkgclean 'doas pkgin clean'
+    end
+
+  end # handle_netbsd
+
+  ### OpenBSD
+
+  function handle_openbsd
+
+    if command -sq colorls
+      alias ls 'colorls -G -F'
+      alias ll 'colorls -G -F -l'
+      alias la 'colorls -G -F -a'
+      alias lla 'colorls -G -F -l -a'
+    else
+      alias ls 'ls -F'
+      alias la 'ls -F -a'
+      alias ll 'ls -F -l'
+      alias lla 'ls -F -l -a'
+    end
+
+    alias nproc 'sysctl -n hw.ncpu'
+    alias free 'vmstat'
+    alias lsof 'fstat'
+    alias lsblk 'sysctl hw.disknames'
+    alias lspci 'pcidump'
+
+    alias ff 'find . -type f -name'
+    alias fd 'find . -type d -name'
+    alias fbs 'find . -type l'
+
+    alias route 'netstat -nr'
+
+    alias lspkg 'pkg_info -A'
+    alias lspkgo 'pkg_info -t'
+    alias pkginfo 'pkg_info'
+    alias pkgsearch 'pkg_info -Q'
+
+    if fish_is_root_user
+      alias pkgadd 'pkg_add'
+      alias pkgrm 'pkg_delete'
+      alias pkgupd 'pkg_add -u'
+    else
+      alias pkgadd 'doas pkg_add'
+      alias pkgrm 'doas pkg_delete'
+      alias pkgupd 'doas pkg_add -u'
+    end
+
+  end # handle_openbsd
+
+  ### FreeBSD
+
+  function handle_freebsd
+
+    if command -sq colorls
+      alias ls 'colorls -G -F'
+      alias ll 'colorls -G -F -l'
+      alias la 'colorls -G -F -a'
+      alias lla 'colorls -G -F -l -a'
+    else
+      alias ls 'ls -F'
+      alias la 'ls -F -a'
+      alias ll 'ls -F -l'
+      alias lla 'ls -F -l -a'
+    end
+
+    alias nproc "sysctl -n hw.ncpu"
+    alias free "vmstat"
+    alias lsusb "usbconfig list"
+    alias lspci "pciconf -lv"
+    alias lsmod "kldstat"
+    alias insmod "kldload"
+
+    alias pkginfo 'pkg info'
+
+    if fish_is_root_user
+      alias pkgadd 'pkg install'
+      alias pkgrm 'pkg remove'
+      alias pkgupd 'pkg upgrade'
+      alias pkgclean 'pkg clean -a'
+    else
+      alias pkgadd 'doas pkg install'
+      alias pkgrm 'doas pkg remove'
+      alias pkgupd 'doas pkg upgrade'
+      alias pkgclean 'doas pkg clean -a'
+    end
+
+  end # handle_openbsd
+
+  switch (uname)
+    case 'Linux'
+      handle_linux
+    case 'Darwin'
+      handle_macos
+    case 'OpenBSD'
+      handle_openbsd
+    case 'NetBSD'
+      handle_netbsd
+    case 'FreeBSD'
+      handle_freebsd
+  end
+
+end
diff --git a/conf.d/03freebsd.fish b/conf.d/03freebsd.fish
deleted file mode 100644
index b81eb2f..0000000
--- a/conf.d/03freebsd.fish
+++ /dev/null
@@ -1,22 +0,0 @@
-if status is-interactive; and string match -q -e 'FreeBSD' (uname)
-
-alias nproc "sysctl -n hw.ncpu"
-alias free "vmstat"
-alias lsusb "usbconfig list"
-alias lspci "pciconf -lv"
-alias lsmod "kldstat"
-alias insmod "kldload"
-
-if command -sq colorls
-  alias ls 'colorls -G -F'
-  alias ll 'colorls -G -F -l'
-  alias la 'colorls -G -F -a'
-  alias lla 'colorls -G -F -l -a'
-else
-  alias ls 'ls -F'
-  alias la 'ls -F -a'
-  alias ll 'ls -F -l'
-  alias lla 'ls -F -l -a'
-end
-
-end
diff --git a/conf.d/03linux.fish b/conf.d/03linux.fish
deleted file mode 100644
index 9822da4..0000000
--- a/conf.d/03linux.fish
+++ /dev/null
@@ -1,52 +0,0 @@
-if status is-interactive; and string match -q -e 'Linux' (uname)
-
-if command -sq dircolors; and test -f ~/.config/dircolors
-  eval (dircolors -c ~/.config/dircolors)
-end
-
-alias ls 'ls --color=auto -F'
-alias la 'ls --color=auto -F -a'
-alias ll 'ls --color=auto -F -l'
-alias lla 'ls --color=auto -F -l -a'
-
-alias grep 'grep --color=auto'
-alias diff 'diff --color=auto'
-
-alias ff 'find . -type f -name'
-alias fd 'find . -type d -name'
-alias fbs 'find . -xtype l'
-
-alias who 'who -H -w -u'
-
-alias free 'free -h'
-alias df 'df -Th'
-alias ps 'ps -ejH'
-alias lsof 'lsfd'
-
-# If we have iproute2
-if command -sq ip
-  alias ip "ip -c"
-  alias sockstat "ss -4 -6 -l -r -p"
-
-  alias_if_not route ip route
-  alias_if_not ifconfig ip link
-  alias_if_not netstat ss -4 -6 -l -r -p
-end
-
-# If we have systemd
-if command -sq systemctl
-  alias pss "systemd-cgls"
-  alias ipconfig "networkctl -a status"
-
-  if not fish_is_root_user
-    alias showdnscache "sudo resolvectl show-cache"
-    alias cleardnscache "sudo resolvectl flush-caches"
-  else
-    alias showdnscache "resolvectl show-cache"
-    alias cleardnscache "resolvectl flush-caches"
-  end
-
-  alias_if_not nslookup systemd-resolve
-end
-
-end
diff --git a/conf.d/03macos.fish b/conf.d/03macos.fish
deleted file mode 100644
index 41e58d4..0000000
--- a/conf.d/03macos.fish
+++ /dev/null
@@ -1,11 +0,0 @@
-if status is-interactive; and string match -q -e 'Darwin' (uname)
-
-alias ff "find . -type f -name"
-alias fd "find . -type d -name"
-alias grep "grep --color=auto"
-
-alias nproc "sysctl -n hw.ncpu"
-alias lsblk "diskutil list"
-alias route "netstat -nr"
-
-end
diff --git a/conf.d/03netbsd.fish b/conf.d/03netbsd.fish
deleted file mode 100644
index e2248a7..0000000
--- a/conf.d/03netbsd.fish
+++ /dev/null
@@ -1,20 +0,0 @@
-if status is-interactive; and string match -q -e 'NetBSD' (uname)
-
-alias nproc "sysctl -n hw.ncpu"
-alias free "vmstat"
-alias lsusb "usbdevs"
-alias lspci "pcictl pci0 list"
-
-if command -sq colorls
-  alias ls 'colorls -G -F'
-  alias ll 'colorls -G -F -l'
-  alias la 'colorls -G -F -a'
-  alias lla 'colorls -G -F -l -a'
-else
-  alias ls 'ls -F'
-  alias la 'ls -F -a'
-  alias ll 'ls -F -l'
-  alias lla 'ls -F -l -a'
-end
-
-end
diff --git a/conf.d/03openbsd.fish b/conf.d/03openbsd.fish
deleted file mode 100644
index a6f773a..0000000
--- a/conf.d/03openbsd.fish
+++ /dev/null
@@ -1,27 +0,0 @@
-if status is-interactive; and string match -q -e 'OpenBSD' (uname)
-
-alias nproc 'sysctl -n hw.ncpu'
-alias free 'vmstat'
-alias lsof 'fstat'
-alias lsblk 'sysctl hw.disknames'
-alias lspci 'pcidump'
-
-alias ff 'find . -type f -name'
-alias fd 'find . -type d -name'
-alias fbs 'find . -type l'
-
-alias route 'netstat -nr'
-
-if command -sq colorls
-  alias ls 'colorls -G -F'
-  alias ll 'colorls -G -F -l'
-  alias la 'colorls -G -F -a'
-  alias lla 'colorls -G -F -l -a'
-else
-  alias ls 'ls -F'
-  alias la 'ls -F -a'
-  alias ll 'ls -F -l'
-  alias lla 'ls -F -l -a'
-end
-
-end
diff --git a/conf.d/04package.fish b/conf.d/04package.fish
deleted file mode 100644
index 20e0e16..0000000
--- a/conf.d/04package.fish
+++ /dev/null
@@ -1,140 +0,0 @@
-if status is-interactive
-
-function handle_linux
-
-# If we have pacman
-if command -sq pacman
-
-  alias lspkg 'pacman -Q --color=always | rawpager'
-  alias lspkgi 'pacman -Qett --color=always | rawpager'
-  alias lspkgo 'pacman -Qdt'
-  alias pkginfo 'pacman -Qi'
-  alias pkgsearch 'pacman -Ss'
-  alias whatpkg 'pacman -Qo'
-
-  if fish_is_root_user
-    alias pkgadd 'pacman -S'
-    alias pkgrm 'pacman -Rs'
-    alias pkgupd 'pacman -Syyu'
-    alias pkgclean 'paccache -k 0 -r'
-    alias confnew 'find /etc -type f -name "*.pacnew"'
-  else
-    alias pkgadd 'sudo pacman -S'
-    alias pkgrm 'sudo pacman -Rs'
-    alias pkgupd 'sudo pacman -Syyu'
-    alias pkgclean 'sudo paccache -k 0 -r'
-    alias confnew 'sudo find /etc -type f -name "*.pacnew"'
-  end
-
-  function is-installed
-    pacman -Qq $argv &>/dev/null
-  end
-end
-
-# If we have apk 
-
-end
-
-function handle_macos
-
-# If we have Homebrew
-if command -sq brew
-  alias lspkg 'brew list ; echo ; brew info'
-  alias pkginfo 'brew info'
-  alias pkgsearch 'brew search'
-
-  alias pkgadd 'brew install'
-  alias pkgrm 'brew uninstall'
-  alias pkgupd 'brew update ; echo ; brew upgrade'
-end
-
-# If we have MacPorts
-if command -sq port
-  alias lspkg 'port installed'
-  alias lspkgo 'port list rleaves'
-  alias pkginfo 'port info'
-  alias pkgsearch 'port search'
-
-  if fish_is_root_user
-    alias pkgadd 'port install'
-    alias pkgrm 'port uninstall'
-    alias pkgupd 'port upgrade outdated'
-  else
-    alias pkgadd 'sudo port install'
-    alias pkgrm 'sudo port uninstall'
-    alias pkgupd 'sudo port upgrade outdated'
-  end
-end
-
-end
-
-function handle_openbsd
-   alias lspkg 'pkg_info -A'
-   alias lspkgo 'pkg_info -t'
-   alias pkginfo 'pkg_info'
-   alias pkgsearch 'pkg_info -Q'
-
-   if fish_is_root_user
-     alias pkgadd 'pkg_add'
-     alias pkgrm 'pkg_delete'
-     alias pkgupd 'pkg_add -u'
-   else
-     alias pkgadd 'doas pkg_add'
-     alias pkgrm 'doas pkg_delete'
-     alias pkgupd 'doas pkg_add -u'
-   end
-
-end
-
-function handle_netbsd
-
-  alias lspkg 'pkgin list'
-  alias pkginfo 'pkgin pkg-descr'
-  alias pkgsearch 'pkgin search'
-
-  if fish_is_root_user
-    alias pkgadd 'pkgin install'
-    alias pkgrm 'pkgin remove'
-    alias pkgupd 'pkgin upgrade'
-    alias pkgclean 'pkgin clean'
-  else
-    alias pkgadd 'doas pkgin install'
-    alias pkgrm 'doas pkgin remove'
-    alias pkgupd 'doas pkgin upgrade'
-    alias pkgclean 'doas pkgin clean'
-  end
-
-end
-
-function handle_freebsd
-
-  alias pkginfo 'pkg info'
-
-  if fish_is_root_user
-    alias pkgadd 'pkg install'
-    alias pkgrm 'pkg remove'
-    alias pkgupd 'pkg upgrade'
-    alias pkgclean 'pkg clean -a'
-  else
-    alias pkgadd 'doas pkg install'
-    alias pkgrm 'doas pkg remove'
-    alias pkgupd 'doas pkg upgrade'
-    alias pkgclean 'doas pkg clean -a'
-  end
-
-end
-
-switch (uname)
-  case 'Linux'
-    handle_linux
-  case 'Darwin'
-    handle_macos
-  case 'OpenBSD'
-    handle_openbsd
-  case 'NetBSD'
-    handle_netbsd
-  case 'FreeBSD'
-    handle_freebsd
-end
-
-end