Use niv for tracking channel versions

This way the config is actually reproducible without manually
tracking supported nixpkgs states. home-manager is now not installed
environment-wide anymore but only available inside a nix-shell.

8 files changed, 262 insertions, 40 deletions

diff --git a/custom.nix b/custom.nix
index 272fc6a..918460a 100644
--- a/custom.nix
+++ b/custom.nix
@@ -46,13 +46,5 @@ in {
         };
       });
     };
-
-    pkgs = mkOption {
-      type = types.attrs;
-    };
-
-    nixpkgs-unstable = mkOption {
-      type = types.attrs;
-    };
   };
 }
diff --git a/gui/apps/web.nix b/gui/apps/web.nix
index 5b85ba5..eab7dbd 100644
--- a/gui/apps/web.nix
+++ b/gui/apps/web.nix
@@ -1,11 +1,11 @@
-{ config, pkgs, ... }:
+{ config, pkgs, pkgs-unstable, ... }:
 
 {
   home = {
     packages = (with pkgs; [
       thunderbird
       tdesktop
-    ]) ++ (with config.custom.nixpkgs-unstable; [
+    ]) ++ (with pkgs-unstable; [
       zotero
     ]);
   };
diff --git a/gui/emacs.nix b/gui/emacs.nix
index ce5912b..a0cd3bd 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -1,6 +1,11 @@
-{ config, pkgs, ... }:
+{ config, pkgs, sources, ... }:
 
-{
+let
+  pkgs-unstable = import sources.nixpkgs-unstable {
+    overlays = [ (import sources.emacs-overlay) ];
+  };
+
+in {
   programs.emacs = let
     akr-color-theme = pkgs.stdenv.mkDerivation {
       name = "emacs-color-theme-akr";
@@ -44,27 +49,18 @@
   in {
     enable = true;
 
-    package = let
-      pkgs-unstable = import <nixpkgs-unstable> {
-        overlays = [
-          (import (builtins.fetchTarball {
-            url = https://github.com/nix-community/emacs-overlay/archive/c10d59874dfa8341237702bce514a763198770c4.tar.gz;
-          }))
-        ];
-      };
-    in
-      pkgs-unstable.emacsWithPackagesFromUsePackage {
-        config = ./conf/init.el;
-        package = pkgs-unstable.emacsGcc;
-        extraEmacsPackages = epkgs: with epkgs.melpaPackages; [
-          pdf-tools
-          mu4e-alert
-        ] ++ [
-          akr-color-theme
-          custom-runtime-env
-          pkgs.mu
-        ];
-      };
+    package = pkgs-unstable.emacsWithPackagesFromUsePackage {
+      config = ./conf/init.el;
+      package = pkgs-unstable.emacsGcc;
+      extraEmacsPackages = epkgs: with epkgs.melpaPackages; [
+        pdf-tools
+        mu4e-alert
+      ] ++ [
+        akr-color-theme
+        custom-runtime-env
+        pkgs.mu
+      ];
+    };
   };
 
   home.packages = with pkgs; [
diff --git a/gui/gtk.nix b/gui/gtk.nix
index 2251507..b26a626 100644
--- a/gui/gtk.nix
+++ b/gui/gtk.nix
@@ -1,14 +1,15 @@
-{ config, pkgs, ... }:
+{ config, pkgs, pkgs-personal, ... }:
 
 let
   hidpi = config.custom.hidpi;
+
 in {
   gtk = {
     enable = true;
 
     theme = {
       name = "oomox";
-      package = config.custom.pkgs.oomox-gtk-theme {
+      package = pkgs-personal.oomox-gtk-theme {
         accent_bg  = "aadb0f";
         bg         = "d8d8d8";
         fg         = "101010";
@@ -37,7 +38,7 @@ in {
 
     iconTheme = {
       name    = "oomox-archdroid";
-      package = config.custom.pkgs.oomox-archdroid-icon-theme "909636";
+      package = pkgs-personal.oomox-archdroid-icon-theme "909636";
     };
 
     font = {
diff --git a/home.nix b/home.nix
index 20f9bc9..40f0a2e 100644
--- a/home.nix
+++ b/home.nix
@@ -1,9 +1,16 @@
 { config, pkgs, ... }:
 
-{
-  custom.pkgs = import <mypkgs> { };
-  custom.nixpkgs-unstable = import <nixpkgs-unstable> { };
+let
+  sources = import ./nix/sources.nix;
+  pkgs = import sources.nixpkgs { };
+  pkgs-unstable = import sources.nixpkgs-unstable { };
+  pkgs-personal = import sources.mypkgs { };
 
+in {
+  _module.args.sources = sources;
+  _module.args.pkgs-unstable = pkgs-unstable;
+  _module.args.pkgs-personal = pkgs-personal;
+  
   imports = [
   # define options custom to this config
     ./custom.nix
@@ -18,7 +25,7 @@
     keyboard.layout = "de";
 
     packages = [
-      config.custom.pkgs.persistent-nix-shell
+      pkgs-personal.persistent-nix-shell
     ];
   };
 
diff --git a/nix/sources.json b/nix/sources.json
new file mode 100644
index 0000000..f686121
--- /dev/null
+++ b/nix/sources.json
@@ -0,0 +1,74 @@
+{
+    "emacs-overlay": {
+        "branch": "master",
+        "description": "Bleeding edge emacs overlay [maintainer=@adisbladis] ",
+        "homepage": "",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "13a0bef294ae0fb5aee7f4720717e923aff9764e",
+        "sha256": "06233xil82s82np5jg25ikgijz2d42w5iw4z6hs8wjp41936wgp3",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/13a0bef294ae0fb5aee7f4720717e923aff9764e.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "home-manager": {
+        "branch": "master",
+        "description": "Manage a user environment using Nix",
+        "homepage": "https://rycee.gitlab.io/home-manager/",
+        "owner": "rycee",
+        "repo": "home-manager",
+        "rev": "6cf6b587b575493e7718bf08b209013d7dcf4d58",
+        "sha256": "0666ayxazbphjn5xcrczv8m7k2q62k224fvf0kz1lx9qjn93wkvr",
+        "type": "tarball",
+        "url": "https://github.com/rycee/home-manager/archive/6cf6b587b575493e7718bf08b209013d7dcf4d58.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "mypkgs": {
+        "branch": "master",
+        "description": "Some custom Nix derivations",
+        "homepage": null,
+        "owner": "KnairdA",
+        "repo": "pkgs",
+        "rev": "033e5478036a00b6f1546102532545e50989a422",
+        "sha256": "0bv2708dqrzzfajczclwqdj9rbfpxw72pdg01y0vkc5bmwlj0qlg",
+        "type": "tarball",
+        "url": "https://github.com/KnairdA/pkgs/archive/033e5478036a00b6f1546102532545e50989a422.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "niv": {
+        "branch": "master",
+        "description": "Easy dependency management for Nix projects",
+        "homepage": "https://github.com/nmattia/niv",
+        "owner": "nmattia",
+        "repo": "niv",
+        "rev": "89ae775e9dfc2571f912156dd2f8627e14d4d507",
+        "sha256": "0ssw6byyn79fpyzswi28s5b85x66xh4xsfhmcfl5mkdxxpmyy0ns",
+        "type": "tarball",
+        "url": "https://github.com/nmattia/niv/archive/89ae775e9dfc2571f912156dd2f8627e14d4d507.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs": {
+        "branch": "nixos-20.03",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs-channels",
+        "rev": "feff2fa6659799fe7439038b3eba453d62a16e69",
+        "sha256": "0vlnrwlxl6xf6b8rmiy7as2lhi015nklyj2xdiy3ly8xznq69ll9",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/feff2fa6659799fe7439038b3eba453d62a16e69.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs-unstable": {
+        "branch": "nixpkgs-unstable",
+        "description": "Nix Packages collection",
+        "homepage": null,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ca3fa9c32a45f028f480ab8ec26cc4bd8ce800ad",
+        "sha256": "06brxwypbsp1y2m9ppprkwsjg60jjp6bs2mmx7s8imk32pw86vi9",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/ca3fa9c32a45f028f480ab8ec26cc4bd8ce800ad.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}
diff --git a/nix/sources.nix b/nix/sources.nix
new file mode 100644
index 0000000..8a725cb
--- /dev/null
+++ b/nix/sources.nix
@@ -0,0 +1,134 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: spec:
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; };
+
+  fetch_tarball = pkgs: spec:
+    if spec.builtin or true then
+      builtins_fetchTarball { inherit (spec) url sha256; }
+    else
+      pkgs.fetchzip { inherit (spec) url sha256; };
+
+  fetch_git = spec:
+    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
+
+  fetch_builtin-tarball = spec:
+    builtins.trace
+      ''
+        WARNING:
+          The niv type "builtin-tarball" will soon be deprecated. You should
+          instead use `builtin = true`.
+
+          $ niv modify <package> -a type=tarball -a builtin=true
+      ''
+      builtins_fetchTarball { inherit (spec) url sha256; };
+
+  fetch_builtin-url = spec:
+    builtins.trace
+      ''
+        WARNING:
+          The niv type "builtin-url" will soon be deprecated. You should
+          instead use `builtin = true`.
+
+          $ niv modify <package> -a type=file -a builtin=true
+      ''
+      (builtins_fetchurl { inherit (spec) url sha256; });
+
+  #
+  # Various helpers
+  #
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+      if builtins.hasAttr "nixpkgs" sources
+      then sourcesNixpkgs
+      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+        import <nixpkgs> {}
+      else
+        abort
+          ''
+            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+            add a package called "nixpkgs" to your sources.json.
+          '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs spec
+    else if spec.type == "tarball" then fetch_tarball pkgs spec
+    else if spec.type == "git" then fetch_git spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
+    else if spec.type == "builtin-url" then fetch_builtin-url spec
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchTarball { inherit url; }
+      else
+        fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchurl { inherit url; }
+      else
+        fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs (
+      name: spec:
+        if builtins.hasAttr "outPath" spec
+        then abort
+          "The values in sources.json should not have an 'outPath' attribute"
+        else
+          spec // { outPath = fetch config.pkgs name spec; }
+    ) config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? ./sources.json
+    , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
+    , pkgs ? mkPkgs sources
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+in
+mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..1e28dc1
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,18 @@
+let
+  sources = import ./nix/sources.nix;
+  pkgs = import sources.nixpkgs { };
+
+in pkgs.mkShell rec {
+  name = "home-manager";
+
+  buildInputs = [
+    pkgs.niv
+    (import sources.home-manager { inherit pkgs; }).home-manager
+  ];
+
+  shellHook = ''
+    export NIX_SHELL_NAME="${name}"
+    export NIX_PATH="nixpkgs=${sources.nixpkgs}:home-manager=${sources.home-manager}"
+  '';
+
+}