diff --git a/modules/baseline.nix b/modules/baseline.nix
index 8ba102a..850b0ee 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -1,4 +1,9 @@
 { config, pkgs, ... }:
+let
+  sc-scripts = map
+    (x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake github:buckley310/nixos-config"))
+    [ "switch" "build" "boot" ];
+in
 {
   time.timeZone = "US/Eastern";
   i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" ];
@@ -13,9 +18,14 @@
   nixpkgs.config.allowUnfree = true;
   environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
 
-  environment.systemPackages = map
-    (x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake github:buckley310/nixos-config"))
-    [ "switch" "build" "boot" ];
+  environment.systemPackages = sc-scripts ++ [
+    (pkgs.runCommand "nixpkgs" { } ''
+      mkdir -p $out/share
+      ln -s ${pkgs.path} $out/share/nixpkgs
+    '')
+  ];
+
+  nix.nixPath = [ "nixpkgs=/run/current-system/sw/share/nixpkgs" ];
 
   systemd.tmpfiles.rules = [
     "e /nix/var/log - - - 30d"
diff --git a/modules/cli.nix b/modules/cli.nix
index 37ad2fc..135554b 100644
--- a/modules/cli.nix
+++ b/modules/cli.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, modulesPath, ... }:
+{ config, pkgs, lib, ... }:
 let
   powerlineOpts = [
     "-mode=flat"
@@ -79,15 +79,8 @@ in
       echo
     '')
 
-    (runCommand "nixpkgs" { } ''
-      mkdir -p $out/share
-      ln -s ${modulesPath}/../.. $out/share/nixpkgs
-    '')
-
   ];
 
-  nix.nixPath = [ "nixpkgs=/run/current-system/sw/share/nixpkgs" ];
-
   environment.etc."pip.conf".text = ''
     [install]
     no-warn-script-location = false