From cba449c0715d6771d55c518a7235a50a4f32e5da Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Thu, 20 Oct 2022 14:50:57 -0500
Subject: [PATCH 1/4] fix typos

---
 minimal/flake.nix               | 2 +-
 minimal/nixos/configuration.nix | 2 +-
 standard/flake.nix              | 4 ++--
 standard/shell.nix              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/minimal/flake.nix b/minimal/flake.nix
index 68923bc..ea67f24 100644
--- a/minimal/flake.nix
+++ b/minimal/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "You new nix config";
+  description = "Your new nix config";
 
   inputs = {
     # Nixpkgs
diff --git a/minimal/nixos/configuration.nix b/minimal/nixos/configuration.nix
index 27ec31f..8c0c13d 100644
--- a/minimal/nixos/configuration.nix
+++ b/minimal/nixos/configuration.nix
@@ -62,7 +62,7 @@
     };
   };
 
-  # This setups a SSH server. Very important if you're setting up a headless system.
+  # This sets up a SSH server. Very important if you're setting up a headless system.
   # Feel free to remove if you don't need it.
   services.openssh = {
     enable = true;
diff --git a/standard/flake.nix b/standard/flake.nix
index c2a970f..4acdfa2 100644
--- a/standard/flake.nix
+++ b/standard/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "You new nix config";
+  description = "Your new nix config";
 
   inputs = {
     # Nixpkgs
@@ -41,7 +41,7 @@
       homeManagerModules = import ./modules/home-manager;
 
       # Devshell for bootstrapping
-      # Acessible through 'nix develop' or 'nix-shell' (legacy)
+      # Accessible through 'nix develop' or 'nix-shell' (legacy)
       devShells = forAllSystems (system: {
         default = legacyPackages.${system}.callPackage ./shell.nix { };
       });
diff --git a/standard/shell.nix b/standard/shell.nix
index 9662b11..0ab6972 100644
--- a/standard/shell.nix
+++ b/standard/shell.nix
@@ -1,6 +1,6 @@
 # Shell for bootstrapping flake-enabled nix and home-manager
 { pkgs ? let
-    # If pkgs is not defined, instanciate nixpkgs from locked commit
+    # If pkgs is not defined, instantiate nixpkgs from locked commit
     lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
     nixpkgs = fetchTarball {
       url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";

From cb4aab0303c112acf4bc81988daa98b51834fc3d Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Thu, 20 Oct 2022 14:51:44 -0500
Subject: [PATCH 2/4] add packages output

---
 standard/flake.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/standard/flake.nix b/standard/flake.nix
index 4acdfa2..f580a97 100644
--- a/standard/flake.nix
+++ b/standard/flake.nix
@@ -63,6 +63,14 @@
         }
       );
 
+      # Export your custom packages
+      # These will be listed in 'nix flake show'
+      packages = forAllSystems (system:
+        import ./pkgs {
+          pkgs = nixpkgs.legacyPackages.${system};
+        }
+      );
+
       nixosConfigurations = {
         # FIXME replace with your hostname
         your-hostname = nixpkgs.lib.nixosSystem {

From 8d50f3d6be9c6b72c3cf5414fe8b9e8572566265 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Thu, 20 Oct 2022 14:55:58 -0500
Subject: [PATCH 3/4] use the same pkgs in nix-shell and devShell

---
 standard/flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/standard/flake.nix b/standard/flake.nix
index f580a97..0eaa9b1 100644
--- a/standard/flake.nix
+++ b/standard/flake.nix
@@ -43,7 +43,7 @@
       # Devshell for bootstrapping
       # Accessible through 'nix develop' or 'nix-shell' (legacy)
       devShells = forAllSystems (system: {
-        default = legacyPackages.${system}.callPackage ./shell.nix { };
+        default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { };
       });
 
       # This instantiates nixpkgs for each system listed above

From 1007c65057e97c501c9943ad8f4e6d2e7757223f Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Sat, 22 Oct 2022 15:26:34 -0500
Subject: [PATCH 4/4] Revert "add packages output"

This reverts commit cb4aab0303c112acf4bc81988daa98b51834fc3d.
---
 standard/flake.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/standard/flake.nix b/standard/flake.nix
index 0eaa9b1..8ee6946 100644
--- a/standard/flake.nix
+++ b/standard/flake.nix
@@ -63,14 +63,6 @@
         }
       );
 
-      # Export your custom packages
-      # These will be listed in 'nix flake show'
-      packages = forAllSystems (system:
-        import ./pkgs {
-          pkgs = nixpkgs.legacyPackages.${system};
-        }
-      );
-
       nixosConfigurations = {
         # FIXME replace with your hostname
         your-hostname = nixpkgs.lib.nixosSystem {