diff --git a/configs/admin-essentials.nix b/configs/admin-essentials.nix
index 58b75fa..0c97c1e 100644
--- a/configs/admin-essentials.nix
+++ b/configs/admin-essentials.nix
@@ -2,54 +2,55 @@
   pkgs,
   niveumPackages,
   lib,
-  system ? null,
   ...
 }: let
-  darwin = lib.strings.hasSuffix "-darwin" system;
+  darwin = lib.strings.hasSuffix "-darwin" pkgs.system;
 in {
-  environment.systemPackages = [
-    pkgs.htop
-    pkgs.w3m
-    pkgs.wget
-    # ARCHIVE TOOLS
-    pkgs.unzip
-    pkgs.unrar
-    pkgs.p7zip
-    pkgs.zip
-    # MONITORS
-    pkgs.iftop # interface bandwidth monitor
-    pkgs.lsof # list open files
-    # SHELL
-    pkgs.sqlite
-    pkgs.fd # better find
-    pkgs.tree
-    pkgs.parallel # for parallel, since moreutils shadows task spooler
-    pkgs.ripgrep # better grep
-    pkgs.rlwrap
-    pkgs.progress # display progress bars for pipes
-    pkgs.file # determine file type
-    pkgs.gdu # ncurses disk usage (ncdu is broken)
-    pkgs.rmlint # remove duplicate files
-    pkgs.jq # json toolkit
-    pkgs.jless # less(1) for json
-    pkgs.fq # toolkit for yaml, xml and binaries
-    pkgs.bc # calculator
-    pkgs.pari # gp -- better calculator
-    pkgs.ts
-    niveumPackages.vimv
-    niveumPackages.vg
-    niveumPackages.fkill
-    niveumPackages.cyberlocker-tools
-    niveumPackages.untilport
-    niveumPackages.kpaste
-    # HARDWARE
-    pkgs.pciutils # for lspci
-  ] ++ lib.optionals (!darwin) [
-    pkgs.usbutils # for lsusb
-    pkgs.lshw # for lshw
-    pkgs.iotop # I/O load monitor
-    pkgs.psmisc # for killall, pstree
-  ];
+  environment.systemPackages =
+    [
+      pkgs.htop
+      pkgs.w3m
+      pkgs.wget
+      # ARCHIVE TOOLS
+      pkgs.unzip
+      pkgs.unrar
+      pkgs.p7zip
+      pkgs.zip
+      # MONITORS
+      pkgs.iftop # interface bandwidth monitor
+      pkgs.lsof # list open files
+      # SHELL
+      pkgs.sqlite
+      pkgs.fd # better find
+      pkgs.tree
+      pkgs.parallel # for parallel, since moreutils shadows task spooler
+      pkgs.ripgrep # better grep
+      pkgs.rlwrap
+      pkgs.progress # display progress bars for pipes
+      pkgs.file # determine file type
+      pkgs.gdu # ncurses disk usage (ncdu is broken)
+      pkgs.rmlint # remove duplicate files
+      pkgs.jq # json toolkit
+      pkgs.jless # less(1) for json
+      pkgs.fq # toolkit for yaml, xml and binaries
+      pkgs.bc # calculator
+      pkgs.pari # gp -- better calculator
+      pkgs.ts
+      niveumPackages.vimv
+      niveumPackages.vg
+      niveumPackages.fkill
+      niveumPackages.cyberlocker-tools
+      niveumPackages.untilport
+      niveumPackages.kpaste
+      # HARDWARE
+      pkgs.pciutils # for lspci
+    ]
+    ++ lib.optionals (!darwin) [
+      pkgs.usbutils # for lsusb
+      pkgs.lshw # for lshw
+      pkgs.iotop # I/O load monitor
+      pkgs.psmisc # for killall, pstree
+    ];
 
   environment.shellAliases = let
     take = pkgs.writers.writeDash "take" ''
@@ -65,31 +66,37 @@ in {
     where = pkgs.writers.writeDash "where" ''
       readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
     '';
-  in {
-    nixi = "nix repl '<nixpkgs>'";
-    take = "source ${take}";
-    wcd = "source ${wcd}";
-    where = "source ${where}";
-    # temporary files and directories
-    cdt = "source ${cdt}";
-    vit = "$EDITOR $(mktemp)";
-    # file safety
-    mv = "${pkgs.coreutils}/bin/mv --interactive";
-    rm = "${pkgs.coreutils}/bin/rm --interactive";
-    cp = "${pkgs.coreutils}/bin/cp --interactive";
-    # colours
-    cat = "${pkgs.bat}/bin/bat --theme=ansi --style=plain";
-    l = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all";
-    ls = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso";
-    ll = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso -l";
-    la = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all -l";
-  } // (if darwin then {} else {
-    "ß" = "${pkgs.util-linux}/bin/setsid";
-    ip = "${pkgs.iproute2}/bin/ip -c";
-    # systemd
-    s = "${pkgs.systemd}/bin/systemctl";
-    us = "${pkgs.systemd}/bin/systemctl --user";
-    j = "${pkgs.systemd}/bin/journalctl";
-    uj = "${pkgs.systemd}/bin/journalctl --user";
-  });
+  in
+    {
+      nixi = "nix repl '<nixpkgs>'";
+      take = "source ${take}";
+      wcd = "source ${wcd}";
+      where = "source ${where}";
+      # temporary files and directories
+      cdt = "source ${cdt}";
+      vit = "$EDITOR $(mktemp)";
+      # file safety
+      mv = "${pkgs.coreutils}/bin/mv --interactive";
+      rm = "${pkgs.coreutils}/bin/rm --interactive";
+      cp = "${pkgs.coreutils}/bin/cp --interactive";
+      # colours
+      cat = "${pkgs.bat}/bin/bat --theme=ansi --style=plain";
+      l = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all";
+      ls = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso";
+      ll = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso -l";
+      la = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all -l";
+    }
+    // (
+      if darwin
+      then {}
+      else {
+        "ß" = "${pkgs.util-linux}/bin/setsid";
+        ip = "${pkgs.iproute2}/bin/ip -c";
+        # systemd
+        s = "${pkgs.systemd}/bin/systemctl";
+        us = "${pkgs.systemd}/bin/systemctl --user";
+        j = "${pkgs.systemd}/bin/journalctl";
+        uj = "${pkgs.systemd}/bin/journalctl --user";
+      }
+    );
 }
diff --git a/configs/git.nix b/configs/git.nix
index eeecd9d..2b7ba07 100644
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -1,8 +1,6 @@
 {
   pkgs,
-  lib,
   inputs,
-  system ? "x86_64-linux",
   ...
 }: let
   inherit (import ../lib) kieran ignorePaths;
@@ -19,7 +17,7 @@ in {
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
-    inputs.self.packages.${system}.git-preview
+    inputs.self.packages.${pkgs.system}.git-preview
   ];
 
   environment.shellAliases = {