From e88fed18f499a3e8ac98c772bbb62f00d1f8d1d7 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sun, 9 Jan 2022 08:09:39 +0100
Subject: use flakes instead of niv & stuff
---
hosts/chaski/configuration.nix | 9 ++++++---
hosts/chaski/services/uplcg.nix | 12 +++---------
hosts/chaski/services/woitb.nix | 10 ++--------
hosts/flora/configuration.nix | 4 ----
hosts/flora/hardware-configuration.nix | 4 ++--
hosts/flora/services/blog.nix | 4 ++--
hosts/flora/services/pleroma.nix | 5 ++---
7 files changed, 17 insertions(+), 31 deletions(-)
(limited to 'hosts')
diff --git a/hosts/chaski/configuration.nix b/hosts/chaski/configuration.nix
index 55289dd..ae422cf 100644
--- a/hosts/chaski/configuration.nix
+++ b/hosts/chaski/configuration.nix
@@ -17,9 +17,12 @@
./services/gtfs.nix
];
- hexchen.deploy = {
- ssh.host = "chaski";
- };
+ networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+ services.nginx.appendHttpConfig = ''
+ access_log off;
+ add_header Permissions-Policy "interest-cohort=()";
+ '';
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
diff --git a/hosts/chaski/services/uplcg.nix b/hosts/chaski/services/uplcg.nix
index fa59528..5605046 100644
--- a/hosts/chaski/services/uplcg.nix
+++ b/hosts/chaski/services/uplcg.nix
@@ -1,15 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
-let
- #sources = import ../../../nix/sources.nix;
- uplcg-nix = fetchGit {
- url = "https://stuebinm.eu/git/uplcg";
- rev = "8c19e63eb67093f960be060f08a873a9d696d226";
- };
-in
{
imports = [
- "${uplcg-nix.outPath}/module.nix"
+ "${inputs.uplcg.outPath}/module.nix"
];
services.uplcg = {
@@ -18,6 +11,7 @@ in
domain = "0.0.0.0";
};
+ services.nginx.enable = true;
services.nginx.virtualHosts."cards.stuebinm.eu" = {
locations."/" = {
proxyPass = "http://localhost:9080";
diff --git a/hosts/chaski/services/woitb.nix b/hosts/chaski/services/woitb.nix
index a2d64a0..0c50617 100644
--- a/hosts/chaski/services/woitb.nix
+++ b/hosts/chaski/services/woitb.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
let
#sources = ../../nix/sources.nix;
@@ -26,13 +26,7 @@ in
services.nginx.virtualHosts."track.ilztal.live" = {
enableACME = true;
forceSSL = true;
- locations."/".root = pkgs.copyPathToStore /home/stuebinm/Dokumente/utils/tracktrain;
+ locations."/".root = inputs.tracktrain;
};
- networking.firewall.allowedTCPPorts = [ 80 443 ];
-
- services.nginx.appendHttpConfig = ''
- access_log off;
- add_header Permissions-Policy "interest-cohort=()";
- '';
}
diff --git a/hosts/flora/configuration.nix b/hosts/flora/configuration.nix
index 5bdc18a..b2699b7 100644
--- a/hosts/flora/configuration.nix
+++ b/hosts/flora/configuration.nix
@@ -19,10 +19,6 @@
boot.loader.grub.version = 2;
boot.loader.grub.devices = [ "/dev/sda" ];
- hexchen.deploy = {
- ssh.host = "flora";
- };
-
networking = {
hostName = "flora";
diff --git a/hosts/flora/hardware-configuration.nix b/hosts/flora/hardware-configuration.nix
index faac1af..2ce21f4 100644
--- a/hosts/flora/hardware-configuration.nix
+++ b/hosts/flora/hardware-configuration.nix
@@ -1,11 +1,11 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ modulesPath, config, lib, pkgs, inputs, ... }:
{
imports =
- [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+ [ "${modulesPath}/profiles/qemu-guest.nix"
];
boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "xhci_pci" "sd_mod" "sr_mod" ];
diff --git a/hosts/flora/services/blog.nix b/hosts/flora/services/blog.nix
index 428b3fb..056a63b 100644
--- a/hosts/flora/services/blog.nix
+++ b/hosts/flora/services/blog.nix
@@ -1,9 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
{
services.nginx.virtualHosts."stuebinm.eu" = {
enableACME = true;
forceSSL = true;
- locations."/".root = (import /home/stuebinm/Dokumente/blog);
+ locations."/".root = (import inputs.blog);
};
}
diff --git a/hosts/flora/services/pleroma.nix b/hosts/flora/services/pleroma.nix
index fca9d65..e93e553 100644
--- a/hosts/flora/services/pleroma.nix
+++ b/hosts/flora/services/pleroma.nix
@@ -1,8 +1,7 @@
-{config, pkgs, ...}:
+{config, pkgs, inputs, ...}:
let
- sources = import ../../../nix/sources.nix;
domain = "pleroma.stuebinm.eu";
in
{
@@ -30,7 +29,7 @@ in
enable = true;
- package = (import sources.nixpkgs-unstable {}).pleroma;
+ package = (import inputs.nixpkgs-unstable {}).pleroma;
# this is barely necessary at this point — all that's
# set in here is the default_signer for joken, and the
--
cgit v1.2.3