steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix: set NIX_PATH per device versions at buildtime

Browse source 
Previously all devices would have NIX_PATH set on the common verion file
defindd in *nix/variables/versions.nix*. Now NIX_PATH is populated with
the versions of the respective device.
This commit is contained in:
steveej 2020-10-16 22:31:01 +02:00
parent 3bcf7b0397
commit 522d7279bd
10 changed files with 77 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -1,3 +1,9 @@
{ pkgs }:
let
zshCurried = import ../programs/zsh.nix { inherit pkgs; };
in
{ pkgs
, config
, ... }:
@ -20,7 +26,7 @@ in {
../programs/libreoffice.nix
../programs/neovim.nix
../programs/pass.nix
../programs/zsh.nix
zshCurried
];
nixpkgs.config = {

8
nix/home-manager/configuration/graphical-removable.nix
View file

@ -1,3 +1,9 @@
{ pkgs }:
let
zshCurried = import ../programs/zsh.nix { inherit pkgs; };
in
{ pkgs
, config,
... }:
@ -17,7 +23,7 @@ in {
../programs/libreoffice.nix
../programs/neovim.nix
../programs/pass.nix
../programs/zsh.nix
zshCurried
];
nixpkgs.config = {

8
nix/home-manager/configuration/text-minimal.nix
View file

@ -1,3 +1,9 @@
{ pkgs }:
let
zshCurried = import ../programs/zsh.nix { inherit pkgs; };
in
{ pkgs
, config
, ... }:
@ -9,7 +15,7 @@ in {
../profiles/common.nix
../profiles/nix-channels.nix
../programs/neovim.nix
../programs/zsh.nix
zshCurried
];
nixpkgs.config = {

13
nix/home-manager/programs/zsh.nix
View file

@ -1,13 +1,8 @@
{ pkgs
, config
, ...
}:
{ pkgs }:
{ ... }:
let
channelSources = (import ../../default.nix {
versionsPath = ../../variables/versions.nix;
}).channelSources;
just-plugin =
let
plugin_file = pkgs.writeText "_just" ''
@ -71,7 +66,7 @@ in {
# don't cd into directories when executed
unsetopt AUTO_CD
source ${channelSources}
export NIX_PATH="${pkgs.nixPath}"
# print lines without termination
setopt PROMPT_CR