Upgrade to 25.11

This commit is contained in:
Tibo De Peuter 2025-12-04 10:28:40 +01:00
parent b9e72e8f92
commit ee26741ec2
Signed by: tdpeuter
GPG key ID: 38297DE43F75FFE2
5 changed files with 30 additions and 65 deletions

51
nixos/flake.lock generated
View file

@ -25,16 +25,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763992789, "lastModified": 1764736872,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "rev": "3366918730bb6b699395a9d237397f1d710a94b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -62,26 +62,26 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1763948260, "lastModified": 1764522689,
"narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1763966396, "lastModified": 1764517877,
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,8 +163,7 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"openconnect-sso": "openconnect-sso", "openconnect-sso": "openconnect-sso",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"utils": "utils", "utils": "utils"
"zen-browser": "zen-browser"
} }
}, },
"sops-nix": { "sops-nix": {
@ -174,11 +173,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764021963, "lastModified": 1764483358,
"narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,26 +256,6 @@
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
},
"zen-browser": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1764043759,
"narHash": "sha256-E2rAiWTdrjSAciWELleI/fHoryzfxvA+ujvqZy3u2QA=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "482827614f573a2ec9dc17c8401889e536f0e7c1",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "zen-browser-flake",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -2,12 +2,12 @@
description = "System configuration of my machines using flakes"; description = "System configuration of my machines using flakes";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
openconnect-sso = { openconnect-sso = {
@ -25,15 +25,11 @@
url = "github:gytis-ivaskevicius/flake-utils-plus"; url = "github:gytis-ivaskevicius/flake-utils-plus";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
zen-browser = {
url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs@{ outputs = inputs@{
self, nixpkgs, nixpkgs-unstable, self, nixpkgs, nixpkgs-unstable,
flake-utils, home-manager, openconnect-sso, sops-nix, utils, zen-browser, flake-utils, home-manager, openconnect-sso, sops-nix, utils,
... }: ... }:
let let
system = utils.lib.system.x86_64-linux; system = utils.lib.system.x86_64-linux;

View file

@ -113,17 +113,17 @@
}; };
}; };
logind = { logind.settings.Login = {
# Handle the laptop lid switch as follows: # Handle the laptop lid switch as follows:
lidSwitch = "hybrid-sleep"; HandleLidSwitch = "hybrid-sleep";
lidSwitchExternalPower = "lock"; HandleLidSwitchExternalPower = "lock";
lidSwitchDocked = "ignore"; HandleLidSwitchDocked = "ignore";
# Handle the power key # Handle the power key
powerKey = "suspend"; HandlePowerKey = "suspend";
HandlePowerKeyLongPress = "poweroff";
}; };
power-profiles-daemon.enable = false; power-profiles-daemon.enable = false;
smartd.enable = true; smartd.enable = true;
@ -161,12 +161,6 @@
useXkbConfig = true; # use xkb.options in tty. useXkbConfig = true; # use xkb.options in tty.
}; };
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
# services.libinput.enable = true;
# List packages installed in system profile. # List packages installed in system profile.
# You can use https://search.nixos.org/ to find more packages (and options). # You can use https://search.nixos.org/ to find more packages (and options).
environment = { environment = {
@ -200,6 +194,5 @@
# #
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "25.05"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

View file

@ -41,8 +41,8 @@ in {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-ocl intel-ocl
intel-compute-runtime intel-compute-runtime
intel-graphics-compiler
opencl-clhpp opencl-clhpp
opencl-clang
opencl-headers opencl-headers
ocl-icd ocl-icd
]; ];

View file

@ -1,4 +1,4 @@
{ config, inputs, lib, pkgs, pkgs-unstable, ... }: { config, lib, pkgs, pkgs-unstable, ... }:
let let
cfg = config.sisyphus.users.tdpeuter; cfg = config.sisyphus.users.tdpeuter;
@ -46,9 +46,10 @@ in {
gh # GitHub CLI tool gh # GitHub CLI tool
glow # Terminal Markdown renderer glow # Terminal Markdown renderer
icosystem # Personal icon theme icosystem # Personal icon theme
jellyfin-media-player #jellyfin-media-player
libreoffice-fresh # Office tools libreoffice-fresh # Office tools
librewolf # Internet browser librewolf # Internet browser
logseq # Note taking
mpv # Media player mpv # Media player
nextcloud-client nextcloud-client
nsxiv # Lightweight image viewer nsxiv # Lightweight image viewer
@ -73,10 +74,7 @@ in {
# TODO Move to devshells # TODO Move to devshells
# ruff pylint # Python # ruff pylint # Python
]) ++ (with pkgs-unstable; [ ]) ++ (with pkgs-unstable; [
logseq # Note taking ]);
]) ++ [
inputs.zen-browser.packages.${pkgs.system}.default
];
}; };
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -87,9 +85,8 @@ in {
noto-fonts # Dependency of Zellij config noto-fonts # Dependency of Zellij config
noto-fonts-cjk-sans # Dependency of Zellij config noto-fonts-cjk-sans # Dependency of Zellij config
noto-fonts-cjk-serif # Dependency of Zellij config noto-fonts-cjk-serif # Dependency of Zellij config
noto-fonts-emoji
noto-fonts-color-emoji # Emoji's! noto-fonts-color-emoji # Emoji's!
vistafonts # Microsoft fonts vista-fonts # Microsoft fonts
]; ];
sisyphus = { sisyphus = {