configuration/common/programs.nix

@@ -7,7 +7,6 @@
     htop
     parted
     tmux
-    bij
     colmena
     vim
     agenix

flake.lock

@@ -21,26 +21,6 @@
         "type": "github"
       }
     },
-    "bij": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712512137,
-        "narHash": "sha256-crxzFc3lc/ViHYVK+IKmIbifxF6zyHgSwhBKd0lLgWE=",
-        "ref": "refs/heads/main",
-        "rev": "221052d8465f0a4437cb8cae3cc9998c87e88f68",
-        "revCount": 2,
-        "type": "git",
-        "url": "https://git.clerie.de/clerie/bij.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.clerie.de/clerie/bij.git"
-      }
-    },
     "chaosevents": {
       "inputs": {
         "nixpkgs": [
@@ -249,7 +229,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "bij": "bij",
         "chaosevents": "chaosevents",
         "fernglas": "fernglas",
         "fieldpoc": "fieldpoc",

flake.nix

@@ -7,10 +7,6 @@
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    bij = {
-      url = "git+https://git.clerie.de/clerie/bij.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     chaosevents = {
       url = "git+https://git.clerie.de/clerie/chaosevents.git";
       inputs.nixpkgs.follows = "nixpkgs";

hosts/hydra-1/configuration.nix

@@ -26,7 +26,7 @@
   networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
 
   nix = {
-    settings.allowed-uris = "http: https: git+https: github:";
+    settings.allowed-uris = "http: https: github:";
     distributedBuilds = true;
     buildMachines = [
       {

hosts/hydra-2/configuration.nix

@@ -26,7 +26,7 @@
   networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
 
   # Allow Hydra to fetch remote URLs in restricted mode
-  nix.settings.allowed-uris = "http: https: git+https: github:";
+  nix.settings.allowed-uris = "http: https: github:";
 
   services.openssh.settings= {
    PermitRootLogin = "yes";

lib/flake-helper.nix

@@ -1,4 +1,4 @@
-{ self, nixpkgs, agenix, bij, chaosevents, fernglas, fieldpoc, nixos-exporter, solid-xmpp-alarm, ... }@inputs:
+{ self, nixpkgs, agenix, chaosevents, fernglas, fieldpoc, nixos-exporter, solid-xmpp-alarm, ... }@inputs:
 
 rec {
   generateNixosSystem = {
@@ -30,8 +30,6 @@ rec {
           (_: _: {
             inherit (agenix.packages."x86_64-linux")
               agenix;
-            inherit (bij.packages."${system}")
-              bij;
             inherit (chaosevents.packages."x86_64-linux")
               chaosevents;
            })
@@ -59,7 +57,7 @@ rec {
 
   generateColmenaHost = name: hostSystem: {
     deployment = {
-      targetHost = hostSystem.config.networking.fqdn;
+      targetHost = "${name}.net.clerie.de";
       targetUser = null;
       tags = let
         group = nixpkgs.lib.attrByPath [ "clerie" "monitoring" "serviceLevel" ] null hostSystem.config;