Update to use the new blog flake

This commit is contained in:
Danila Fedorin 2021-10-23 08:00:32 +00:00
parent 126235a023
commit a314c048fa
5 changed files with 60 additions and 10 deletions

View File

@ -1,4 +1,4 @@
{ pkgs, system, blogPkgs, ... }: { { pkgs, system, builders, ... }: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./networking.nix # generated at runtime by nixos-infect ./networking.nix # generated at runtime by nixos-infect
@ -30,10 +30,20 @@
services.danilafe-blog = { services.danilafe-blog = {
enable = true; enable = true;
challengePath = "/var/www/challenges"; challengePath = "/var/www/challenges";
ssl."danilafe.com" = true; sites = [
domains."danilafe.com" = blogPkgs.english; (builders.english {
domains."drafts.danilafe.com" = blogPkgs."drafts/english"; ssl = true;
domains."drafts.ru.danilafe.com" = blogPkgs."drafts/russian"; host = "danilafe.com";
})
(builders.english {
drafts = true;
host = "drafts.danilafe.com";
})
(builders.russian {
drafts = true;
host = "drafts.ru.danilafe.com";
})
];
}; };
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;

View File

@ -8,11 +8,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1634969653, "lastModified": 1634975812,
"narHash": "sha256-6zZxGi7NbEDOQLfV3PymmFActpsMYZ0oZ5gF7Byg5Yg=", "narHash": "sha256-AjtH47PmytjykH2adeLwI1v7mvQy4BIMi9jVg6uH9To=",
"ref": "master", "ref": "master",
"rev": "e1c7fa55ae83c27ccf12b384f21b4ef8a926d777", "rev": "540887a5e93267314a357c60d29ecb4beea6bfe5",
"revCount": 84, "revCount": 89,
"type": "git", "type": "git",
"url": "https://dev.danilafe.com/DanilaFe/blog-static-flake" "url": "https://dev.danilafe.com/DanilaFe/blog-static-flake"
}, },

View File

@ -6,11 +6,12 @@
outputs = { self, nixpkgs, blog }: outputs = { self, nixpkgs, blog }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
builders = blog.buildersFor system;
in in
{ {
nixosConfigurations.nixos-droplet-v2 = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos-droplet-v2 = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit system; blogPkgs = blog.packages."${system}"; }; specialArgs = { inherit system builders; };
modules = [ ./configuration.nix blog.nixosModule ]; modules = [ ./configuration.nix blog.nixosModule ];
}; };
}; };

View File

@ -0,0 +1,6 @@
{ modulesPath, ... }:
{
imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
boot.loader.grub.device = "/dev/vda";
fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
}

33
networking.nix Normal file
View File

@ -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"
'';
}