From f2b95c76172b2e1dae75c89202183d22d79c2cf4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 2 Jul 2023 16:18:47 +0200
Subject: flakes: follow nix-writers

---
 flake.lock | 31 +++++++++++++++++++++++++++----
 flake.nix  | 12 ++++++++++--
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 790ccbeff..88149dfa7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,6 +40,21 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -82,7 +97,12 @@
       }
     },
     "nix-writers": {
-      "flake": false,
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
         "lastModified": 1677612737,
         "narHash": "sha256-UaCKZ4PbMZU6UZH7XNFcjRtd5jheswl66rjZDBfQgp8=",
@@ -134,6 +154,7 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "nix-ld": "nix-ld",
+        "nix-writers": "nix-writers",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix",
@@ -163,14 +184,16 @@
     },
     "stockholm": {
       "inputs": {
-        "nix-writers": "nix-writers",
+        "nix-writers": [
+          "nix-writers"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1686598920,
-        "narHash": "sha256-kLTqf7tiND/siBJUwOPfCQ02HVyOtxju47PNbeU5Ef4=",
+        "lastModified": 1687383477,
+        "narHash": "sha256-o2/aVnTeg+92c06tQjfV+szCTrvqdxF9Tn88Xtd1uhI=",
         "path": "/home/makefu/stockholm-flakes",
         "type": "path"
       },
diff --git a/flake.nix b/flake.nix
index c111ced0a..dff071852 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,8 +23,9 @@
     # stockholm.url = "git+https://cgit.lassul.us/stockholm?ref=flakeify";
     stockholm.url = "path:///home/makefu/stockholm-flakes";
     stockholm.inputs.nixpkgs.follows = "nixpkgs";
+    stockholm.inputs.nix-writers.follows = "nix-writers";
 
-    nix-writers.url = "git+http://cgit.krebsco.de/nix-writers";
+    nix-writers.url = "git+https://cgit.krebsco.de/nix-writers";
     nix-writers.inputs.nixpkgs.follows = "nixpkgs";
 
   };
@@ -42,7 +43,7 @@
           (lib.attrNames (builtins.readDir ./3modules))));
 
     overlays.default = import ./5pkgs/default.nix;
-    nixosConfigurations = lib.genAttrs ["x" "tsp" "wbob" ] (host: nixpkgs.lib.nixosSystem rec {
+    nixosConfigurations = lib.genAttrs ["x" "tsp" "wbob" "omo" "gum"] (host: nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
       specialArgs = {
         inherit (inputs) nixos-hardware self stockholm nixpkgs;
@@ -63,6 +64,11 @@
         sops-nix.nixosModules.sops
         home-manager.nixosModules.default
 
+        stockholm.nixosModules.brockman
+
+        stockholm.nixosModules.exim-retiolum
+        stockholm.nixosModules.exim
+
         stockholm.nixosModules.krebs
         stockholm.nixosModules.hosts
         stockholm.nixosModules.users
@@ -74,6 +80,8 @@
         stockholm.nixosModules.git
         stockholm.nixosModules.tinc
         stockholm.nixosModules.systemd
+        stockholm.nixosModules.setuid
+        stockholm.nixosModules.urlwatch
 
         self.nixosModules.default
         #self.nixosModules.krebs
-- 
cgit v1.2.3