fix: dont update lix yet, causes a pile of errors

Seems to have been mainstreamed

applications/bitwarden/bitwarden-directory-connector-cli.nix

@@ -1,324 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.services.bitwarden-directory-connector-cli;
-in {
-  disabledModules = ["services/security/bitwarden-directory-connector-cli.nix"];
-
-  options.services.bitwarden-directory-connector-cli = {
-    enable = mkEnableOption "Bitwarden Directory Connector";
-
-    package = mkPackageOption pkgs "bitwarden-directory-connector-cli" {};
-
-    domain = mkOption {
-      type = types.str;
-      description = lib.mdDoc "The domain the Bitwarden/Vaultwarden is accessible on.";
-      example = "https://vaultwarden.example.com";
-    };
-
-    user = mkOption {
-      type = types.str;
-      description = lib.mdDoc "User to run the program.";
-      default = "bwdc";
-    };
-
-    interval = mkOption {
-      type = types.str;
-      default = "*:0,15,30,45";
-      description = lib.mdDoc "The interval when to run the connector. This uses systemd's OnCalendar syntax.";
-    };
-
-    ldap = mkOption {
-      description = lib.mdDoc ''
-        Options to configure the LDAP connection.
-        If you used the desktop application to test the configuration you can find the settings by searching for `ldap` in `~/.config/Bitwarden\ Directory\ Connector/data.json`.
-      '';
-      default = {};
-      type = types.submodule ({
-        config,
-        options,
-        ...
-      }: {
-        freeformType = types.attrsOf (pkgs.formats.json {}).type;
-
-        config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options)));
-
-        options = {
-          finalJSON = mkOption {
-            type = (pkgs.formats.json {}).type;
-            internal = true;
-            readOnly = true;
-            visible = false;
-          };
-
-          ssl = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "Whether to use TLS.";
-          };
-          startTls = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "Whether to use STARTTLS.";
-          };
-
-          hostname = mkOption {
-            type = types.str;
-            description = lib.mdDoc "The host the LDAP is accessible on.";
-            example = "ldap.example.com";
-          };
-
-          port = mkOption {
-            type = types.port;
-            default = 389;
-            description = lib.mdDoc "Port LDAP is accessible on.";
-          };
-
-          ad = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "Whether the LDAP Server is an Active Directory.";
-          };
-
-          pagedSearch = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "Whether the LDAP server paginates search results.";
-          };
-
-          rootPath = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Root path for LDAP.";
-            example = "dc=example,dc=com";
-          };
-
-          username = mkOption {
-            type = types.str;
-            description = lib.mdDoc "The user to authenticate as.";
-            example = "cn=admin,dc=example,dc=com";
-          };
-        };
-      });
-    };
-
-    sync = mkOption {
-      description = lib.mdDoc ''
-        Options to configure what gets synced.
-        If you used the desktop application to test the configuration you can find the settings by searching for `sync` in `~/.config/Bitwarden\ Directory\ Connector/data.json`.
-      '';
-      default = {};
-      type = types.submodule ({
-        config,
-        options,
-        ...
-      }: {
-        freeformType = types.attrsOf (pkgs.formats.json {}).type;
-
-        config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options)));
-
-        options = {
-          finalJSON = mkOption {
-            type = (pkgs.formats.json {}).type;
-            internal = true;
-            readOnly = true;
-            visible = false;
-          };
-
-          removeDisabled = mkOption {
-            type = types.bool;
-            default = true;
-            description = lib.mdDoc "Remove users from bitwarden groups if no longer in the ldap group.";
-          };
-
-          overwriteExisting = mkOption {
-            type = types.bool;
-            default = false;
-            description =
-              lib.mdDoc "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details.";
-          };
-
-          largeImport = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "Enable if you are syncing more than 2000 users/groups.";
-          };
-
-          memberAttribute = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Attribute that lists members in a LDAP group.";
-            example = "uniqueMember";
-          };
-
-          creationDateAttribute = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Attribute that lists a user's creation date.";
-            example = "whenCreated";
-          };
-
-          useEmailPrefixSuffix = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "If a user has no email address, combine a username prefix with a suffix value to form an email.";
-          };
-          emailPrefixAttribute = mkOption {
-            type = types.str;
-            description = lib.mdDoc "The attribute that contains the users username.";
-            example = "accountName";
-          };
-          emailSuffix = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Suffix for the email, normally @example.com.";
-            example = "@example.com";
-          };
-
-          users = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "Sync users.";
-          };
-          userPath = mkOption {
-            type = types.str;
-            description = lib.mdDoc "User directory, relative to root.";
-            default = "ou=users";
-          };
-          userObjectClass = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Class that users must have.";
-            default = "inetOrgPerson";
-          };
-          userEmailAttribute = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Attribute for a users email.";
-            default = "mail";
-          };
-          userFilter = mkOption {
-            type = types.str;
-            description = lib.mdDoc "LDAP filter for users.";
-            example = "(memberOf=cn=sales,ou=groups,dc=example,dc=com)";
-            default = "";
-          };
-
-          groups = mkOption {
-            type = types.bool;
-            default = false;
-            description = lib.mdDoc "Whether to sync ldap groups into BitWarden.";
-          };
-          groupPath = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Group directory, relative to root.";
-            default = "ou=groups";
-          };
-          groupObjectClass = mkOption {
-            type = types.str;
-            description = lib.mdDoc "A class that groups will have.";
-            default = "groupOfNames";
-          };
-          groupNameAttribute = mkOption {
-            type = types.str;
-            description = lib.mdDoc "Attribute for a name of group.";
-            default = "cn";
-          };
-          groupFilter = mkOption {
-            type = types.str;
-            description = lib.mdDoc "LDAP filter for groups.";
-            example = "(cn=sales)";
-            default = "";
-          };
-        };
-      });
-    };
-
-    secrets = {
-      ldap = mkOption {
-        type = types.str;
-        description = "Path to file that contains LDAP password for user in {option}`ldap.username";
-      };
-
-      bitwarden = {
-        client_path_id = mkOption {
-          type = types.str;
-          description = "Path to file that contains Client ID.";
-        };
-        client_path_secret = mkOption {
-          type = types.str;
-          description = "Path to file that contains Client Secret.";
-        };
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    users.groups."${cfg.user}" = {};
-    users.users."${cfg.user}" = {
-      isSystemUser = true;
-      group = cfg.user;
-    };
-
-    systemd = {
-      timers.bitwarden-directory-connector-cli = {
-        description = "Sync timer for Bitwarden Directory Connector";
-        wantedBy = ["timers.target"];
-        after = ["network-online.target"];
-        timerConfig = {
-          OnCalendar = cfg.interval;
-          Unit = "bitwarden-directory-connector-cli.service";
-          Persistent = true;
-        };
-      };
-
-      services.bitwarden-directory-connector-cli = {
-        description = "Main process for Bitwarden Directory Connector";
-
-        environment = {
-          BITWARDENCLI_CONNECTOR_APPDATA_DIR = "/tmp";
-          BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true";
-        };
-
-        serviceConfig = {
-          Type = "oneshot";
-          User = "${cfg.user}";
-          PrivateTmp = true;
-          ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" ''
-            set -eo pipefail
-
-            # create the config file
-            ${lib.getExe cfg.package} data-file
-            touch /tmp/data.json.tmp
-            chmod 600 /tmp/data.json{,.tmp}
-
-            ${lib.getExe cfg.package} config server ${cfg.domain}
-
-            # now login to set credentials
-            export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})"
-            export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})"
-            ${lib.getExe cfg.package} login
-
-            ${lib.getExe pkgs.jq} '.authenticatedAccounts[0] as $account
-              | .[$account].directoryConfigurations.ldap |= $ldap_data
-              | .[$account].directorySettings.organizationId |= $orgID
-              | .[$account].directorySettings.sync |= $sync_data' \
-              --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \
-              --arg orgID "''${BW_CLIENTID//organization.}" \
-              --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \
-              /tmp/data.json \
-              > /tmp/data.json.tmp
-
-            mv -f /tmp/data.json.tmp /tmp/data.json
-
-            # final config
-            ${lib.getExe cfg.package} config directory 0
-            ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap}
-          '';
-
-          ExecStart = "${lib.getExe cfg.package} sync";
-        };
-      };
-    };
-  };
-
-  meta.maintainers = with maintainers; [Silver-Golden];
-}

applications/bitwarden/bitwarden_sync.nix

@@ -6,9 +6,7 @@
 }: let
   user = "bwdc";
 in {
-  imports = [
+  imports = [];
-    ./bitwarden-directory-connector-cli.nix
-  ];
 
   options = {};
 

applications/nextcloud.nix

@@ -45,6 +45,7 @@ in {
     services.skynet.acme.domains = [
       domain
       "onlyoffice.${domain}"
+      "whiteboard.${domain}"
     ];
 
     services.skynet.dns.records = [
@@ -58,13 +59,18 @@ in {
         r_type = "CNAME";
         value = config.services.skynet.host.name;
       }
+      #      {
+      #        record = "whiteboard.${cfg.domain.sub}";
+      #        r_type = "CNAME";
+      #        value = config.services.skynet.host.name;
+      #      }
     ];
 
     # /var/lib/nextcloud/data
 
     services.nextcloud = {
       enable = true;
-      package = pkgs.nextcloud28;
+      package = pkgs.nextcloud30;
       hostName = domain;
       https = true;
 
@@ -78,8 +84,8 @@ in {
 
       appstoreEnable = true;
 
-      extraApps = with config.services.nextcloud.package.packages.apps; {
+      extraApps = {
-        inherit forms groupfolders maps notes onlyoffice polls;
+        inherit (config.services.nextcloud.package.packages.apps) richdocuments;
       };
 
       settings = {
@@ -90,10 +96,21 @@ in {
       };
     };
 
+    #    environment.etc."nextcloud-whiteboard-secret".text = ''
+    #      JWT_SECRET_KEY=test123
+    #    '';
+    #
+    #    services.nextcloud-whiteboard-server = {
+    #      enable = true;
+    #      settings.NEXTCLOUD_URL = "https://nextcloud.skynet.ie";
+    #      secrets = ["/etc/nextcloud-whiteboard-secret"];
+    #    };
+
     nixpkgs.config.allowUnfree = true;
-    services.onlyoffice = {
+    # impacted by https://github.com/NixOS  /nixpkgs/issues/352443
-      enable = true;
+    #    services.onlyoffice = {
-    };
+    #      enable = true;
+    #    };
 
     services.nginx.virtualHosts = {
       ${domain} = {
@@ -105,6 +122,14 @@ in {
         useACMEHost = "skynet";
         locations."/".proxyPass = "http://127.0.0.1:8000";
       };
+      #      "whiteboard.${domain}" = {
+      #        forceSSL = true;
+      #        useACMEHost = "skynet";
+      #        locations."/" = {
+      #          proxyPass = "http://localhost:3002";
+      #          proxyWebsockets = true;
+      #        };
+      #      };
     };
   };
 }

applications/nix_cache/nix_cache.nix

@@ -15,7 +15,6 @@ https://docs.attic.rs/introduction.html
   lib,
   config,
   pkgs,
-  inputs,
   ...
 }:
 with lib; let
@@ -23,7 +22,6 @@ with lib; let
   cfg = config.services.skynet."${name}";
 in {
   imports = [
-    inputs.attic.nixosModules.atticd
   ];
 
   options.services.skynet."${name}" = {
@@ -53,7 +51,7 @@ in {
       enable = true;
 
       # Replace with absolute path to your credentials file
-      credentialsFile = "/etc/atticd.env";
+      environmentFile = "/etc/atticd.env";
 
       settings = {
         listen = "127.0.0.1:8080";

flake.lock

@@ -47,7 +47,7 @@
       "inputs": {
         "fenix": "fenix_2",
         "flakeCompat": "flakeCompat_2",
-        "nixpkgs": "nixpkgs_19"
+        "nixpkgs": "nixpkgs_18"
       },
       "locked": {
         "lastModified": 1719514321,
@@ -84,32 +84,10 @@
         "type": "github"
       }
     },
-    "attic": {
-      "inputs": {
-        "crane": "crane",
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1724086414,
-        "narHash": "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI=",
-        "owner": "zhaofengli",
-        "repo": "attic",
-        "rev": "acf3c351f8de47c6857f31948ab253f9c7ce2a6f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "repo": "attic",
-        "type": "github"
-      }
-    },
     "bfom": {
       "inputs": {
         "naersk": "naersk",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "utils": "utils"
       },
       "locked": {
@@ -144,9 +122,9 @@
     },
     "colmena": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "stable": "stable"
       },
       "locked": {
@@ -166,7 +144,7 @@
     "compsoc_public": {
       "inputs": {
         "bfom": "bfom",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_6",
         "utils": "utils_2"
       },
       "locked": {
@@ -183,27 +161,6 @@
         "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"
       }
     },
-    "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "attic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722960479,
-        "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -272,22 +229,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1650374568,
@@ -303,7 +244,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -362,24 +303,6 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "locked": {
         "lastModified": 1659877975,
         "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -394,9 +317,9 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "flake-utils_2": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -412,9 +335,9 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_3": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -552,7 +475,7 @@
     },
     "lix-module": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "flakey-profile": "flakey-profile",
         "lix": [
           "lix"
@@ -575,7 +498,7 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1713520724,
@@ -593,7 +516,7 @@
     },
     "naersk_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1721727458,
@@ -611,7 +534,7 @@
     },
     "naersk_3": {
       "inputs": {
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1686572087,
@@ -658,38 +581,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1720535198,
-        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1722995383,
-        "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_11": {
       "locked": {
         "lastModified": 1687011986,
         "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=",
@@ -703,7 +595,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs_11": {
       "locked": {
         "lastModified": 1686921029,
         "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
@@ -718,7 +610,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1687274257,
         "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
@@ -732,7 +624,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1724114134,
         "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=",
@@ -746,7 +638,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_15": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1690026219,
         "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=",
@@ -760,6 +652,20 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_15": {
+      "locked": {
+        "lastModified": 1689935543,
+        "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
     "nixpkgs_16": {
       "locked": {
         "lastModified": 1689935543,
@@ -775,20 +681,6 @@
       }
     },
     "nixpkgs_17": {
-      "locked": {
-        "lastModified": 1689935543,
-        "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_18": {
       "locked": {
         "lastModified": 1695978539,
         "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
@@ -802,7 +694,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_19": {
+    "nixpkgs_18": {
       "locked": {
         "lastModified": 1668226844,
         "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=",
@@ -818,6 +710,20 @@
         "type": "github"
       }
     },
+    "nixpkgs_19": {
+      "locked": {
+        "lastModified": 1724395761,
+        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1722630782,
@@ -834,37 +740,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_20": {
-      "locked": {
-        "lastModified": 1724395761,
-        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1723827930,
-        "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1696019113,
         "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
@@ -880,6 +756,20 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1714091391,
+        "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
     "nixpkgs_5": {
       "locked": {
         "lastModified": 1714091391,
@@ -895,20 +785,6 @@
       }
     },
     "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1714091391,
-        "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_7": {
       "locked": {
         "lastModified": 1715413075,
         "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
@@ -922,13 +798,13 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
-        "lastModified": 1723991338,
+        "lastModified": 1730200266,
-        "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
+        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a3354191c0d7144db9756a74755672387b702ba",
+        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
         "type": "github"
       },
       "original": {
@@ -937,7 +813,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1723151389,
         "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=",
@@ -951,18 +827,32 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1722995383,
+        "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "alejandra": "alejandra",
         "arion": "arion",
-        "attic": "attic",
         "colmena": "colmena",
         "compsoc_public": "compsoc_public",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "lix": "lix",
         "lix-module": "lix-module",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_7",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "skynet_discord_bot": "skynet_discord_bot",
         "skynet_ldap_backend": "skynet_ldap_backend",
@@ -1012,7 +902,7 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -1035,7 +925,7 @@
     "skynet_discord_bot": {
       "inputs": {
         "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_9",
         "utils": "utils_3"
       },
       "locked": {
@@ -1055,7 +945,7 @@
     "skynet_ldap_backend": {
       "inputs": {
         "naersk": "naersk_3",
-        "nixpkgs": "nixpkgs_12",
+        "nixpkgs": "nixpkgs_11",
         "utils": "utils_4"
       },
       "locked": {
@@ -1074,7 +964,7 @@
     },
     "skynet_ldap_frontend": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13",
+        "nixpkgs": "nixpkgs_12",
         "utils": "utils_5"
       },
       "locked": {
@@ -1093,7 +983,7 @@
     },
     "skynet_website": {
       "inputs": {
-        "nixpkgs": "nixpkgs_14",
+        "nixpkgs": "nixpkgs_13",
         "utils": "utils_6"
       },
       "locked": {
@@ -1112,7 +1002,7 @@
     },
     "skynet_website_2009": {
       "inputs": {
-        "nixpkgs": "nixpkgs_15",
+        "nixpkgs": "nixpkgs_14",
         "utils": "utils_7"
       },
       "locked": {
@@ -1131,7 +1021,7 @@
     },
     "skynet_website_2017": {
       "inputs": {
-        "nixpkgs": "nixpkgs_16",
+        "nixpkgs": "nixpkgs_15",
         "utils": "utils_8"
       },
       "locked": {
@@ -1151,7 +1041,7 @@
     },
     "skynet_website_2023": {
       "inputs": {
-        "nixpkgs": "nixpkgs_17",
+        "nixpkgs": "nixpkgs_16",
         "utils": "utils_9"
       },
       "locked": {
@@ -1171,7 +1061,7 @@
     },
     "skynet_website_games": {
       "inputs": {
-        "nixpkgs": "nixpkgs_18",
+        "nixpkgs": "nixpkgs_17",
         "utils": "utils_10"
       },
       "locked": {
@@ -1191,7 +1081,7 @@
     "skynet_website_wiki": {
       "inputs": {
         "alejandra": "alejandra_2",
-        "nixpkgs": "nixpkgs_20",
+        "nixpkgs": "nixpkgs_19",
         "utils": "utils_11"
       },
       "locked": {
@@ -1314,21 +1204,6 @@
         "type": "github"
       }
     },
-    "systems_15": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -1451,7 +1326,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -1469,7 +1344,7 @@
     },
     "utils_10": {
       "inputs": {
-        "systems": "systems_14"
+        "systems": "systems_13"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -1487,7 +1362,7 @@
     },
     "utils_11": {
       "inputs": {
-        "systems": "systems_15"
+        "systems": "systems_14"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -1505,7 +1380,7 @@
     },
     "utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -1523,7 +1398,7 @@
     },
     "utils_3": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -1541,7 +1416,7 @@
     },
     "utils_4": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -1559,7 +1434,7 @@
     },
     "utils_5": {
       "inputs": {
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1687171271,
@@ -1577,7 +1452,7 @@
     },
     "utils_6": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -1595,7 +1470,7 @@
     },
     "utils_7": {
       "inputs": {
-        "systems": "systems_11"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -1613,7 +1488,7 @@
     },
     "utils_8": {
       "inputs": {
-        "systems": "systems_12"
+        "systems": "systems_11"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -1631,7 +1506,7 @@
     },
     "utils_9": {
       "inputs": {
-        "systems": "systems_13"
+        "systems": "systems_12"
       },
       "locked": {
         "lastModified": 1689068808,

flake.nix

@@ -27,7 +27,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     colmena.url = "github:zhaofengli/colmena";
-    attic.url = "github:zhaofengli/attic";
 
     # we host our own
     simple-nixos-mailserver = {