pkgs/glitch-soc: updates

colmena: use nixpkgs version, so we don't need to rebuild lix for it
tokodon: pull in kde6 version instead of kde5

flake.lock

@@ -337,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716930911,
-        "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=",
+        "lastModified": 1717052710,
+        "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086",
+        "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae",
         "type": "github"
       },
       "original": {
@@ -373,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716618639,
-        "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=",
+        "lastModified": 1717012808,
+        "narHash": "sha256-Wn0fbjqmpIiuPUWnvxu85a9sPYtSd/2tcPDhAYW54RM=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38",
+        "rev": "a8e6557f29fa0cbcc2c54d15f9664c14ae2a3e98",
         "type": "github"
       },
       "original": {
@@ -441,11 +441,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716856858,
-        "narHash": "sha256-dfNGs2AW/V31nMVeEBSUJCMfT6bZAKJ5qsWgFHWhvUc=",
+        "lastModified": 1717036776,
+        "narHash": "sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0=",
         "ref": "refs/heads/main",
-        "rev": "38f31ee7c1a60adae58833789dd855c128b056c6",
-        "revCount": 85,
+        "rev": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb",
+        "revCount": 86,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },

modules/ci-runners.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
 let
   gitea-runner-directory = "/var/lib/gitea-runner";

modules/graphical.nix

@@ -175,7 +175,10 @@ in {
 
   environment.sessionVariables = { MOZ_ENABLE_WAYLAND = "1"; };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = [
+    inputs.agenix.packages.${pkgs.system}.default
+    inputs.nixpkgs.legacyPackages.${pkgs.system}.colmena
+  ] ++ (with pkgs; [
     krfb # for kdeconnect virtual display
     chromium
     # electrum
@@ -218,7 +221,7 @@ in {
     krita
     vlc
     libreoffice-qt
-    tokodon
+    kdePackages.tokodon
 
     glasgow
     freecad
@@ -276,8 +279,6 @@ in {
     gomuks
     bind
     nmap
-    colmena
     waypipe
-    inputs.agenix.packages.${pkgs.system}.default
-  ];
+  ]);
 }

modules/laptop.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+_:
 
 {
   services.power-profiles-daemon.enable = true;

nixos/akamanto/default.nix

@@ -37,10 +37,8 @@ in {
   deployment.buildOnTarget = lib.mkForce false;
   deployment.tags = [ "reachable-hs" ];
 
-  imports = with inputs.self.nixosModules; [
-    "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image.nix"
-    common
-  ];
+  imports = [ "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image.nix" ]
+    ++ (with inputs.self.nixosModules; [ common ]);
 
   nixpkgs.overlays = [ inputs.self.overlays.rpi5 ];
 
@@ -207,7 +205,16 @@ in {
 
   # diet
   boot.binfmt.emulatedSystems = lib.mkForce [ ];
-  environment.systemPackages = with pkgs;
+  environment.systemPackages = [
+    # avoid warnings
+    (pkgs.glibcLocales.override {
+      allLocales = false;
+      locales = [ "en_US.UTF-8/UTF-8" "en_CA.UTF-8/UTF-8" "en_DK.UTF-8/UTF-8" ];
+    })
+
+    # strictly unnecessary
+    (pkgs.v4l-utils.override { withGUI = false; })
+  ] ++ (with pkgs;
   # lib.mkForce
     [
       # strictly required
@@ -221,11 +228,6 @@ in {
 
       # avoid warnings
       gnugrep
-      (glibcLocales.override {
-        allLocales = false;
-        locales =
-          [ "en_US.UTF-8/UTF-8" "en_CA.UTF-8/UTF-8" "en_DK.UTF-8/UTF-8" ];
-      })
 
       # nice-to-haves
       procps
@@ -245,8 +247,7 @@ in {
       alsa-utils
       bluez
       pipewire
-      (v4l-utils.override { withGUI = false; })
-    ];
+    ]);
   programs.nix-index.enable = lib.mkForce false;
   services.journald.extraConfig = ''
     Storage=volatile

nixos/scylla/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config, pkgs, inputs, ... }:
 
 let
   keaJsonWithIncludes = name: value:

nixos/zorigami/default.nix

@@ -3,16 +3,15 @@
 {
   deployment.tags = [ "reachable-everywhere" ];
 
-  imports = with inputs.self.nixosModules; [
-    common
-    secureboot
-    monitoring
-    ci-runners
+  imports = [ inputs.simple-nixos-mailserver.nixosModule ]
+    ++ (with inputs.self.nixosModules; [
+      common
+      secureboot
+      monitoring
+      ci-runners
 
-    inputs.simple-nixos-mailserver.nixosModule
-
-    ./hardware.nix
-  ];
+      ./hardware.nix
+    ]);
 
   boot.kernelPackages = pkgs.linuxPackages;
 
@@ -295,7 +294,7 @@
       client_api = {
         registration_disabled = true;
         rate_limiting.enabled = false;
-        registration_shared_secret = ''''${REGISTRATION_SHARED_SECRET}'';
+        registration_shared_secret = "\${REGISTRATION_SHARED_SECRET}";
       };
 
       app_service_api.database = database_config;

pkgs/glitch-soc/emoji.nix

@@ -1,5 +1,5 @@
 # autogenerated file
-{ fetchpatch, fetchurl }: {
+{fetchpatch, fetchurl}: {
   patches = [
     (fetchpatch {
       url =

pkgs/glitch-soc/source.nix

@@ -4,8 +4,8 @@
   src = fetchFromGitHub {
     owner = "glitch-soc";
     repo = "mastodon";
-    rev = "e7aeacccb147174f5fb527c02036a2cd5f82cef6";
-    hash = "sha256-nnIjDDWZPBeMB6ezpsOZgdxtb+f8LRhx6X0RNTRMDB8=";
+    rev = "a8e6f5e656a9f46377b05d288654c1ba86bb858f";
+    hash = "sha256-EP+43scB5+cpmL3yM8TLAWSb7PbZQpdhOwewXae+FnI=";
   };
   inherit patches;
   nativeBuildInputs = [ gawk gnused ];
@@ -18,6 +18,6 @@
       sed -i -Ee 's|^  checksum: ([^/]*)$|  checksum: '$cacheKey'/\1|g;' yarn.lock
     '';
 }) // {
-  version = "unstable-2024-05-29";
-  yarnHash = "sha256-haLT8KnJr1r4VPjeXfR5nm0yUbAbeB+D9reOXrdfwCY=";
+  version = "unstable-2024-05-30";
+  yarnHash = "sha256-BNk6xMx11QYQQ8occYU1HJ6z/AuF2UeDRzJwgAFb0XQ=";
 }