From e8776c93cf2d2106c3a0a25125d41edf0d81b584 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sun, 10 Jan 2021 16:38:12 -0500
Subject: [PATCH] move home-manager nix from ~/.config/nixpkgs to ~/nix

---
 .config/nixpkgs/config.nix                     |  1 -
 README.md                                      | 10 ++++++++++
 {.config/nixpkgs => nix}/home.nix              |  2 ++
 nix/overlays/default.nix                       |  7 +++++++
 {.config/nixpkgs => nix}/overlays/lastpass.nix |  0
 {.config/nixpkgs => nix}/overlays/rfd.nix      |  0
 {.config/nixpkgs => nix}/packages.nix          |  3 +++
 7 files changed, 22 insertions(+), 1 deletion(-)
 delete mode 100644 .config/nixpkgs/config.nix
 rename {.config/nixpkgs => nix}/home.nix (99%)
 create mode 100644 nix/overlays/default.nix
 rename {.config/nixpkgs => nix}/overlays/lastpass.nix (100%)
 rename {.config/nixpkgs => nix}/overlays/rfd.nix (100%)
 rename {.config/nixpkgs => nix}/packages.nix (98%)

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
deleted file mode 100644
index 69baf10..0000000
--- a/.config/nixpkgs/config.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ allowUnfree = true; }
diff --git a/README.md b/README.md
index 36dce17..f02f7c2 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@ This repo stores nix expressions and other configuration.
 
 ## Setup
 
+## git
+
 Clone this as a bare repo to avoid the need for symlinking:
 
 ```console
@@ -14,3 +16,11 @@ $ alias config='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' # add alias to
 $ config config --local status.showUntrackedFiles no
 $ config checkout -f # this will overwrite any existing configs in the home directory
 ```
+
+## home manager
+
+Install [nix](https://nixos.org/guides/install-nix.html) and [home-manager](https://github.com/nix-community/home-manager).
+
+```console
+$ home-manager -f ~/nix/home.nix switch 
+```
diff --git a/.config/nixpkgs/home.nix b/nix/home.nix
similarity index 99%
rename from .config/nixpkgs/home.nix
rename to nix/home.nix
index fccc9b8..d76ff91 100644
--- a/.config/nixpkgs/home.nix
+++ b/nix/home.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }:
 
 {
+  nixpkgs.overlays = import ./overlays { inherit pkgs; };
+  nixpkgs.config.allowUnfree = true;
 
   home = {
     sessionVariables = {
diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
new file mode 100644
index 0000000..2bf4547
--- /dev/null
+++ b/nix/overlays/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+[
+  (import ./rfd.nix)
+  (import ./lastpass.nix)
+]
+
diff --git a/.config/nixpkgs/overlays/lastpass.nix b/nix/overlays/lastpass.nix
similarity index 100%
rename from .config/nixpkgs/overlays/lastpass.nix
rename to nix/overlays/lastpass.nix
diff --git a/.config/nixpkgs/overlays/rfd.nix b/nix/overlays/rfd.nix
similarity index 100%
rename from .config/nixpkgs/overlays/rfd.nix
rename to nix/overlays/rfd.nix
diff --git a/.config/nixpkgs/packages.nix b/nix/packages.nix
similarity index 98%
rename from .config/nixpkgs/packages.nix
rename to nix/packages.nix
index 083c2b3..fcc5e7c 100644
--- a/.config/nixpkgs/packages.nix
+++ b/nix/packages.nix
@@ -19,6 +19,9 @@ with pkgs; [
   unzip
   zip
 
+  # education
+  anki
+
   # monitoring
   htop