vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade to nixos 25.11

Browse source 
- thefuck has been removed, use pay-repects instead
- 'glxinfo' has been renamed to/replaced by 'mesa-demos'
- options have been moved out of the 'xserver' namespace
- use default mesa drivers, remove amdvlk
- systemd global config has been moved and is not string-based anymore
- git settings have been moved to sub-attrset
- ssh default options generate a warning now but are not needed -> disable
- unpin nixpkgs version for servicepoint flakes
This commit is contained in:
Vinzenz Schroeter 2025-12-01 17:30:51 +01:00
parent 9a5fd746e4
commit 417d65062b
12 changed files with 89 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

78
flake.lock generated
View file

@ -261,18 +261,20 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1744584021,
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
"host": "gitlab.gnome.org",
"lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
"type": "github"
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "gitlab"
},
"original": {
"host": "gitlab.gnome.org",
"owner": "GNOME",
"ref": "48.1",
"ref": "gnome-49",
"repo": "gnome-shell",
"type": "github"
"type": "gitlab"
}
},
"home-manager": {
@ -282,16 +284,16 @@
]
},
"locked": {
"lastModified": 1763992789,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
"lastModified": 1764536451,
"narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
"rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@ -440,16 +442,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1764316264,
"narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
"lastModified": 1764522689,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
@ -485,6 +487,38 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1764560356,
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1764560356,
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": [
@ -600,9 +634,7 @@
"nix-filter": [
"nix-filter"
],
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1757763404,
@ -626,9 +658,7 @@
"nix-filter": [
"nix-filter"
],
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1757763091,
@ -691,16 +721,16 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1763845106,
"narHash": "sha256-S3HH655nydKoLTuqX8qcJidZH0PiWGB/YcoPomH1DaQ=",
"lastModified": 1764600318,
"narHash": "sha256-PtJfp13TUHZ24Z3ybeb2W3pOr+SEjI3xkcTumgGT28E=",
"owner": "nix-community",
"repo": "stylix",
"rev": "b9b8173a6e31c6d06f328307ddbdf7d6af82b7ad",
"rev": "c9760a6a2ba532e6d0dcae804b7cb62ec7198f70",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"ref": "release-25.11",
"repo": "stylix",
"type": "github"
}

12
flake.nix
View file

@ -1,10 +1,10 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -41,7 +41,8 @@
servicepoint-cli = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
inputs = {
nixpkgs.follows = "nixpkgs";
# TODO: update flake to 25.11
# nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
};
@ -49,7 +50,8 @@
servicepoint-simulator = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git";
inputs = {
nixpkgs.follows = "nixpkgs";
# TODO: update flake to 25.11
# nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
};
@ -59,7 +61,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
stylix = {
url = "github:nix-community/stylix/release-25.05";
url = "github:nix-community/stylix/release-25.11";
inputs = {
nixpkgs.follows = "nixpkgs";
nur.follows = "nur";

2
homeConfigurations/vinzenz/default.nix
View file

@ -42,7 +42,7 @@
];
};
thefuck = {
pay-respects = {
enable = true;
enableZshIntegration = true;
};

8
homeConfigurations/vinzenz/git.nix
View file

@ -1,15 +1,17 @@
{
config.programs.git = {
enable = true;
userName = "Vinzenz Schroeter";
userEmail = "vinzenz.f.s@gmail.com";
settings = {
user = {
name = "Vinzenz Schroeter";
email = "vinzenz.f.s@gmail.com";
};
aliases = {
prettylog = "log --pretty=oneline --graph";
spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
};
extraConfig = {
pull.ff = "only";
merge.tool = "kdiff3";
push.autoSetupRemote = "true";

1
homeConfigurations/vinzenz/ssh.nix
View file

@ -1,6 +1,7 @@
{
config.programs.ssh = {
enable = true;
enableDefaultConfig = false;
matchBlocks = {
"vpn2" = {
host = "vpn2 hetzner-vpn2";

2
homeModules/git.nix
View file

@ -2,7 +2,7 @@
programs = {
git = {
enable = true;
extraConfig.init.defaultBranch = "main";
settings.init.defaultBranch = "main";
};
gh = {

4
nixosConfigurations/hetzner-vpn2/nginx.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }:
let
blog-domain-socket = "/run/nginx/blog.sock";
anubis-domain-socket = "/run/anubis/anubis-blog.sock";
anubis-domain-socket = "/run/anubis/anubis-blog/anubis.sock";
in
{
security.acme = {
@ -42,7 +42,7 @@ in
};
};
anubis.instances.main = {
anubis.instances.blog = {
enable = true;
settings = {
BIND = anubis-domain-socket;

5
nixosModules/amd-graphics.nix
View file

@ -7,11 +7,6 @@
graphics.enable = true;
amdgpu = {
opencl.enable = true;
amdvlk = {
# TODO: this creates black borders around GNOME apps
# enable = true;
# support32Bit.enable = config.hardware.graphics.enable32Bit;
};
overdrive.enable = true;
};
};

7
nixosModules/gnome.nix
View file

@ -12,8 +12,10 @@
config = lib.mkMerge [
{
services = {
xserver = {
xserver.excludePackages = [ pkgs.xterm ];
# Enable the GNOME Desktop Environment.
displayManager.gdm.enable = true;
desktopManager.gnome = {
enable = true;
extraGSettingsOverridePackages = [ pkgs.mutter ];
@ -22,9 +24,6 @@
experimental-features=['scale-monitor-framebuffer']
'';
};
displayManager.gdm.enable = true;
excludePackages = [ pkgs.xterm ];
};
gnome = {
tinysparql.enable = false;

2
nixosModules/kdeconnect.nix
View file

@ -31,7 +31,7 @@
];
}
(lib.mkIf config.services.xserver.desktopManager.gnome.enable {
(lib.mkIf config.services.desktopManager.gnome.enable {
# replace kdeconnect with gsconnect
programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect;

4
nixosModules/modern-desktop.nix
View file

@ -28,9 +28,7 @@
services.NetworkManager-wait-online.enable = false;
# prevent stuck units from preventing shutdown (default is 120s)
extraConfig = ''
DefaultTimeoutStopSec=10s
'';
settings.Manager.DefaultTimeoutStopSec = "10s";
};
programs = {

2
nixosModules/wine-gaming.nix
View file

@ -17,6 +17,6 @@
dxvk
mangohud
vulkan-tools
glxinfo
mesa-demos
];
}