NixOS 25.05

13 files changed, 67 insertions, 62 deletions

diff --git a/chaski/services/chat.nix b/chaski/services/chat.nix
index 6d26ada..484a3b9 100644
--- a/chaski/services/chat.nix
+++ b/chaski/services/chat.nix
@@ -4,7 +4,7 @@
 # (and not deal with having an irc relay)
 {
 
-  imports = [ inputs.home-manager.nixosModule ];
+  imports = [ inputs.home-manager.nixosModules.default ];
 
   programs.mosh.enable = true;
   programs.fish.enable = true;
diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index db00bbe..6864a29 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -45,7 +45,7 @@ in
             ref = "stable";
           };
           admin = {
-            package = pkgs.akkoma-frontends.admin-fe;
+            package = pkgs.akkoma-admin-fe;
             name = "admin-fe";
             ref = "stable";
           };
@@ -59,7 +59,8 @@ in
         config = {
           ":pleroma"."Pleroma.Web.Endpoint" = {
             "url" = { host = "pleroma.stuebinm.eu"; scheme = "https"; port = 443; };
-            "http" = { ip = "::"; port = 4000; };
+            # below uses IPv4; IPv6 breaks the elixir format generator …
+            "http" = { ip = "0.0.0.0"; port = 4000; };
             secret_key_base._secret = "/sops/keyBase";
             signing_salt._secret = "/sops/signingSalt";
           };
@@ -221,7 +222,7 @@ in
     enableACME = true;
 
     locations."/" = {
-      proxyPass = "http://[${config.containers.pleroma.localAddress6}]:4000";
+      proxyPass = "http://${config.containers.pleroma.localAddress}:4000";
       proxyWebsockets = true;
       # these headers are in the example config in the NixOS manual.
       # take some time to figure out what they all do, and if these
diff --git a/home/home.nix b/home/home.nix
index c93daef..e743f2a 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -392,11 +392,13 @@
 
   services.mako = {
     enable = true;
-    backgroundColor = "#74389eb0";
-    borderColor = "#c27cb6ff";
-    defaultTimeout = 5000; # milliseconds
-    padding = "10";
-    output = "DP-9";
+    settings = {
+      background-color = "#74389eb0";
+      border-color = "#c27cb6ff";
+      default-timeout = 5000; # milliseconds
+      padding = "10";
+      output = "DP-9";
+    };
   };
 
   services.mpd = {
diff --git a/home/packages.nix b/home/packages.nix
index 30d129d..15aeeca 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,12 +1,14 @@
 { config, lib, pkgs, inputs, system, craneLib, ... }:
 
 let
-    isabelle = import "${inputs.playground.outPath}/isabelle-nix-fhsenv" { inherit pkgs; };
+  isabelle = import "${inputs.playground.outPath}/isabelle-nix-fhsenv" { inherit pkgs; };
+  fonts = with lib.attrsets;
+    builtins.filter isDerivation (attrValues pkgs.nerd-fonts);
 in
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; fonts ++ [
     emacs-pgtk
-    emacs-all-the-icons-fonts nerdfonts
+    emacs-all-the-icons-fonts julia-mono
 
     # internet apps & clients
     firefox keepassxc mumble lynx offpunk
@@ -17,7 +19,7 @@ in
     gimp-with-plugins inkscape pavucontrol # krita
     gst_all_1.gstreamer vimiv-qt
     # LaTeX & documents
-    xournal pandoc zathura pdfpc
+    xournalpp pandoc zathura pdfpc
     poppler_utils typst rustex
     (texlive.combine {
       inherit (texlive) scheme-full;
@@ -28,7 +30,7 @@ in
     wl-clipboard showrt
     kijetesantakaluotokieni mpc_cli dufs progress hledger
     wineWowPackages.full sops xdg-utils exiftool
-    mercurial darcs git-annex-remote-remarkable2
+    mercurial darcs git-annex-remote-remarkable2 git-who
     rlwrap
     # graphical utils
     kitty
@@ -58,7 +60,7 @@ in
     # C/C++
     clang clang-tools rtags irony-server
     # others
-    python39 inweb
+    python3 inweb
     # nix things
     npins nix-output-monitor direnv
     # isabelle
diff --git a/ilex/configuration.nix b/ilex/configuration.nix
index f8530b8..d648adc 100644
--- a/ilex/configuration.nix
+++ b/ilex/configuration.nix
@@ -10,7 +10,7 @@
       services.avahi.enable = true;
       services.avahi.nssmdns4 = true;
       services.avahi.nssmdns6 = true;
-      services.ipp-usb.enable=true;
+      services.ipp-usb.enable = true;
       hardware.sane.enable = true;
       users.users.stuebinm.extraGroups = [ "scanner" "lp" ];
     };
diff --git a/inputs.nix b/inputs.nix
index 7329531..b31981b 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -63,7 +63,7 @@ let
     simple-nixos-mailserver = import sources.simple-nixos-mailserver;
 
     lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" {
-      lix = sources.lix;
+      lix = sources.lix // { rev = sources.lix.revision; };
     };
   };
 in inputs
diff --git a/npins/sources.json b/npins/sources.json
index 49af674..1401114 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -8,9 +8,9 @@
         "repo": "ai.robots.txt"
       },
       "branch": "main",
-      "revision": "7a2e6cba52e782ab32552c2335637af761afbe51",
-      "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/7a2e6cba52e782ab32552c2335637af761afbe51.tar.gz",
-      "hash": "040v730y5s9ya6fd803k2a5vhxyari6mxahn5gqqx2mjjzi6l4n2"
+      "revision": "093ab81d789528bb5d89c2d2c708b8f157e3b795",
+      "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/093ab81d789528bb5d89c2d2c708b8f157e3b795.tar.gz",
+      "hash": "0c5gzprgdik0f8436bcfjiz14hnajcmi4gl83cfv6499pkgqycpf"
     },
     "almanac": {
       "type": "Git",
@@ -89,10 +89,10 @@
         "owner": "nix-community",
         "repo": "home-manager"
       },
-      "branch": "release-24.11",
-      "revision": "1eec32f0efe3b830927989767a9e6ece0d82d608",
-      "url": "https://github.com/nix-community/home-manager/archive/1eec32f0efe3b830927989767a9e6ece0d82d608.tar.gz",
-      "hash": "03z2v28ac11bisxf9n73brrjp85878wapqs9853p0f73vx8a5jfw"
+      "branch": "release-25.05",
+      "revision": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
+      "url": "https://github.com/nix-community/home-manager/archive/83665c39fa688bd6a1f7c43cf7997a70f6a109f9.tar.gz",
+      "hash": "06kpj2mgfd3b0sip93k12ls00vn48ghxn3xg8705cfyn321m380r"
     },
     "isabelle-utils": {
       "type": "Git",
@@ -112,9 +112,9 @@
         "url": "https://git.lix.systems/lix-project/lix.git"
       },
       "branch": "main",
-      "revision": "eb18a90afbe0ade000d957cda344a5bcb3d565d4",
+      "revision": "8525345fd192a552e777bd37689154ad8e05b3e0",
       "url": null,
-      "hash": "0067ilcc80grvjbzjcbrhsszzrbim0jdkg7b6i7rv0gk5c45y7x6"
+      "hash": "1pfzczc7kd7sr3w3igfh3fp8mlf7p5sg0lwa84hwkpsahss2lkas"
     },
     "lix-nixos-module": {
       "type": "Git",
@@ -135,9 +135,9 @@
         "server": "https://gitlab.com/"
       },
       "branch": "master",
-      "revision": "433520257af7170824ab6e567d49b8e305e776e9",
-      "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=433520257af7170824ab6e567d49b8e305e776e9",
-      "hash": "07rhrnypw4bk9hbhsh3m8fcbgd26binzkg4wbxjz98lf43svvrf0"
+      "revision": "53007af63fade28853408370c4c600a63dd97f41",
+      "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=53007af63fade28853408370c4c600a63dd97f41",
+      "hash": "0jpp086m839dz6xh6kw5r8iq0cm4nd691zixzy6z11c4z2vf8v85"
     },
     "nixpkgs": {
       "type": "Git",
@@ -146,10 +146,10 @@
         "owner": "NixOS",
         "repo": "nixpkgs"
       },
-      "branch": "nixos-24.11",
-      "revision": "9b5ac7ad45298d58640540d0323ca217f32a6762",
-      "url": "https://github.com/NixOS/nixpkgs/archive/9b5ac7ad45298d58640540d0323ca217f32a6762.tar.gz",
-      "hash": "0zqvvkb1gsqxvm2vvp184spm1kc363sx0byv7cdxmmj4wk51kfv1"
+      "branch": "nixos-25.05",
+      "revision": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+      "url": "https://github.com/NixOS/nixpkgs/archive/7c43f080a7f28b2774f3b3f43234ca11661bf334.tar.gz",
+      "hash": "0bxirhx43mw728lkvbdc6yg0s51islfkqgihdvnzvi0klr23d9xf"
     },
     "nixpkgs-unstable": {
       "type": "Git",
@@ -159,9 +159,9 @@
         "repo": "nixpkgs"
       },
       "branch": "nixpkgs-unstable",
-      "revision": "3fcbdcfc707e0aa42c541b7743e05820472bdaec",
-      "url": "https://github.com/NixOS/nixpkgs/archive/3fcbdcfc707e0aa42c541b7743e05820472bdaec.tar.gz",
-      "hash": "1sxs59sq44ngy51h46f24mfks0mrdbsqhgapdn0kxs9dkn6dn594"
+      "revision": "ad331efcaf680eb1c838cb339472399ea7b3cdab",
+      "url": "https://github.com/NixOS/nixpkgs/archive/ad331efcaf680eb1c838cb339472399ea7b3cdab.tar.gz",
+      "hash": "020zxgs9k0573j1xjwybyhb0228k4wljjhmax3vr4ih8dl1d3a9d"
     },
     "ntfy-matrix-bot": {
       "type": "Git",
@@ -193,9 +193,9 @@
         "repo": "rust-overlay"
       },
       "branch": "master",
-      "revision": "bd030fd9983f7fddf87be1c64aa3064c8afa24c4",
-      "url": "https://github.com/oxalica/rust-overlay/archive/bd030fd9983f7fddf87be1c64aa3064c8afa24c4.tar.gz",
-      "hash": "1j3kjh0zlanj31c14hk18nzj9j9aw6ib8lg2pjmywlicd0hmhisv"
+      "revision": "9c8ea175cf9af29edbcff121512e44092a8f37e4",
+      "url": "https://github.com/oxalica/rust-overlay/archive/9c8ea175cf9af29edbcff121512e44092a8f37e4.tar.gz",
+      "hash": "0q36wkmg1m05fiy66fjzvjri4kpm502rw07bmp9jylpnlc62x5f7"
     },
     "showrt": {
       "type": "Git",
diff --git a/pkgs/hikari.nix b/pkgs/hikari.nix
index 6506590..afbc335 100644
--- a/pkgs/hikari.nix
+++ b/pkgs/hikari.nix
@@ -2,6 +2,7 @@
 , pkg-config, bmake
 , cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman
 , libucl, wayland, wayland-protocols, wayland-scanner, wlroots, mesa
+, libdrm, libgbm
 , features ? {
     gammacontrol = true;
     layershell   = true;
@@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
     libevdev
     libinput
     libxkbcommon
+    libdrm
+    libgbm
     linux-pam
     pango
     pixman
diff --git a/pkgs/mollysocket.nix b/pkgs/mollysocket.nix
index 1a079b4..a58c1a0 100644
--- a/pkgs/mollysocket.nix
+++ b/pkgs/mollysocket.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2OWkPTbrD4oXHoB+qszVjLr0e/AUuNnuaYXZ3kOyuxg=";
   };
 
-  cargoHash = "sha256-fVH5gzQYzW6uIBO8Fob04IiVyxHDh+Pr21rSow40qLk=";
+  cargoHash = "sha256-fR87PUgb+F2Q4vRYUonmGi6JzJLvGWPEKhwHw+TAsyQ=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/nomsring/nomsring.cabal b/pkgs/nomsring/nomsring.cabal
index fca40c5..ea3625f 100644
--- a/pkgs/nomsring/nomsring.cabal
+++ b/pkgs/nomsring/nomsring.cabal
@@ -13,7 +13,7 @@ common warnings
 executable nomsring
     import:           warnings
     main-is:          Main.hs
-    build-depends:    base ^>=4.18
+    build-depends:    base
                     , cgi ^>=3001.5
                     , data-clist ^>= 0.2
     default-language: GHC2021
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 2d561ff..e981f8f 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -12,7 +12,7 @@ let
   radicle = import ./radicle.nix;
 in
 {
-  beam = super.beam_nox;
+  beam = super.beam_minimal;
 
   git-annex-remote-remarkable2 = self.callPackage
     ({ rustPlatform, fetchgit, ... }:
@@ -31,8 +31,11 @@ in
   galmon-core = self.callPackage ./galmon.nix {};
   galmon-full = self.callPackage ./galmon.nix { buildAll = true; };
 
-  akkoma-fe = super.akkoma-frontends.akkoma-fe.overrideAttrs (old: {
-    patches = [ ./patches/akkoma-fe-toki-pona.patch ];
+  akkoma-fe = super.akkoma-fe.overrideAttrs (old: {
+    patches = [
+      ./patches/akkoma-fe-toki-pona.patch
+      ./patches/akkoma-fe-toki-pona-2.patch
+  ];
   });
 
   akkoma = (self.callPackage ./akkoma {}).overrideAttrs {
@@ -202,7 +205,7 @@ in
             , lib, stm, text, time, vector, wai, wai-extra, warp
             }:
               mkDerivation {
-                pname = "bahnhof.name";
+                pname = "bahnhof-name";
                 version = "0.2.0.0";
                 src = inputs.bahnhof-name;
                 isLibrary = false;
@@ -212,6 +215,7 @@ in
                   http-client-openssl http-types stm text time vector wai wai-extra
                   warp
                 ];
+                jailbreak = true;
                 mainProgram = "bahnhof-name";
                 license = lib.licenses.eupl12;
                 postInstall = ''
@@ -245,13 +249,13 @@ in
 
   git-who = self.buildGoModule rec {
     pname = "git-who";
-    version = "0.7";
+    version = "1.1";
 
     src = (self.fetchFromGitHub {
       owner = "sinclairtarget";
       repo = "git-who";
       rev = "v${version}";
-      hash = "sha256-Ujtwb4DTK7dUcyHvaF52a/YF3YO6WyszUIoxrEKE9jo=";
+      hash = "sha256-H6RbmkM8/n0HDMI3auz6YyEn/vsfXWk5ig+pBhZG3nI=";
       # submodules contain test data and have ssh urls, hence this absurdity
       fetchSubmodules = true;
       leaveDotGit = true;
diff --git a/pkgs/patches/akkoma-fe-toki-pona.patch b/pkgs/patches/akkoma-fe-toki-pona.patch
index 281fdfc..b556fb6 100644
--- a/pkgs/patches/akkoma-fe-toki-pona.patch
+++ b/pkgs/patches/akkoma-fe-toki-pona.patch
@@ -4,23 +4,9 @@ Date: Fri, 23 Jun 2023 01:56:43 +0200
 Subject: [PATCH] mi la, toki pona li pona a
 
 ---
- src/components/post_status_form/post_status_form.js | 2 +-
  src/services/locale/locale.service.js               | 8 +++++---
  2 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
-index 5647a9eb..25180ba9 100644
---- a/src/components/post_status_form/post_status_form.js
-+++ b/src/components/post_status_form/post_status_form.js
-@@ -303,7 +303,7 @@ const PostStatusForm = {
-       mobileLayout: state => state.interface.mobileLayout
-     }),
-     isoLanguages () {
--      return iso6391.getAllCodes();
-+      return iso6391.getAllCodes().concat(['tok']);
-     }
-   },
-   watch: {
 diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
 index 8cef2522..8bee6ad2 100644
 --- a/src/services/locale/locale.service.js
diff --git a/pkgs/wlroots_0_15.nix b/pkgs/wlroots_0_15.nix
index 93095f8..6b63e4c 100644
--- a/pkgs/wlroots_0_15.nix
+++ b/pkgs/wlroots_0_15.nix
@@ -23,6 +23,9 @@
 , glslang
 , libliftoff
 , libdisplay-info
+, libdrm
+, libgbm
+, cmake
 , nixosTests
 
 , enableXWayland ? true
@@ -47,6 +50,8 @@ stdenv.mkDerivation {
         hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
       };
 
+      CFLAGS = [ "-Wno-calloc-transposed-args" ];
+
     postPatch = ''
       substituteInPlace backend/drm/meson.build \
         --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
@@ -58,10 +63,12 @@ stdenv.mkDerivation {
       strictDeps = true;
       depsBuildBuild = [ pkg-config ];
 
-      nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ];
+      nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang cmake ];
 
       buildInputs = [
         libGL
+        libdrm
+        libgbm
         libcap
         libinput
         libpng