diff --git a/configuration.nix b/configuration.nix
index 01a2112..ec7bd32 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -57,12 +57,6 @@
       '' + builtins.readFile ./dotfiles/zsh-prompt.sh;
       shellInit = builtins.readFile ./dotfiles/zsh-init.sh;
       shellAliases = {
-        nixos-edit = "(cd ~/nixos-config && vim configuration.nix)";
-        nixos-apply = "sudo nixos-rebuild switch --flake ~/nixos-config#$HOST";
-        ls = "ls --group-directories-first --color=auto";
-        ll = "ls -lh";
-        lh = "ll -ab";
-        l = "ls -ab";
         grep = "grep --color=auto";
         egrep = "egrep --color=auto";
         objdump = "objdump -M intel";
diff --git a/dotfiles/zsh-init.sh b/dotfiles/zsh-init.sh
index c13adae..c87ebe2 100644
--- a/dotfiles/zsh-init.sh
+++ b/dotfiles/zsh-init.sh
@@ -68,6 +68,24 @@ fi
 
 # standard functions
 
+function nixos-edit() {
+    (cd ~/nixos-config && vim configuration.nix)
+}
+
+function nixos-apply() {
+    sudo nixos-rebuild switch --flake ~/nixos-config#$HOST "$@"
+}
+
+lsflags=()
+if ls --group-directories-first &>/dev/null; then
+    lsflags+=("--group-directories-first")
+fi
+
+alias ls="ls ${lsflags[@]} --color=auto";
+alias ll="ls -lh";
+alias lh="ll -ab";
+alias l="ls -ab";
+
 # https://stackoverflow.com/questions/6250698/how-to-decode-url-encoded-string-in-shell
 function urldecode() {
     python3 -c "import sys; from urllib.parse import unquote; print(unquote(sys.stdin.read()));"
diff --git a/flake.nix b/flake.nix
index ee9a56e..a64aba2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,7 @@
       forBuildSystem = platform: let
         toBuildSystem = config: config.extendModules { modules = [ { nixpkgs.buildPlatform = platform; } ]; };
         toToplevel = extended: {
+          inherit (extended) config;
           system = extended.config.system.build.toplevel;
         };
         toSystem = name: config: toToplevel (toBuildSystem config);