ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade to 25.05

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2025-07-18 11:14:21 +02:00
parent c2550da75e
commit 39c5a9401d
Signed by: ellmau
GPG Key ID: C804A9C1B7AF8256
7 changed files with 78 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
flake.lock generated
View File

@ -164,6 +164,54 @@
"type": "github" "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": { "glpi-inventory": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -194,16 +242,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744743431, "lastModified": 1752780124,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", "rev": "c718918222bdb104397762dea67e6b397a7927fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -283,33 +331,34 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1745279238, "lastModified": 1752620740,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24_11": { "nixpkgs-25_05": {
"locked": { "locked": {
"lastModified": 1734083684, "lastModified": 1752620740,
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -363,22 +412,23 @@
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"git-hooks": "git-hooks",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1734884447, "lastModified": 1747965231,
"narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "63209b1def2c9fc891ad271f474a3464a5833294", "rev": "53007af63fade28853408370c4c600a63dd97f41",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }

6
flake.nix
View File

@ -2,7 +2,7 @@
description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems"; description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";
inputs = { 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"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
#nix = { #nix = {
@ -19,7 +19,7 @@
nixos-hardware = {url = "github:NixOS/nixos-hardware/master";}; nixos-hardware = {url = "github:NixOS/nixos-hardware/master";};
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -31,7 +31,7 @@
}; };
simple-nixos-mailserver = { 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"; inputs.nixpkgs.follows = "nixpkgs";
}; };

13
modules/graphical.nix
View File

@ -35,16 +35,6 @@ with lib; {
cfg = config.elss.graphical; cfg = config.elss.graphical;
#cursorsize = if config.variables.hostName == "nucturne" then 14 else 16; #cursorsize = if config.variables.hostName == "nucturne" then 14 else 16;
#xserverDPI = if config.variables.hostName == "stel-xps" then 180 else null; #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 in
mkIf cfg.enable { mkIf cfg.enable {
# cfg.xserver.enable = cfg.i3.enable; # cfg.xserver.enable = cfg.i3.enable;
@ -94,8 +84,7 @@ with lib; {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ungoogled-chromium ungoogled-chromium
# force okular to use xwayland, because of https://github.com/swaywm/sway/issues/4973 kdePackages.okular
okular-x11
texlive.combined.scheme-full texlive.combined.scheme-full
usbutils usbutils
keepassxc keepassxc

2
modules/locale.nix
View File

@ -26,7 +26,7 @@ with lib; {
noto-fonts-extra noto-fonts-extra
roboto roboto
roboto-mono roboto-mono
(nerdfonts.override {fonts = ["Hasklig"];}) nerd-fonts.hasklug
material-icons material-icons
weather-icons weather-icons
xits-math xits-math

2
modules/server/nextcloud.nix
View File

@ -12,7 +12,7 @@ with lib; {
elss.server.sql.enable = mkDefault true; elss.server.sql.enable = mkDefault true;
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud31;
hostName = "cloudstore.ellmauthaler.net"; hostName = "cloudstore.ellmauthaler.net";
https = true; https = true;
config = { config = {

2
users/ellmau/mako.nix
View File

@ -10,7 +10,7 @@ with lib; {
cfg = nixosConfig.elss.graphical.sway; cfg = nixosConfig.elss.graphical.sway;
in in
mkIf cfg.enable { mkIf cfg.enable {
programs.mako = { services.mako = {
enable = true; enable = true;
iconPath = "${pkgs.numix-icon-theme}"; iconPath = "${pkgs.numix-icon-theme}";
font = "Hasklug Nerd Font 10"; font = "Hasklug Nerd Font 10";

2
users/ellmau/zsh.nix
View File

@ -5,7 +5,7 @@
defaultKeymap = "emacs"; defaultKeymap = "emacs";
oh-my-zsh.enable = false; oh-my-zsh.enable = false;
# remove extra stuff on the right side of the prompt # remove extra stuff on the right side of the prompt
initExtra = '' initContent = ''
unset RPS1 unset RPS1
# Color man pages # Color man pages
export LESS_TERMCAP_mb=$'\E[01;32m' export LESS_TERMCAP_mb=$'\E[01;32m'