From 0ff416af71b6a1f10e5a9e5df678d29c92b87374 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 5 Jan 2022 16:59:52 -0500
Subject: [PATCH] remove nixpkgs from server system builds

---
 flake.nix                    | 7 ++++++-
 modules/cli/default.nix      | 5 -----
 modules/profiles/desktop.nix | 5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1cfa686..8445122 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,12 @@
         [ "x86_64-linux" "aarch64-linux" ]);
 
       pins = {
-        nix.registry.nixpkgs.flake = nixpkgs;
+        nix.registry.nixpkgs.to = {
+          inherit (nixpkgs) rev;
+          owner = "NixOS";
+          repo = "nixpkgs";
+          type = "github";
+        };
         nix.registry.bck.to = {
           owner = "buckley310";
           repo = "nixos-config";
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 1579358..cdeda76 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -37,8 +37,6 @@
     whois
     zip
 
-    (writeShellScriptBin "nr" "nix repl '${pkgs.path}'")
-
     (writeShellScriptBin "dirt" "while sleep 1; do grep '^Dirty:' /proc/meminfo ; done")
 
     (writeShellScriptBin "nix-roots" "nix-store --gc --print-roots | grep -v ^/proc/")
@@ -62,9 +60,6 @@
 
   ];
 
-  environment.etc.nixpkgs.source = pkgs.path;
-  nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
-
   programs.bcc.enable = true;
 
   programs.htop = {
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index 2b69957..84a0a4e 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -10,6 +10,9 @@ with lib;
 
     fonts.fonts = [ pkgs.bck-nerdfont ];
 
+    environment.etc.nixpkgs.source = pkgs.path;
+    nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
+
     environment.systemPackages = with pkgs; [
       brave
       chromium
@@ -27,6 +30,8 @@ with lib;
       tdesktop
       youtube-dl
 
+      (writeShellScriptBin "nr" "nix repl ${pkgs.path}")
+
       (mpv-with-scripts.override { scripts = [ mpvScripts.mpris ]; })
 
       (vscode-with-extensions.override {