Brought the deployer into nixops too

This commit is contained in:
Craige McWhirter 2020-06-23 10:49:45 +10:00
parent 91769ccc79
commit 373d80a455
Signed by: sercanto
GPG key ID: 7DBA9F5689EFB6AA
2 changed files with 5 additions and 7 deletions

View file

@ -15,6 +15,7 @@
airgead = import ../hosts/airgead.nix; airgead = import ../hosts/airgead.nix;
cuallaidh = import ../hosts/cuallaidh.nix; cuallaidh = import ../hosts/cuallaidh.nix;
dionach = import ../hosts/dionach.nix;
iolear-beag = import ../hosts/iolear-beag.nix; iolear-beag = import ../hosts/iolear-beag.nix;
paidh-ceithir = import ../hosts/paidh-ceithir.nix; paidh-ceithir = import ../hosts/paidh-ceithir.nix;
paidh-coig = import ../hosts/paidh-coig.nix; paidh-coig = import ../hosts/paidh-coig.nix;

View file

@ -16,13 +16,17 @@
../roles/nix-community.nix # Nix community aarch64 tooling ../roles/nix-community.nix # Nix community aarch64 tooling
../roles/nix-mio-ops.nix # mio-ops Nix tooling ../roles/nix-mio-ops.nix # mio-ops Nix tooling
../roles/nixpkgs-dev.nix # Nix pkgs dev tools ../roles/nixpkgs-dev.nix # Nix pkgs dev tools
../roles/openssh.nix # Enable and configure openssh
../roles/qemu.nix # Qemu virtualisation ../roles/qemu.nix # Qemu virtualisation
../roles/xmonad.nix # Xmonad desktop environment ../roles/xmonad.nix # Xmonad desktop environment
../roles/yubikey.nix # Yubikey tooling ../roles/yubikey.nix # Yubikey tooling
../secrets/craige.nix # Ssshhhhh! ../secrets/craige.nix # Ssshhhhh!
../secrets/root.nix # Swshhhhh!
../secrets/wireless.nix # Hey look! A squirrel! ../secrets/wireless.nix # Hey look! A squirrel!
]; ];
deployment.targetHost = "localhost";
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
@ -30,11 +34,6 @@
]; ];
}; };
nix.nixPath = [
"nixpkgs=https://nixos.org/channels/nixos-20.03/nixexprs.tar.xz"
"nixos-config=/etc/nixos/configuration.nix"
];
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2; boot.loader.grub.version = 2;
@ -209,7 +208,5 @@
# servers. You should change this only after NixOS release notes say you # servers. You should change this only after NixOS release notes say you
# should. # should.
system.stateVersion = "18.03"; # Did you read the comment? system.stateVersion = "18.03"; # Did you read the comment?
system.autoUpgrade.enable = true;
system.autoUpgrade.channel = https://nixos.org/channels/nixos-20.03;
} }