From d3b5e93217d4f782ce73ed23ed844b5ac0c7d704 Mon Sep 17 00:00:00 2001
From: Victor <victor@xirion.net>
Date: Sun, 17 Oct 2021 13:00:47 +0200
Subject: [PATCH] finished template lxc config

---
 common/generic-lxc.nix   |  5 -----
 common/users/default.nix |  8 ++++----
 flake.lock               | 12 +++++++-----
 flake.nix                |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/common/generic-lxc.nix b/common/generic-lxc.nix
index c492b91d..8de709a5 100644
--- a/common/generic-lxc.nix
+++ b/common/generic-lxc.nix
@@ -1,11 +1,6 @@
 { ... }: {
   # See also: https://blog.xirion.net/posts/nixos-proxmox-lxc/
 
-  # Import nixos lxc config
-  imports = [
-    <nixpkgs/nixos/modules/virtualisation/lxc-container.nix>
-  ];
-
   # Supress systemd services that don't work (correctly) on LXC
   systemd.suppressedSystemUnits = [
     "dev-mqueue.mount"
diff --git a/common/users/default.nix b/common/users/default.nix
index c685da99..e087dd11 100644
--- a/common/users/default.nix
+++ b/common/users/default.nix
@@ -36,9 +36,9 @@
 
     # My SSH keys.
     openssh.authorizedKeys.keys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDC3alaexJkUAi/81weIGGTNrkRf+x0UT0wTWNENOc8bakmgzPg0STopCwHYAHoNHDC1dorVpVfCqWsAx9ta9KOCvqo3BS7rOWlASSna2fejvnNZAy6yzdvWq8Bclg7U40ic8ubnLw7l9nompHk7kzwVN6a6wqVfM5aefEXpaE4rlXu56yF81RR1TaWMnTvD7JMzyeDHt29DPdw+/ivOy3SXC8lUOukQLycNYduBO911gegkKH7mRNrqgYCuV6PF38CZPAhboC0JbpMKsiHInfY6iTrST035JIuVfEG0oRlW7BSsSfafPBlstyvf63mjjCJ13/47PyvkxWB47UYtYUjtQvrlzQtGlxyljyARL6x6RC6WY2Hluej4kWRVrJNRtDZAx+AeYa2jgUeD+RWPUQuXYLXs+0F1A7/y/m3FiuBMpB6neptX/jRY7aI1XDZiO23Pyui0pCsl9c8PQFltwvL1N32miRGhA/2DPhrKgpLRcRNglwRPZSkc+3er1cuUrs= victor@eevee"
-      "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAjJmG5W+uO+KTOmzknOfzkjbCtOCpO9tSxLN2BG6hxCsKPN1U31WDiajeHrZFselpWG80710Ne3wAlWduU3aUTeXdms0N99F7CbIFHXRqU0aEu4FN3WDuv0bRLoc+Ern9V7R4DvtxyNFd66yLzvzfT2/0nudiIkWV6W8qF4W6wJF+/TVTYcwZzVTBfpqUG9LMyMB1e6c0DYISmIGT0Q5s0sb2Hrs5Xa2Q7vgAevHJJzPojGQ+zcK/nHos4/glnDGoj9iyj55zB48LycLxjpFL9GAZfBZPi0SXVRy3gEVPkeger0e4OSumYiEbZhcV3MdtffSIHmq3ehgXi0FyBeMhsw== victor@xirion.net"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMbdjysLnmwJD5Fs/SjBPstdIQNUxy8zFHP0GlhHMJB victor@bastion"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFuxekX5WzX4GjbshtjaGyQcvMUgClugnK6T+OYIxw9 victor@null"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC8llUcEBHsLqotFZc++LNP2fjItuuzeUsu5ObXecYNj victor@eevee"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBhJAp7NWlHgwDYd2z6VNROy5RkeZHRINFLsFvwT4b3 victor@bastion"
     ];
 
     # Make me admin
@@ -59,7 +59,7 @@
     git
     htop
     rsync
-    neovim
+    vim
     zoxide
   ];
 }
diff --git a/flake.lock b/flake.lock
index da306925..fd94c0ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,16 +54,18 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1634139026,
-        "narHash": "sha256-RSRz6cBOkhhXTmhEN7bz3u/DhKoO0P1OWbCEbDFmbi4=",
+        "lastModified": 1634384442,
+        "narHash": "sha256-MhfbUuaFVKH8tX33YeSPu0wQGeK9qDJY+4J3qT8VTSo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f1220d72a3a06b0fbac1999b5c8a097d1d10cc0f",
+        "rev": "0478f8b360288a4be8c71bf11e42fcaf09b8b773",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index a22cdf94..00c31f48 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
 
     nixosConfigurations.template = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [ ./hosts/template/configuration.nix ];
+      modules = [ "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" ./hosts/template/configuration.nix ];
     };
 
     deploy.nodes.bastion = {