flake.lock: Update

Flake lock file updates: • Updated input 'comma': 'github:nix-community/comma/650c41b59b4ab16327ad0cdb995c3857b9583987' (2025-03-19) → 'github:nix-community/comma/27ce74dda284f57ad17daf3d17ffda2bd67e4b0a' (2025-07-13) • Updated input 'comma/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → 'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885' (2025-05-12) • Updated input 'comma/naersk': 'github:nix-community/naersk/3fb418eaf352498f6b6c30592e3beb63df42ef11' (2024-07-23) → 'github:nix-community/naersk/0473954e399eec0081ee816f3430c17d1f7e5a42' (2025-07-07) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/d8bad40da349c15b37f83159019a5e7f452cecc6' (2025-04-23) → 'github:nix-community/emacs-overlay/ec568d50f0c82751c60c99efa282f1392d515ab4' (2025-07-18) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/9684b53175fc6c09581e94cc85f05ab77464c7e3' (2025-04-21) → 'github:NixOS/nixpkgs/50ab793786d9de88ee30ec4e4c24fb4236fc2674' (2025-06-30) • Updated input 'glpi-inventory': 'github:mmarx/glpi-inventory/dd3511453c81adbb3965f5dd089fe6956c37d318' (2025-01-27) → 'github:mmarx/glpi-inventory/23c74136a320804c3f737219cf3522b3ebb4b4cf' (2025-05-26) • Updated input 'lix-module': '2226eb3b97.tar.gz?narHash=sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo%3D&rev=2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62' (2025-06-01) → '8b1094356f.tar.gz?narHash=sha256-SXUAlxpjPRkArRMHy5%2BHdi%2BPiC%2BND9yzzIjiaHmTvQU%3D&rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02' (2025-06-29) • Updated input 'lix-module/lix': 'fbd6a014ec.tar.gz?narHash=sha256-L1p9RbZMXS2Ac0d61dgi1QlzN1CrfQIMtrB3/t5M2ag%3D&rev=fbd6a014ec8e540b817cc18020ff47f4a14f143d' (2025-06-19) → '1d7368585e.tar.gz?narHash=sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43%2BYI%3D&rev=1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6' (2025-06-29) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64' (2025-04-23) → 'github:NixOS/nixos-hardware/d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153' (2025-07-16) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/c11863f1e964833214b767f4a369c6e6a7aba141' (2025-04-21) → 'github:NixOS/nixpkgs/6e987485eb2c77e5dcc5af4e3c70843711ef9251' (2025-07-16) • Updated input 'simple-nixos-mailserver/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → 'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885' (2025-05-12) • Updated input 'simple-nixos-mailserver/git-hooks': 'github:cachix/git-hooks.nix/16ec914f6fb6f599ce988427d9d94efddf25fe6d' (2025-06-24) → 'github:cachix/git-hooks.nix/dcf5072734cb576d2b0c59b2ac44f5050b5eac82' (2025-03-22) • Updated input 'simple-nixos-mailserver/nixpkgs-25_05': 'github:NixOS/nixpkgs/32a4e87942101f1c9f9865e04dc3ddb175f5f32e' (2025-07-15) → 'github:NixOS/nixpkgs/ca49c4304acf0973078db0a9d200fd2bae75676d' (2025-05-18) • Updated input 'sops-nix': 'github:Mic92/sops-nix/5e3e92b16d6fdf9923425a8d4df7496b2434f39c' (2025-04-22) → 'github:Mic92/sops-nix/2c8def626f54708a9c38a5861866660395bb3461' (2025-07-15)
Upgrade to 25.05
2025-12-20 09:39:39 +01:00 · 2025-07-18 11:15:24 +02:00 · 2025-07-18 11:14:21 +02:00 · 2025-07-18 10:59:24 +02:00
8 changed files with 117 additions and 78 deletions
--- a/common/users.nix
+++ b/common/users.nix
@ -11,7 +11,7 @@ with lib; {
        meta = {
          ellmau = {
            description = "Stefan Ellmauthaler";
-            mailAddress = "stefan.ellmauthaler@tu-dresden.de";
+            mailAddress = "stefan.ellmauthaler@gmail.com";
            hashedPassword = "$y$j9T$EUB/pNS7bH/zeIDUwgul80$JXNbeJpjNRKHtczeKxkDt.wzGfE3h1I7oFnJJpT3go8";
            publicKeys = [
              "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII0XgjNGsqo8gbtPTpH8pHCdGQyGNWdKcSAmyhiLBLM3 stefan.ellmauthaler@tu-dresden.de"
--- a/flake.lock
+++ b/flake.lock
@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742411560,
-        "narHash": "sha256-a793QMuHjVB8YB8q595rlnXqlOHbuiI7ybbrB6kuJbw=",
+        "lastModified": 1752447448,
+        "narHash": "sha256-Q9s3z/FqkEqCQyvYhH07qlITGGlA8quZcYsK3lO8M8g=",
        "owner": "nix-community",
        "repo": "comma",
-        "rev": "650c41b59b4ab16327ad0cdb995c3857b9583987",
+        "rev": "27ce74dda284f57ad17daf3d17ffda2bd67e4b0a",
        "type": "github"
      },
      "original": {
@ -50,11 +50,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1745400268,
-        "narHash": "sha256-dNSzXe3GNwoBYUBGBjXTvBaWfBSDFheWyIbEu+g0Et8=",
+        "lastModified": 1752829975,
+        "narHash": "sha256-4MYRwu/tPHMnshmte/Eqb1mIwZ0Vw7LPZfvZgwz16t4=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "d8bad40da349c15b37f83159019a5e7f452cecc6",
+        "rev": "ec568d50f0c82751c60c99efa282f1392d515ab4",
        "type": "github"
      },
      "original": {
@ -66,11 +66,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@ -82,11 +82,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@ -164,6 +164,54 @@
        "type": "github"
      }
    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "simple-nixos-mailserver",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
    "glpi-inventory": {
      "inputs": {
        "nixpkgs": [
@ -174,11 +222,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737991562,
-        "narHash": "sha256-YNADb11GdcgOq60i/eWCaiD13SQqmFmOluYzuXlmAdQ=",
+        "lastModified": 1748281236,
+        "narHash": "sha256-t8/FElqfjCJy0spewRK0IjC+Y+K6bkprMjpA6Uy2Nws=",
        "owner": "mmarx",
        "repo": "glpi-inventory",
-        "rev": "dd3511453c81adbb3965f5dd089fe6956c37d318",
+        "rev": "23c74136a320804c3f737219cf3522b3ebb4b4cf",
        "type": "github"
      },
      "original": {
@ -194,16 +242,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1744743431,
-        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
+        "lastModified": 1752780124,
+        "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
+        "rev": "c718918222bdb104397762dea67e6b397a7927fe",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -211,11 +259,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1750345799,
-        "narHash": "sha256-L1p9RbZMXS2Ac0d61dgi1QlzN1CrfQIMtrB3/t5M2ag=",
-        "rev": "fbd6a014ec8e540b817cc18020ff47f4a14f143d",
+        "lastModified": 1751235704,
+        "narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=",
+        "rev": "1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fbd6a014ec8e540b817cc18020ff47f4a14f143d.tar.gz?rev=fbd6a014ec8e540b817cc18020ff47f4a14f143d"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6.tar.gz?rev=1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6"
      },
      "original": {
        "type": "tarball",
@ -232,11 +280,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748803223,
-        "narHash": "sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo=",
-        "rev": "2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62",
+        "lastModified": 1751240025,
+        "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=",
+        "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62.tar.gz?rev=2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02"
      },
      "original": {
        "type": "tarball",
@ -251,11 +299,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721727458,
-        "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
+        "lastModified": 1751923969,
+        "narHash": "sha256-QNo234SxSB2lLavaT2d+g+Z2WB7o7w29vYkM6zfRLi4=",
        "owner": "nix-community",
        "repo": "naersk",
-        "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
+        "rev": "0473954e399eec0081ee816f3430c17d1f7e5a42",
        "type": "github"
      },
      "original": {
@ -267,11 +315,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1745392233,
-        "narHash": "sha256-xmqG4MZArM1JNxPJ33s0MtuBzgnaCO9laARoU3AfP8E=",
+        "lastModified": 1752666637,
+        "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64",
+        "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153",
        "type": "github"
      },
      "original": {
@ -283,42 +331,43 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1745279238,
-        "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
+        "lastModified": 1752620740,
+        "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
+        "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs-24_11": {
+    "nixpkgs-25_05": {
      "locked": {
-        "lastModified": 1734083684,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "lastModified": 1747610100,
+        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
        "type": "github"
      },
      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.11",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1745279238,
-        "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
        "type": "github"
      },
      "original": {
@ -330,11 +379,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1745234285,
-        "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
+        "lastModified": 1752687322,
+        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
+        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
        "type": "github"
      },
      "original": {
@ -363,22 +412,23 @@
      "inputs": {
        "blobs": "blobs",
        "flake-compat": "flake-compat_2",
+        "git-hooks": "git-hooks",
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-25_05": "nixpkgs-25_05"
      },
      "locked": {
-        "lastModified": 1734884447,
-        "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=",
+        "lastModified": 1747965231,
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "63209b1def2c9fc891ad271f474a3464a5833294",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
@ -390,11 +440,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745310711,
-        "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
+        "lastModified": 1752544651,
+        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
+        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -2,7 +2,7 @@
  description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";

    #nix = {
@ -19,7 +19,7 @@
    nixos-hardware = {url = "github:NixOS/nixos-hardware/master";};

    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@ -31,7 +31,7 @@
    };

    simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@ -35,16 +35,6 @@ with lib; {
    cfg = config.elss.graphical;
    #cursorsize = if config.variables.hostName == "nucturne" then 14 else 16;
    #xserverDPI = if config.variables.hostName == "stel-xps" then 180 else null;
-
-    okular-x11 = pkgs.symlinkJoin {
-      name = "okular";
-      paths = [pkgs.okular];
-      buildInputs = [pkgs.makeWrapper];
-      postBuild = ''
-        wrapProgram $out/bin/okular \
-        --set QT_QPA_PLATFORM xcb
-      '';
-    };
  in
    mkIf cfg.enable {
      #      cfg.xserver.enable = cfg.i3.enable;
@ -94,8 +84,7 @@ with lib; {

      environment.systemPackages = with pkgs; [
        ungoogled-chromium
-        # force okular to use xwayland, because of https://github.com/swaywm/sway/issues/4973
-        okular-x11
+        kdePackages.okular
        texlive.combined.scheme-full
        usbutils
        keepassxc
--- a/modules/locale.nix
+++ b/modules/locale.nix
@ -26,7 +26,7 @@ with lib; {
        noto-fonts-extra
        roboto
        roboto-mono
-        (nerdfonts.override {fonts = ["Hasklig"];})
+        nerd-fonts.hasklug
        material-icons
        weather-icons
        xits-math
--- a/modules/server/nextcloud.nix
+++ b/modules/server/nextcloud.nix
@ -12,7 +12,7 @@ with lib; {
      elss.server.sql.enable = mkDefault true;
      services.nextcloud = {
        enable = true;
-        package = pkgs.nextcloud30;
+        package = pkgs.nextcloud31;
        hostName = "cloudstore.ellmauthaler.net";
        https = true;
        config = {
--- a/users/ellmau/mako.nix
+++ b/users/ellmau/mako.nix
@ -10,7 +10,7 @@ with lib; {
    cfg = nixosConfig.elss.graphical.sway;
  in
    mkIf cfg.enable {
-      programs.mako = {
+      services.mako = {
        enable = true;
        iconPath = "${pkgs.numix-icon-theme}";
        font = "Hasklug Nerd Font 10";
--- a/users/ellmau/zsh.nix
+++ b/users/ellmau/zsh.nix
@ -5,7 +5,7 @@
      defaultKeymap = "emacs";
      oh-my-zsh.enable = false;
      # remove extra stuff on the right side of the prompt
-      initExtra = ''
+      initContent = ''
        unset RPS1
        # Color man pages
        export LESS_TERMCAP_mb=$'\E[01;32m'