From fc765de358827001a4c3a279ce615786b27f60b1 Mon Sep 17 00:00:00 2001
From: Christopher James Hayward <chris@chrishayward.xyz>
Date: Tue, 3 Aug 2021 13:25:14 -0400
Subject: [PATCH] Cleanup the Dockerfile

---
 Dockerfile | 6 ++----
 README.org | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d17a7f8..ebca811 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,8 @@
+# This file is controlled by /etc/dotfiles/README.org
+
 # Derive from the official image.
 FROM nixos/nix
 
-# Add the unstable channel.
-RUN nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs
-RUN nix-channel --update
-
 # Setup the default environment.
 WORKDIR /etc/dotfiles
 COPY . .
diff --git a/README.org b/README.org
index d338238..1797cc3 100644
--- a/README.org
+++ b/README.org
@@ -70,14 +70,12 @@ sudo nixos-rebuild switch --rollback
 
 It's possible to use parts of this configuration using a container. By default, sandboxing is turned /off/ inside of the container, even though it's enabled in new installations. This can lead to differences between derivations built inside containers, versus those built without any containerization. This is especially true if a derivation relies on sandboxing to block sideloading of dependencies.
 
-#+BEGIN_SRC conf :tangle Dockerfile
+#+BEGIN_SRC conf :tangle Dockerfile :noweb yes
+# <<file-warning>>
+
 # Derive from the official image.
 FROM nixos/nix
 
-# Add the unstable channel.
-RUN nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs
-RUN nix-channel --update
-
 # Setup the default environment.
 WORKDIR /etc/dotfiles
 COPY . .