From c72a3006519183155588bf3a11d3492b819bb279 Mon Sep 17 00:00:00 2001 From: Markus Schmidl Date: Thu, 9 Mar 2023 21:47:10 +0100 Subject: [PATCH] deadnix --- flake.nix | 10 +--------- hosts/bind/default.nix | 2 +- hosts/c3d2-web/default.nix | 2 +- hosts/factorio/default.nix | 2 +- hosts/ftp/default.nix | 2 +- hosts/glotzbert/default.nix | 2 +- hosts/hydra/default.nix | 2 +- hosts/matemat/default.nix | 2 +- packages.nix | 4 ++-- 9 files changed, 10 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 29d9d08f..595480b7 100644 --- a/flake.nix +++ b/flake.nix @@ -47,14 +47,6 @@ rust-overlay.follows = "rust-overlay"; }; }; - buzz2elastic = { - url = "git+https://gitea.c3d2.de/astro/buzz2elastic"; - inputs = { - naersk.follows = "naersk"; - nixpkgs.follows = "nixos"; - utils.follows = "flake-utils"; - }; - }; buzzrelay = { url = "github:astro/buzzrelay"; inputs = { @@ -222,7 +214,7 @@ }; }; - outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzz2elastic, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }: + outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }: let inherit (nixos) lib; diff --git a/hosts/bind/default.nix b/hosts/bind/default.nix index 065eca31..162d3d78 100644 --- a/hosts/bind/default.nix +++ b/hosts/bind/default.nix @@ -1,4 +1,4 @@ -{ zentralwerk, config, lib, pkgs, ... }: +{ zentralwerk, config, pkgs, ... }: let systemctl = "${pkgs.systemd}/bin/systemctl"; deployCommand = "${systemctl} start deploy-c3d2-dns"; diff --git a/hosts/c3d2-web/default.nix b/hosts/c3d2-web/default.nix index 2779ea64..aa7950bc 100644 --- a/hosts/c3d2-web/default.nix +++ b/hosts/c3d2-web/default.nix @@ -1,4 +1,4 @@ -{ config, hostRegistry, lib, options, pkgs, ... }: +{ config, hostRegistry, lib, pkgs, ... }: let webroot = "/var/www"; in diff --git a/hosts/factorio/default.nix b/hosts/factorio/default.nix index c2d93ded..79505994 100644 --- a/hosts/factorio/default.nix +++ b/hosts/factorio/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ ... }: { c3d2.deployment.server = "server10"; diff --git a/hosts/ftp/default.nix b/hosts/ftp/default.nix index 4c27b793..21683469 100644 --- a/hosts/ftp/default.nix +++ b/hosts/ftp/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { c3d2.deployment.server = "server9"; diff --git a/hosts/glotzbert/default.nix b/hosts/glotzbert/default.nix index fb16a22e..1e9e860e 100644 --- a/hosts/glotzbert/default.nix +++ b/hosts/glotzbert/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./hardware-configuration.nix ]; diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix index 8b450a89..75ef2242 100644 --- a/hosts/hydra/default.nix +++ b/hosts/hydra/default.nix @@ -1,4 +1,4 @@ -{ config, lib, libS, modulesPath, pkgs, ... }: +{ config, lib, libS, pkgs, ... }: let cachePort = 5000; diff --git a/hosts/matemat/default.nix b/hosts/matemat/default.nix index 240f84fb..8b63bd52 100644 --- a/hosts/matemat/default.nix +++ b/hosts/matemat/default.nix @@ -1,4 +1,4 @@ -{ config, lib, options, pkgs, ... }: +{ config, lib, pkgs, ... }: { c3d2.deployment.server = "server10"; diff --git a/packages.nix b/packages.nix index dfc16009..cdc99f60 100644 --- a/packages.nix +++ b/packages.nix @@ -1,4 +1,4 @@ -{ hostRegistry, inputs, lib, microvm, secrets, self }: +{ hostRegistry, inputs, lib, microvm, self }: let getHostAddr = name: @@ -12,7 +12,7 @@ let inputPaths = lib.escapeShellArgs (builtins.attrValues inputs); overrideInputsArgs = lib.concatStringsSep " " (builtins.attrValues (lib.mapAttrs (name: value: "--override-input ${name} ${value}") - (lib.filterAttrs (name: value: name != "self") inputs) + (lib.filterAttrs (name: _value: name != "self") inputs) )); in lib.attrsets.mapAttrs