remove nixpkgs-unstable

the current version of woodpecker-server in stable now has the features this was original used for, not other usages of unstable are in tree left so removing it.
format files with nix fmt
2024-11-12 19:55:48 +01:00 · 2024-11-12 19:54:46 +01:00 · 2024-11-12 19:54:46 +01:00 · 2024-11-12 19:54:46 +01:00 · 2024-11-11 02:43:08 +01:00 · 2024-11-10 23:14:58 +01:00
24 changed files with 165 additions and 164 deletions
--- a/README.md
+++ b/README.md
@ -62,3 +62,14 @@ This is exactly what we're doing to set the default deployment user to `colmena-
   };
   ```
   This secret would then be available under `/run/secrets/forgejo_git_smtp_password` on the host.
+
+## Build NixOS Proxmox VE Template
+
+Build a new NixOS Proxmox VE Template for the thinkcccore's:
+```shell
+nix build .#proxmox-nixos-template
+```
+Build a new NixOS Proxmox VE Template for the chaosknoten:
+```shell
+nix build .#proxmox-chaosknoten-nixos-template
+```
--- a/config/common/users.nix
+++ b/config/common/users.nix
@ -11,8 +11,8 @@
 let
  authorizedKeysRepo = pkgs.fetchgit {
    url = "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys";
-    rev = "b6a29dc7af0a45a8c0b4904290c7cb0c5bc51413";
-    hash = "sha256-c0aH0wQeJtfXJG5wAbS6aO8yILLI1NNkFAHAeOm8RXA=";
+    rev = "686a6af22f6696f0c0595c56f463c078550049fc";
+    hash = "sha256-plTYjM6zPzoBE/dp6EUrk9mCqmab278p8FqBCTX8Grc=";
  };
  authorizedKeys = builtins.filter (item: item != "") (lib.strings.splitString "\n" (builtins.readFile "${authorizedKeysRepo}/authorized_keys"));
 in
--- a/config/hosts/eh22-wiki/dokuwiki.nix
+++ b/config/hosts/eh22-wiki/dokuwiki.nix
@ -21,7 +21,8 @@ let
  app = "dokuwiki";
  domain = "eh22.easterhegg.eu";
  dataDir = "/srv/www/${domain}";
-in {
+in
+{
  systemd.tmpfiles.rules = [
    "d ${dataDir} 0755 ${app} ${app}"
  ];
--- a/config/hosts/git/forgejo.nix
+++ b/config/hosts/git/forgejo.nix
@ -45,6 +45,9 @@
        DEFAULT_USER_VISIBILITY = "limited";
        DEFAULT_KEEP_EMAIL_PRIVATE = true;
        ENABLE_BASIC_AUTHENTICATION = false;
+        ENABLE_NOTIFY_MAIL = true;
+        AUTO_WATCH_NEW_REPOS = false;
+        AUTO_WATCH_ON_CHANGES = false;
      };
      repo = {
        DEFAULT_REPO_UNITS = "repo.code,repo.issues,repo.pulls";
--- a/config/hosts/mqtt/mosquitto.nix
+++ b/config/hosts/mqtt/mosquitto.nix
@ -10,11 +10,11 @@
    persistence = true;

    # set config for all listeners
-        listeners = [ {
+    listeners = [{
      settings.allow_anonymous = true;
      omitPasswordAuth = true;
-            acl = ["topic readwrite #"];
-        } ];
+      acl = [ "topic readwrite #" ];
+    }];

    bridges.winkekatz = {
      addresses = [
--- a/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix
+++ b/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix
@ -1,10 +1,10 @@
 { pkgs, ... }:

 let
-  elementWebVersion = "1.11.80";
+  elementWebVersion = "1.11.84";
  element-web = pkgs.fetchzip {
    url = "https://github.com/vector-im/element-web/releases/download/v${elementWebVersion}/element-v${elementWebVersion}.tar.gz";
-    sha256 = "sha256-sudWmNehxGsbZTNirTkoWQ/Bln1DC1CI30wocw9VoH8=";
+    sha256 = "sha256-z2qaKKyUq2S/r3xUUU3ym0FgFbiQr6bcltuKvUMPbH4=";
  };
  elementSecurityHeaders = ''
    # Configuration best practices
--- a/config/hosts/public-web-static/virtualHosts/hacker.tours.nix
+++ b/config/hosts/public-web-static/virtualHosts/hacker.tours.nix
@ -4,7 +4,8 @@ let
  domain = "hacker.tours";
  dataDir = "/var/www/${domain}";
  deployUser = "hackertours-website-deploy";
-in {
+in
+{
  services.nginx.virtualHosts = {
    "acme-${domain}" = {
      enableACME = true;
--- a/config/hosts/public-web-static/virtualHosts/hackertours.hamburg.ccc.de.nix
+++ b/config/hosts/public-web-static/virtualHosts/hackertours.hamburg.ccc.de.nix
@ -4,7 +4,8 @@ let
  domain = "hackertours.hamburg.ccc.de";
  dataDir = "/var/www/${domain}";
  deployUser = "ht-ccchh-website-deploy";
-in {
+in
+{
  services.nginx.virtualHosts = {
    "acme-${domain}" = {
      enableACME = true;
--- a/config/hosts/public-web-static/virtualHosts/historic-easterhegg/default.nix
+++ b/config/hosts/public-web-static/virtualHosts/historic-easterhegg/default.nix
@ -1,4 +1,4 @@
-{...}:
+{ ... }:

 {
  imports = [
--- a/config/hosts/public-web-static/virtualHosts/staging.hacker.tours.nix
+++ b/config/hosts/public-web-static/virtualHosts/staging.hacker.tours.nix
@ -4,7 +4,8 @@ let
  domain = "staging.hacker.tours";
  dataDir = "/var/www/${domain}";
  deployUser = "hackertours-website-deploy";
-in {
+in
+{
  services.nginx.virtualHosts = {
    "acme-${domain}" = {
      enableACME = true;
--- a/config/hosts/public-web-static/virtualHosts/staging.hackertours.hamburg.ccc.de.nix
+++ b/config/hosts/public-web-static/virtualHosts/staging.hackertours.hamburg.ccc.de.nix
@ -4,7 +4,8 @@ let
  domain = "staging.hackertours.hamburg.ccc.de";
  dataDir = "/var/www/${domain}";
  deployUser = "ht-ccchh-website-deploy";
-in {
+in
+{
  services.nginx.virtualHosts = {
    "acme-${domain}" = {
      enableACME = true;
--- a/config/hosts/woodpecker/woodpecker-agent/woodpecker-agent.nix
+++ b/config/hosts/woodpecker/woodpecker-agent/woodpecker-agent.nix
@ -3,13 +3,12 @@
 # - https://woodpecker-ci.org/docs/administration/agent-config
 # - https://woodpecker-ci.org/docs/administration/backends/docker

-{ config, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, ... }:

 {
  services.woodpecker-agents.agents."docker" = {
    enable = true;
-    # Since we use woodpecker-server from unstable, use the agent from unstable as well.
-    package = pkgs-unstable.woodpecker-agent;
+    package = pkgs.woodpecker-agent;
    extraGroups = [ "docker" ];
    environment = {
      WOODPECKER_SERVER = "localhost${config.services.woodpecker-server.environment.WOODPECKER_GRPC_ADDR}";
--- a/config/hosts/woodpecker/woodpecker-server/woodpecker-server.nix
+++ b/config/hosts/woodpecker/woodpecker-server/woodpecker-server.nix
@ -5,14 +5,12 @@
 # - https://woodpecker-ci.org/docs/administration/forges/forgejo
 # - https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING

-{ config, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, ... }:

 {
  services.woodpecker-server = {
    enable = true;
-    # Use package from unstable to get at least version 2.6.0 for native Forgejo support.
-    # https://github.com/woodpecker-ci/woodpecker/releases/tag/v2.6.0
-    package = pkgs-unstable.woodpecker-server;
+    package = pkgs.woodpecker-server;
    environment = {
      WOODPECKER_HOST = "https://woodpecker.hamburg.ccc.de";
      WOODPECKER_SERVER_ADDR = ":8001";
--- a/config/hosts/yate/service.nix
+++ b/config/hosts/yate/service.nix
@ -6,12 +6,12 @@
    description = "Yate telehony engine";
    unitConfig = {
      Type = "simple";
-      After="network.target";
+      After = "network.target";
    };
    serviceConfig = {
      ExecStart = "${pkgs.yate}/bin/yate -c /yate -e /yate/share -Do";
-      Type="simple";
-      Restart="always";
+      Type = "simple";
+      Restart = "always";
      # ...
    };
    wantedBy = [ "default.target" ];
--- a/flake.lock
+++ b/flake.lock
@ -38,11 +38,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1730428893,
-        "narHash": "sha256-fLLUd2dO/Vnf96UDr8YPzerYi+n99l3S5yIUDnmcPBE=",
+        "lastModified": 1731133565,
+        "narHash": "sha256-tCErjTdCUWK06LzkcvwUM+3pyrrmdf8e0VDBBTgqznE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "38edd08881ce4dc24056eec173b43587a93c990f",
+        "rev": "11f65b4b0405cff5b54c813626bddcf5435d7ad2",
        "type": "github"
      },
      "original": {
@ -54,11 +54,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1729973466,
-        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "lastModified": 1730602179,
+        "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
        "type": "github"
      },
      "original": {
@ -68,27 +68,10 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1730449684,
-        "narHash": "sha256-Hlv3rTPxnO+DpKRXw9yjzERLdk05h7+fEbZxWM2taCw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ab464abbeb3a2833288c6e907488c49c2e599f88",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
        "sops-nix": "sops-nix"
      }
    },
@ -100,11 +83,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1729999681,
-        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
+        "lastModified": 1731213149,
+        "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+        "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -6,7 +6,6 @@
    # https://nixos.org/manual/nixos/stable/#sec-upgrading
    # https://github.com/NixOS/nixpkgs
    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05-small";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";

    # Add nixos-generators as an input.
    # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake
@ -23,26 +22,32 @@
    };
  };

-  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-generators, sops-nix, ... }:
+  outputs = { self, nixpkgs, nixos-generators, sops-nix, ... }:
    let
      system = "x86_64-linux";
-      shairportSync431ExtendedNixpkgsUnstableOverlay = final: prev: {
+    in
+    {
+      overlays = {
+        shairportSyncAirplay2 = final: prev: {
          shairport-sync = (prev.shairport-sync.override { enableMetadata = true; enableAirplay2 = true; }).overrideAttrs (finalAttr: previousAttr: {
            # See: https://github.com/mikebrady/shairport-sync/blob/e78a88b64adfe7b5f88fd6faedf55c57445bb240/CONFIGURATION%20FLAGS.md
            configureFlags = previousAttr.configureFlags ++ [ "--with-mqtt-client" ];
            buildInputs = previousAttr.buildInputs ++ [ final.mosquitto ];
          });
        };
-      pkgs-unstable = nixpkgs-unstable.legacyPackages."x86_64-linux";
-    in
-    {
+      };
+      nixosModules = {
+        common = ./config/common;
+        proxmox-vm = ./config/proxmox-vm;
+        prometheus-exporter = ./config/extra/prometheus-exporter.nix;
+      };
      nixosConfigurations = {
        audio-hauptraum-kueche = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
-            { nixpkgs.overlays = [ shairportSync431ExtendedNixpkgsUnstableOverlay ]; }
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
+            { nixpkgs.overlays = [ self.overlays.shairportSyncAirplay2 ]; }
            ./config/hosts/audio-hauptraum-kueche
          ];
        };
@ -50,9 +55,9 @@
        audio-hauptraum-tafel = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
-            { nixpkgs.overlays = [ shairportSync431ExtendedNixpkgsUnstableOverlay ]; }
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
+            { nixpkgs.overlays = [ self.overlays.shairportSyncAirplay2 ]; }
            ./config/hosts/audio-hauptraum-tafel
          ];
        };
@ -60,8 +65,8 @@
        esphome = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            ./config/hosts/esphome
          ];
        };
@ -69,8 +74,8 @@
        public-reverse-proxy = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            ./config/hosts/public-reverse-proxy
          ];
        };
@ -78,10 +83,10 @@
        netbox = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/netbox
          ];
        };
@ -89,10 +94,10 @@
        matrix = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/matrix
          ];
        };
@ -100,10 +105,10 @@
        public-web-static = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/public-web-static
          ];
        };
@ -111,10 +116,10 @@
        git = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/git
          ];
        };
@ -122,10 +127,10 @@
        forgejo-actions-runner = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/forgejo-actions-runner
          ];
        };
@ -133,8 +138,8 @@
        ptouch-print-server = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            ./config/hosts/ptouch-print-server
          ];
        };
@ -142,9 +147,9 @@
        eh22-wiki = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
+            self.nixosModules.prometheus-exporter
            ./config/hosts/eh22-wiki
          ];
        };
@ -152,9 +157,9 @@
        nix-box-june = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
+            self.nixosModules.prometheus-exporter
            ./config/hosts/nix-box-june
          ];
        };
@ -162,8 +167,8 @@
        yate = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            ./config/hosts/yate
          ];
        };
@ -171,8 +176,8 @@
        mqtt = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            ./config/hosts/mqtt
          ];
        };
@ -180,10 +185,10 @@
        mjolnir = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/mjolnir
          ];
        };
@ -191,22 +196,19 @@
        woodpecker = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/woodpecker
          ];
-          specialArgs = {
-            inherit pkgs-unstable;
-          };
        };

        status = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
            ./config/hosts/status
          ];
@ -215,10 +217,10 @@
        penpot = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
            sops-nix.nixosModules.sops
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.prometheus-exporter
            ./config/hosts/penpot
          ];
        };
@ -226,9 +228,9 @@
        hydra = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            ./config/common
-            ./config/proxmox-vm
-            ./config/extra/prometheus-exporter.nix
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
+            self.nixosModules.prometheus-exporter
            ./config/hosts/hydra
          ];
        };
@ -239,8 +241,8 @@
          system = "x86_64-linux";
          modules = [
            ./config/nixos-generators/proxmox.nix
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
          ];
          format = "proxmox";
        };
@ -250,8 +252,8 @@
          modules = [
            ./config/nixos-generators/proxmox-chaosknoten.nix
            ./config/proxmox-chaosknoten-additional-initial-config.nix
-            ./config/common
-            ./config/proxmox-vm
+            self.nixosModules.common
+            self.nixosModules.proxmox-vm
          ];
          format = "proxmox";
        };
Author	SHA1	Message	Date
jopejoe1	281ad152d6	remove nixpkgs-unstable the current version of woodpecker-server in stable now has the features this was original used for, not other usages of unstable are in tree left so removing it.	2024-11-12 19:55:48 +01:00
jopejoe1	39b73b0926	format files with `nix fmt`	2024-11-12 19:54:46 +01:00
jopejoe1	1283d7664f	make use of nixosModules output	2024-11-12 19:54:46 +01:00
jopejoe1	4978ffc758	move overlay to overlays output	2024-11-12 19:54:46 +01:00
fi	c84d9e7d0a	Update element to 1.11.84	2024-11-11 02:43:08 +01:00
c6ristian	33b2cbf5d0	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/38edd08881ce4dc24056eec173b43587a93c990f' (2024-11-01) → 'github:nixos/nixpkgs/11f65b4b0405cff5b54c813626bddcf5435d7ad2' (2024-11-09) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/ab464abbeb3a2833288c6e907488c49c2e599f88' (2024-11-01) → 'github:nixos/nixpkgs/8aed22ecd71e5b67e5299efae8b9dc580dec711c' (2024-11-10) • Updated input 'sops-nix': 'github:Mic92/sops-nix/1666d16426abe79af5c47b7c0efa82fd31bf4c56' (2024-10-27) → 'github:Mic92/sops-nix/f1675e3b0e1e663a4af49be67ecbc9e749f85eb7' (2024-11-10) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/cd3e8833d70618c4eea8df06f95b364b016d4950' (2024-10-26) → 'github:NixOS/nixpkgs/3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c' (2024-11-03)	2024-11-10 23:14:58 +01:00
c6ristian	afb4fc71ce	Update infrastructure-authorized-keys rev	2024-11-10 23:10:50 +01:00
c6ristian	1fcd8c6421	fix typo and writing improvement	2024-11-10 20:18:59 +01:00
c6ristian	ff1a12846a	Add how to generate the NixOS Proxmox VE templates	2024-11-10 20:18:59 +01:00
June	2ba371f8cd	git: disable making org users auto watch new repos on creation Also explicitly disable making users auto watch repos after their first commit to it.	2024-11-10 19:38:05 +01:00
June	c8e7bd1ccf	git: enable sending of e-mails to watchers of repositories	2024-11-10 19:26:26 +01:00