From fa423ae5aa701348558b3f07f76fff9e685494ee Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Thu, 11 Jan 2024 09:58:07 +0100
Subject: [PATCH] am stupid

---
 config/hosts/web02/configuration.nix |  2 +-
 flake.lock                           | 22 ++++------------------
 flake.nix                            | 12 +++++++++---
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/config/hosts/web02/configuration.nix b/config/hosts/web02/configuration.nix
index 856558c..c7e661e 100644
--- a/config/hosts/web02/configuration.nix
+++ b/config/hosts/web02/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }: 
+{ config, inputs, ... }: 
 let 
   bmpPort = 11019;
   autoIndex = ''
diff --git a/flake.lock b/flake.lock
index caee0e9..e48db3b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,9 @@
     "fernglas": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1703863936,
@@ -53,22 +55,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1699099776,
-        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1704722960,
         "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
@@ -88,7 +74,7 @@
       "inputs": {
         "fernglas": "fernglas",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 74d36a4..226f473 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,14 +3,20 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:nixos/nixos-hardware";
-    fernglas.url = "github:wobcom/fernglas";
+#    fernglas.url = "github:wobcom/fernglas";
+    fernglas = {
+      type = "github";
+      owner = "wobcom";
+      repo = "fernglas";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, nixos-hardware, ... }@attrs: {
+  outputs = { nixpkgs, nixos-hardware, fernglas, ... }@inputs: {
     nixosConfigurations = {
       web02 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = attrs;
+        specialArgs = { inherit inputs; }; 
         modules = [
           ./config/common
           ./config/common-lxc.nix