From a314c048fa42de3ff39f08df465689737aeb1b6d Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Sat, 23 Oct 2021 08:00:32 +0000
Subject: [PATCH] Update to use the new blog flake

---
 configuration.nix          | 20 +++++++++++++++-----
 flake.lock                 |  8 ++++----
 flake.nix                  |  3 ++-
 hardware-configuration.nix |  6 ++++++
 networking.nix             | 33 +++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 hardware-configuration.nix
 create mode 100644 networking.nix

diff --git a/configuration.nix b/configuration.nix
index 15f59dc..146637d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, system, blogPkgs, ... }: {
+{ pkgs, system, builders, ... }: {
   imports = [
     ./hardware-configuration.nix
     ./networking.nix # generated at runtime by nixos-infect
@@ -30,10 +30,20 @@
   services.danilafe-blog = {
     enable = true;
     challengePath = "/var/www/challenges";
-    ssl."danilafe.com" = true;
-    domains."danilafe.com" = blogPkgs.english;
-    domains."drafts.danilafe.com" = blogPkgs."drafts/english"; 
-    domains."drafts.ru.danilafe.com" = blogPkgs."drafts/russian";
+    sites = [
+      (builders.english {
+        ssl = true;
+        host = "danilafe.com";
+      })
+      (builders.english {
+        drafts = true;
+        host = "drafts.danilafe.com";
+      })
+      (builders.russian {
+        drafts = true;
+        host = "drafts.ru.danilafe.com";
+      })
+    ];
   };
 
   users.defaultUserShell = pkgs.zsh;
diff --git a/flake.lock b/flake.lock
index 320559b..53d9cbf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1634969653,
-        "narHash": "sha256-6zZxGi7NbEDOQLfV3PymmFActpsMYZ0oZ5gF7Byg5Yg=",
+        "lastModified": 1634975812,
+        "narHash": "sha256-AjtH47PmytjykH2adeLwI1v7mvQy4BIMi9jVg6uH9To=",
         "ref": "master",
-        "rev": "e1c7fa55ae83c27ccf12b384f21b4ef8a926d777",
-        "revCount": 84,
+        "rev": "540887a5e93267314a357c60d29ecb4beea6bfe5",
+        "revCount": 89,
         "type": "git",
         "url": "https://dev.danilafe.com/DanilaFe/blog-static-flake"
       },
diff --git a/flake.nix b/flake.nix
index b1dba4d..9eb13a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,11 +6,12 @@
   outputs = { self, nixpkgs, blog }:
     let
       system = "x86_64-linux";
+      builders = blog.buildersFor system;
     in  
       {
         nixosConfigurations.nixos-droplet-v2 = nixpkgs.lib.nixosSystem {
 	  inherit system;
-          specialArgs = { inherit system; blogPkgs = blog.packages."${system}"; };
+          specialArgs = { inherit system builders; };
           modules = [ ./configuration.nix blog.nixosModule ];
         };
       };
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
new file mode 100644
index 0000000..d19f13c
--- /dev/null
+++ b/hardware-configuration.nix
@@ -0,0 +1,6 @@
+{ modulesPath, ... }:
+{
+  imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
+  boot.loader.grub.device = "/dev/vda";
+  fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
+}
diff --git a/networking.nix b/networking.nix
new file mode 100644
index 0000000..d249c9b
--- /dev/null
+++ b/networking.nix
@@ -0,0 +1,33 @@
+{ lib, ... }: {
+  # This file was populated at runtime with the networking
+  # details gathered from the active system.
+  networking = {
+    nameservers = [
+      "67.207.67.2"
+      "67.207.67.3"
+    ];
+    defaultGateway = "64.227.48.1";
+    defaultGateway6 = "2604:a880:2:d1::1";
+    dhcpcd.enable = false;
+    usePredictableInterfaceNames = lib.mkForce true;
+    interfaces = {
+      eth0 = {
+        ipv4.addresses = [
+          { address="64.227.53.16"; prefixLength=20; }
+{ address="10.46.0.6"; prefixLength=16; }
+        ];
+        ipv6.addresses = [
+          { address="2604:a880:2:d1::258:c001"; prefixLength=64; }
+{ address="fe80::c431:d0ff:fe78:18c3"; prefixLength=64; }
+        ];
+        ipv4.routes = [ { address = "64.227.48.1"; prefixLength = 32; } ];
+        ipv6.routes = [ { address = "2604:a880:2:d1::1"; prefixLength = 32; } ];
+      };
+      
+    };
+  };
+  services.udev.extraRules = ''
+    ATTR{address}=="c6:31:d0:78:18:c3", NAME="eth0"
+    
+  '';
+}