summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
m---------nixpkgs0
-rw-r--r--nixpkgs.nix7
-rw-r--r--ymir.nix1
4 files changed, 12 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 7c47ad8f..df0f354a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,7 @@
19[submodule "musnix"] 19[submodule "musnix"]
20 path = musnix 20 path = musnix
21 url = git://github.com/musnix/musnix.git 21 url = git://github.com/musnix/musnix.git
22[submodule "nixpkgs"]
23 path = nixpkgs
24 url = github.com:pngwjpgh/nixpkgs
25 branch = live
diff --git a/nixpkgs b/nixpkgs
new file mode 160000
Subproject e8e46c74fdb37fa8d56f4cf45126050c02e9b92
diff --git a/nixpkgs.nix b/nixpkgs.nix
new file mode 100644
index 00000000..34bd0a39
--- /dev/null
+++ b/nixpkgs.nix
@@ -0,0 +1,7 @@
1{ config, pkgs, lib, ... }:
2
3{
4 config = {
5 nixpkgs.pkgs = import ./nixpkgs { inherit (config.nixpkgs) config overlays system; };
6 };
7}
diff --git a/ymir.nix b/ymir.nix
index c3cb93e7..efd41ce5 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -34,6 +34,7 @@ let
34in rec { 34in rec {
35 imports = 35 imports =
36 [ 36 [
37 ./nixpkgs.nix
37 ./ymir/hw.nix 38 ./ymir/hw.nix
38 ./ymir/mlmmj-expose.nix 39 ./ymir/mlmmj-expose.nix
39 ./custom/zsh.nix 40 ./custom/zsh.nix