diff options
author | makefu <github@syntax-fehler.de> | 2017-05-15 22:53:47 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-05-15 22:53:47 +0200 |
commit | 332f1ce23c9a918d3ffef5231e3041cfcc6f35e4 (patch) | |
tree | 5e594bebe40479bf4054a6a91f76d6d5c3bd20d5 /lass/2configs | |
parent | 56116a4dfa7369787c4f09ed2bb8a2cfd3ed976f (diff) | |
parent | a5b18f7d696a1ec628dc2a59cc2c6fe6b685c2f9 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r-- | lass/2configs/mpv.nix | 2 | ||||
-rw-r--r-- | lass/2configs/nixpkgs.nix | 2 | ||||
-rw-r--r-- | lass/2configs/websites/lassulus.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix index d9c6274d..bb068e7a 100644 --- a/lass/2configs/mpv.nix +++ b/lass/2configs/mpv.nix @@ -34,7 +34,7 @@ let down = moveToDir "Y" "./down"; in { - krebs.per-user.lass.packages = [ + environment.systemPackages = [ mpv ]; } diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 86b7d6d2..49c44aa8 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://cgit.lassul.us/nixpkgs; - ref = "11b82a9"; + ref = "2bb9c1c"; }; } diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 9d5f2645..0771570c 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -81,7 +81,7 @@ in { alias ${config.krebs.tinc.retiolum.hostsArchive}; ''; locations."= /retiolum.hosts".extraConfig = '' - alias /etc/hosts; + alias ${pkgs.retiolum-hosts}; ''; locations."/tinc".extraConfig = '' alias ${config.krebs.tinc_graphs.workingDir}/external; |