diff options
author | Kjetil Ørbekk <kj@orbekk.com> | 2019-04-04 16:57:33 -0400 |
---|---|---|
committer | Kjetil Ørbekk <kj@orbekk.com> | 2019-04-04 16:57:33 -0400 |
commit | 4bc68849096bf8e04d99dea7a528c4a062e1b2a6 (patch) | |
tree | 10e9a62d3fc88f8904ed4caf37f709c28c739069 | |
parent | 8cf7a248151ec9514cfb9ac3f14e0b91ae4194ed (diff) |
remove lxc override
-rw-r--r-- | machines/dragon.nix | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/machines/dragon.nix b/machines/dragon.nix index 80380fb..9d0a03c 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -1,13 +1,4 @@ { config, lib, pkgs, ... }: -let - # XXX: Temporary hack because of an accidental database upgrade - lxdNix = import (pkgs.fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "d308ac923376b76183a0b4078f808ce40af8f86b"; - sha256 = "0c08rkchyfbq5d08iifn3dkarwryn1l5yg0pm2x2as2586ir6k9s"; - }) {}; -in { imports = [ ../config/acme-sh.nix @@ -29,11 +20,6 @@ in environment.systemPackages = with pkgs; [ ipmitool ]; - nixpkgs.config.packageOverrides = pkgs: { - lxd = lxdNix.lxd; - lxc = lxdNix.lxc; - }; - programs.mosh.enable = true; virtualisation.lxd.enable = true; @@ -120,6 +106,7 @@ in }; dhcpcd.extraConfig = '' + duid ipv6ra_noautoconf ''; @@ -138,9 +125,6 @@ in # ''; }; - # XXX: temorary hack because of an accidental upgrade. - systemd.services.lxd.serviceConfig.ExecStart = lib.mkForce "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd"; - # Required to enable password authentication for one user. security.pam.services.sshd.unixAuth = lib.mkForce true; services = { |