Merge pull request #688 from Enzime/add/template

flake: add template with basic flake config

2 files changed, 46 insertions, 31 deletions

diff --git a/modules/examples/flake.nix b/modules/examples/flake.nix
deleted file mode 100644
index 2c5f90e..0000000
--- a/modules/examples/flake.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  description = "Example darwin system flake";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs";
-    darwin.url = "github:lnl7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  outputs = { self, darwin, nixpkgs }:
-  let
-    configuration = { pkgs, ... }: {
-      nix.package = pkgs.nixVersions.stable;
-
-      # FIXME: for github actions, this shouldn't be in the example.
-      services.nix-daemon.enable = true;
-    };
-  in
-  {
-    # Build darwin flake using:
-    # $ darwin-rebuild build --flake ./modules/examples#simple \
-    #       --override-input darwin .
-    darwinConfigurations."simple" = darwin.lib.darwinSystem {
-      modules = [ configuration darwin.darwinModules.simple ];
-      system = "x86_64-darwin";
-    };
-
-    # Expose the package set, including overlays, for convenience.
-    darwinPackages = self.darwinConfigurations."simple".pkgs;
-  };
-}
diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix
new file mode 100644
index 0000000..0ada852
--- /dev/null
+++ b/modules/examples/flake/flake.nix
@@ -0,0 +1,46 @@
+{
+  description = "Example darwin system flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs";
+    darwin.url = "github:lnl7/nix-darwin";
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = { self, darwin, nixpkgs }:
+  let
+    configuration = { pkgs, ... }: {
+      # List packages installed in system profile. To search by name, run:
+      # $ nix-env -qaP | grep wget
+      environment.systemPackages =
+        [ pkgs.vim
+        ];
+
+      # Auto upgrade nix package and the daemon service.
+      services.nix-daemon.enable = true;
+      # nix.package = pkgs.nix;
+
+      # Necessary for using flakes on this system.
+      nix.settings.experimental-features = "nix-command flakes";
+
+      # Create /etc/zshrc that loads the nix-darwin environment.
+      programs.zsh.enable = true;  # default shell on catalina
+      # programs.fish.enable = true;
+
+      # Used for backwards compatibility, please read the changelog before changing.
+      # $ darwin-rebuild changelog
+      system.stateVersion = 4;
+    };
+  in
+  {
+    # Build darwin flake using:
+    # $ darwin-rebuild build --flake .#simple
+    darwinConfigurations."simple" = darwin.lib.darwinSystem {
+      modules = [ configuration ];
+      system = "x86_64-darwin";
+    };
+
+    # Expose the package set, including overlays, for convenience.
+    darwinPackages = self.darwinConfigurations."simple".pkgs;
+  };
+}