From 5a179b4410a8b5c0e00f47c2b3798c8d9f62d8d1 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 5 Oct 2019 19:43:32 +0200
Subject: Move darwin configuration to user

---
 system/trillian.nix     | 47 -----------------------------------------------
 user/modules/darwin.nix | 44 ++++++++++++++++++++++++++++++++++++++++++++
 user/trillian.nix       |  4 +---
 3 files changed, 45 insertions(+), 50 deletions(-)
 create mode 100644 user/modules/darwin.nix

diff --git a/system/trillian.nix b/system/trillian.nix
index 3fdd775e..73093c99 100644
--- a/system/trillian.nix
+++ b/system/trillian.nix
@@ -21,16 +21,6 @@
     ];
   };
 
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep  wget
-  environment.systemPackages = with pkgs;
-    [
-      mosh
-      aspell
-      aspellDicts.en
-      darwin-zsh-completions
-    ];
-
   # Use a custom configuration.nix location.
   # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
   # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
@@ -44,11 +34,6 @@
 
   # programs.nix-index.enable = true;
 
-  programs.vim = {
-    enable = true;
-    enableSensible = true;
-  };
-
   programs.zsh.enable = true;
   programs.zsh.enableBashCompletion = true;
 
@@ -68,38 +53,6 @@
   nix.daemonNiceLevel = 10;
   nix.daemonIONice = true;
 
-  nixpkgs.overlays = [
-    (self: super: {
-      darwin-zsh-completions = super.runCommandNoCC "darwin-zsh-completions-0.0.0"
-        { preferLocalBuild = true; }
-        ''
-          mkdir -p $out/share/zsh/site-functions
-          cat <<-'EOF' > $out/share/zsh/site-functions/_darwin-rebuild
-          #compdef darwin-rebuild
-          #autoload
-          _nix-common-options
-          local -a _1st_arguments
-          _1st_arguments=(
-            'switch:Build, activate, and update the current generation'\
-            'build:Build without activating or updating the current generation'\
-            'check:Build and run the activation sanity checks'\
-            'changelog:Show most recent entries in the changelog'\
-          )
-          _arguments \
-            '--list-generations[Print a list of all generations in the active profile]'\
-            '--rollback[Roll back to the previous configuration]'\
-            {--switch-generation,-G}'[Activate specified generation]'\
-            '(--profile-name -p)'{--profile-name,-p}'[Profile to use to track current and previous system configurations]:Profile:_nix_profiles'\
-            '1:: :->subcmds' && return 0
-          case $state in
-            subcmds)
-              _describe -t commands 'darwin-rebuild subcommands' _1st_arguments
-            ;;
-          esac
-          EOF
-        '';
-      })
-  ];
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
   system.stateVersion = 4;
diff --git a/user/modules/darwin.nix b/user/modules/darwin.nix
new file mode 100644
index 00000000..e12a2ac4
--- /dev/null
+++ b/user/modules/darwin.nix
@@ -0,0 +1,44 @@
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.overlays = [
+    (self: super: {
+      darwin-zsh-completions = super.runCommandNoCC "darwin-zsh-completions-0.0.0"
+        { preferLocalBuild = true; }
+        ''
+          mkdir -p $out/share/zsh/site-functions
+          cat <<-'EOF' > $out/share/zsh/site-functions/_darwin-rebuild
+          #compdef darwin-rebuild
+          #autoload
+          _nix-common-options
+          local -a _1st_arguments
+          _1st_arguments=(
+            'switch:Build, activate, and update the current generation'\
+            'build:Build without activating or updating the current generation'\
+            'check:Build and run the activation sanity checks'\
+            'changelog:Show most recent entries in the changelog'\
+          )
+          _arguments \
+            '--list-generations[Print a list of all generations in the active profile]'\
+            '--rollback[Roll back to the previous configuration]'\
+            {--switch-generation,-G}'[Activate specified generation]'\
+            '(--profile-name -p)'{--profile-name,-p}'[Profile to use to track current and previous system configurations]:Profile:_nix_profiles'\
+            '1:: :->subcmds' && return 0
+          case $state in
+            subcmds)
+              _describe -t commands 'darwin-rebuild subcommands' _1st_arguments
+            ;;
+          esac
+          EOF
+        '';
+      })
+  ];
+  home.packages = with pkgs; [
+      aspell
+      aspellDicts.en
+      darwin-zsh-completions
+  ];
+
+  # Use GPG from  GPGTools
+  programs.git.signing.gpgPath = "/usr/local/bin/gpg";
+}
diff --git a/user/trillian.nix b/user/trillian.nix
index 6df22f67..f8616e51 100644
--- a/user/trillian.nix
+++ b/user/trillian.nix
@@ -4,6 +4,7 @@
   imports = [
     ./modules/base.nix
     ./modules/development/base.nix
+    ./modules/darwin.nix
     ./modules/emacs.nix
     ./modules/git.nix
     ./modules/gnupg.nix
@@ -14,7 +15,4 @@
     ./modules/trezor.nix
     ./modules/zsh.nix
   ];
-
-  # Use GPG from  GPGTools
-  programs.git.signing.gpgPath = "/usr/local/bin/gpg";
 }
-- 
cgit 1.4.1