diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-16 12:21:47 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-16 12:27:36 +0100 |
commit | ea9d3f4ba1cfcab0eeb9cb719fc8065d38c3bb53 (patch) | |
tree | d3b420c6037fba0a7a40c48fba548bf256d7c225 | |
parent | 210cb688796aed2fb460cd8e81e24777f4779b9c (diff) | |
download | Nix-ea9d3f4ba1cfcab0eeb9cb719fc8065d38c3bb53.tar.gz Nix-ea9d3f4ba1cfcab0eeb9cb719fc8065d38c3bb53.tar.zst Nix-ea9d3f4ba1cfcab0eeb9cb719fc8065d38c3bb53.zip |
Add config dir to be linked to ~/.config/nixpkgs
-rw-r--r-- | config/README.md | 1 | ||||
-rw-r--r-- | config/config.nix | 13 | ||||
l--------- | config/nixRoot | 1 | ||||
-rw-r--r-- | default.nix | 1 | ||||
-rwxr-xr-x | scripts/make-env | 3 |
5 files changed, 19 insertions, 0 deletions
diff --git a/config/README.md b/config/README.md new file mode 100644 index 0000000..542f31e --- /dev/null +++ b/config/README.md | |||
@@ -0,0 +1 @@ | |||
Link this directory to ~/.config/nixpkgs | |||
diff --git a/config/config.nix b/config/config.nix new file mode 100644 index 0000000..0b57835 --- /dev/null +++ b/config/config.nix | |||
@@ -0,0 +1,13 @@ | |||
1 | { | ||
2 | packageOverrides = pkgs: with pkgs; { | ||
3 | # buildEnv is not absolutely equivalent to | ||
4 | # `nix-env -i -f ./nixRoot/default.nix`, see | ||
5 | # https://github.com/NixOS/nix/issues/2682 | ||
6 | immaePackages = pkgs.buildEnv { | ||
7 | name = "Immae-packages"; | ||
8 | paths = builtins.attrValues (import ./nixRoot/default.nix); | ||
9 | pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"]; | ||
10 | extraOutputsToInstall = [ "bin" "man" "doc" "info" ]; | ||
11 | }; | ||
12 | }; | ||
13 | } | ||
diff --git a/config/nixRoot b/config/nixRoot new file mode 120000 index 0000000..a96aa0e --- /dev/null +++ b/config/nixRoot | |||
@@ -0,0 +1 @@ | |||
.. \ No newline at end of file | |||
diff --git a/default.nix b/default.nix index beb10b8..538ffaa 100644 --- a/default.nix +++ b/default.nix | |||
@@ -365,6 +365,7 @@ in | |||
365 | inherit nixops; | 365 | inherit nixops; |
366 | inherit urlview; | 366 | inherit urlview; |
367 | inherit rr; | 367 | inherit rr; |
368 | inherit nix-zsh-completions; | ||
368 | stgit = gitAndTools.stgit; | 369 | stgit = gitAndTools.stgit; |
369 | # todo: lx* ?, unrar, unzip, zeromq? | 370 | # todo: lx* ?, unrar, unzip, zeromq? |
370 | #inherit nextcloud-client; | 371 | #inherit nextcloud-client; |
diff --git a/scripts/make-env b/scripts/make-env new file mode 100755 index 0000000..d374c31 --- /dev/null +++ b/scripts/make-env | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | nix-env -r -i -A immaePackages -f "<nixpkgs>" | ||