From 373d80a455caa069943d553aaa13847f84a06946 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Tue, 23 Jun 2020 10:49:45 +1000 Subject: [PATCH] Brought the deployer into nixops too --- deployments/mio-ops.nix | 1 + hosts/dionach.nix | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/deployments/mio-ops.nix b/deployments/mio-ops.nix index 4f801f9..b6fa270 100644 --- a/deployments/mio-ops.nix +++ b/deployments/mio-ops.nix @@ -15,6 +15,7 @@ airgead = import ../hosts/airgead.nix; cuallaidh = import ../hosts/cuallaidh.nix; + dionach = import ../hosts/dionach.nix; iolear-beag = import ../hosts/iolear-beag.nix; paidh-ceithir = import ../hosts/paidh-ceithir.nix; paidh-coig = import ../hosts/paidh-coig.nix; diff --git a/hosts/dionach.nix b/hosts/dionach.nix index 761f24b..2dc22ef 100644 --- a/hosts/dionach.nix +++ b/hosts/dionach.nix @@ -16,13 +16,17 @@ ../roles/nix-community.nix # Nix community aarch64 tooling ../roles/nix-mio-ops.nix # mio-ops Nix tooling ../roles/nixpkgs-dev.nix # Nix pkgs dev tools + ../roles/openssh.nix # Enable and configure openssh ../roles/qemu.nix # Qemu virtualisation ../roles/xmonad.nix # Xmonad desktop environment ../roles/yubikey.nix # Yubikey tooling ../secrets/craige.nix # Ssshhhhh! + ../secrets/root.nix # Swshhhhh! ../secrets/wireless.nix # Hey look! A squirrel! ]; + deployment.targetHost = "localhost"; + nixpkgs.config = { allowUnfree = true; 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. boot.loader.grub.enable = true; boot.loader.grub.version = 2; @@ -209,7 +208,5 @@ # servers. You should change this only after NixOS release notes say you # should. system.stateVersion = "18.03"; # Did you read the comment? - system.autoUpgrade.enable = true; - system.autoUpgrade.channel = https://nixos.org/channels/nixos-20.03; }