From 39c5a9401d6a84df1303b00d25e3508654dba69e Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Fri, 18 Jul 2025 11:14:21 +0200 Subject: [PATCH] Upgrade to 25.05 --- flake.lock | 90 ++++++++++++++++++++++++++++-------- flake.nix | 6 +-- modules/graphical.nix | 13 +----- modules/locale.nix | 2 +- modules/server/nextcloud.nix | 2 +- users/ellmau/mako.nix | 2 +- users/ellmau/zsh.nix | 2 +- 7 files changed, 78 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index b6a44a9..e206026 100644 --- a/flake.lock +++ b/flake.lock @@ -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": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "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": [ @@ -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" } @@ -283,33 +331,34 @@ }, "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": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -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" } diff --git a/flake.nix b/flake.nix index b61c19a..cc74742 100644 --- 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"; }; diff --git a/modules/graphical.nix b/modules/graphical.nix index 19dc7b7..5cfbf1e 100644 --- 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 diff --git a/modules/locale.nix b/modules/locale.nix index b85eba7..a14e96e 100644 --- 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 diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index cdd2fe0..b2d8327 100644 --- 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 = { diff --git a/users/ellmau/mako.nix b/users/ellmau/mako.nix index d4024aa..ff03323 100644 --- 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"; diff --git a/users/ellmau/zsh.nix b/users/ellmau/zsh.nix index c50c0fe..a24053e 100644 --- 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'