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

chore: upgrade to NixOS 25.11
All checks were successful
Test / tests (push) Successful in 13m10s
Details

Browse source
This commit is contained in:
Felix Schröter 2025-12-09 22:41:14 +01:00
parent 75d3736626
commit e1a08c7246
Signed by: felschr
GPG key ID: 671E39E6744C807D
20 changed files with 44 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop/cosmic.nix
View file

@ -5,8 +5,8 @@
specialisation = { specialisation = {
cosmic.configuration = { cosmic.configuration = {
services.xserver.displayManager.gdm.enable = lib.mkForce false; services.displayManager.gdm.enable = lib.mkForce false;
services.xserver.desktopManager.gnome.enable = lib.mkForce false; services.desktopManager.gnome.enable = lib.mkForce false;
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true; services.displayManager.cosmic-greeter.enable = true;

9
desktop/gnome.nix
View file

@ -16,10 +16,10 @@
tailscale-qs tailscale-qs
]; ];
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true; services.displayManager.gdm.wayland = true;
services.xserver.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.extraGSettingsOverrides = '' services.desktopManager.gnome.extraGSettingsOverrides = ''
[org.gnome.desktop.input-sources] [org.gnome.desktop.input-sources]
sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')] sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')]
@ -40,7 +40,6 @@
gnome-software gnome-software
totem totem
epiphany epiphany
evince
]; ];
programs.gnome-terminal.enable = false; programs.gnome-terminal.enable = false;
programs.geary.enable = false; programs.geary.enable = false;

16
flake.lock generated
View file

@ -299,16 +299,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763992789, "lastModified": 1765170903,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "rev": "20561be440a11ec57a89715480717baf19fe6343",
"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"
} }
@ -368,16 +368,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764939437, "lastModified": 1764983851,
"narHash": "sha256-4TLFHUwXraw9Df5mXC/vCrJgb50CRr3CzUzF0Mn3CII=", "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -13,7 +13,7 @@ rec {
}; };
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -32,7 +32,7 @@ rec {
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";
}; };

2
home/ausweisapp.nix
View file

@ -2,5 +2,5 @@
with pkgs; with pkgs;
{ {
home.packages = [ AusweisApp2 ]; home.packages = [ ausweisapp ];
} }

2
home/browsers/firefox.nix
View file

@ -8,7 +8,7 @@
with lib; with lib;
let let
firefox-addons = inputs.firefox-addons.packages.${pkgs.system}; firefox-addons = inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system};
inherit (import ../modules/firefox/common.nix { inherit config lib pkgs; }) mkConfig; inherit (import ../modules/firefox/common.nix { inherit config lib pkgs; }) mkConfig;

2
home/browsers/mullvad-browser.nix
View file

@ -6,7 +6,7 @@
}: }:
let let
firefox-addons = inputs.firefox-addons.packages.${pkgs.system}; firefox-addons = inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system};
commonSettings = { commonSettings = {
# Disable DNS over HTTPS (use system DNS, i.e. VPN's DNS) # Disable DNS over HTTPS (use system DNS, i.e. VPN's DNS)

4
home/editors/lsp.nix
View file

@ -17,10 +17,10 @@
nodePackages.typescript-language-server nodePackages.typescript-language-server
# not working like variant from node_modules # not working like variant from node_modules
# nodePackages.graphql-language-service-cli # nodePackages.graphql-language-service-cli
nodePackages.dockerfile-language-server-nodejs dockerfile-language-server
haskellPackages.haskell-language-server haskellPackages.haskell-language-server
rust-analyzer rust-analyzer
sumneko-lua-language-server lua-language-server
marksman marksman
# linters & formatters # linters & formatters

2
home/felschr-work.nix
View file

@ -42,7 +42,7 @@ with pkgs;
home.packages = with pkgs; [ home.packages = with pkgs; [
# system # system
gparted gparted
gnome-firmware-updater gnome-firmware
mission-center mission-center
# productivity # productivity

2
home/felschr.nix
View file

@ -43,7 +43,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
# system # system
gparted gparted
gnome-firmware-updater gnome-firmware
resources resources
# productivity # productivity

20
home/git.nix
View file

@ -28,7 +28,7 @@
signing = { signing = {
signByDefault = true; signByDefault = true;
}; };
extraConfig = { settings = {
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
@ -41,15 +41,15 @@
abbreviateCommands = true; abbreviateCommands = true;
missingCommitsCheck = "warn"; missingCommitsCheck = "warn";
}; };
}; alias = {
aliases = { # usage: git mr <source> <MR number> (git mr origin 1010)
# usage: git mr <source> <MR number> (git mr origin 1010) mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"; # usage: git pr <source> <PR number> (git pr origin 1010)
# usage: git pr <source> <PR number> (git pr origin 1010) pr = "!sh -c 'git fetch $1 pull/$2/head:pr/$2 && git checkout pr/$2' -";
pr = "!sh -c 'git fetch $1 pull/$2/head:pr/$2 && git checkout pr/$2' -"; # delete branches locally that have already been merged
# delete branches locally that have already been merged # usage: git clean-branches <branch> (branch to check against, defaults to main)
# usage: git clean-branches <branch> (branch to check against, defaults to main) clean-branches = ''!sh -c 'git branch --merged "''${1:-main}" | egrep -v "(^\*|master|main|staging|production)" | xargs git branch -d' -'';
clean-branches = ''!sh -c 'git branch --merged "''${1:-main}" | egrep -v "(^\*|master|main|staging|production)" | xargs git branch -d' -''; };
}; };
}; };
} }

1
home/modules/firefox/mullvad-browser.nix
View file

@ -22,6 +22,7 @@ in
vendorPath = ".mullvad"; vendorPath = ".mullvad";
configPath = "${vendorPath}/mullvadbrowser"; configPath = "${vendorPath}/mullvadbrowser";
}; };
platforms.darwin = null;
}) })
(mkFirefoxProfileBinModule { (mkFirefoxProfileBinModule {
inherit modulePath name packageName; inherit modulePath name packageName;

1
home/modules/firefox/tor-browser.nix
View file

@ -22,6 +22,7 @@ in
vendorPath = ".tor project"; vendorPath = ".tor project";
configPath = "${vendorPath}/firefox"; configPath = "${vendorPath}/firefox";
}; };
platforms.darwin = null;
}) })
(mkFirefoxProfileBinModule { (mkFirefoxProfileBinModule {
inherit modulePath name packageName; inherit modulePath name packageName;

10
home/modules/git.nix
View file

@ -36,10 +36,12 @@ in
{ {
programs.git = { programs.git = {
# fix/workaround for https://github.com/NixOS/nixpkgs/issues/169193 # fix/workaround for https://github.com/NixOS/nixpkgs/issues/169193
extraConfig.safe.directory = "/etc/nixos"; settings = {
safe.directory = "/etc/nixos";
userName = profiles."${cfg.defaultProfile}".name; user = {
userEmail = profiles."${cfg.defaultProfile}".email; inherit (profiles."${cfg.defaultProfile}") name email;
};
};
signing = { signing = {
key = profiles."${cfg.defaultProfile}".signingKey; key = profiles."${cfg.defaultProfile}".signingKey;
}; };

2
hosts/home-pc/default.nix
View file

@ -59,7 +59,7 @@
]; ];
networking.firewall.allowedUDPPorts = [ networking.firewall.allowedUDPPorts = [
24727 # AusweisApp2 24727 # ausweisapp
]; ];
networking.hosts = { networking.hosts = {
# force IPv4, see: https://github.com/transmission/transmission/issues/407 # force IPv4, see: https://github.com/transmission/transmission/issues/407

1
hosts/home-server/default.nix
View file

@ -109,7 +109,6 @@ in
recommendedTlsSettings = true; recommendedTlsSettings = true;
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedZstdSettings = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
recommendedBrotliSettings = true; recommendedBrotliSettings = true;
}; };

4
services/opencloud.nix
View file

@ -11,10 +11,6 @@ let
cfg = config.services.opencloud; cfg = config.services.opencloud;
in in
{ {
imports = [
"${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/opencloud.nix"
];
# required when using unstable NixOS module # required when using unstable NixOS module
documentation.nixos.enable = false; documentation.nixos.enable = false;

2
services/pcscd.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# for reader used with AusweisApp2 # for reader used with ausweisapp
services.pcscd.enable = true; services.pcscd.enable = true;
services.pcscd.plugins = with pkgs; [ services.pcscd.plugins = with pkgs; [
ccid ccid

3
system/fonts.nix
View file

@ -3,9 +3,8 @@
{ {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-extra
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-color-emoji
nerd-fonts.symbols-only nerd-fonts.symbols-only
fira-code fira-code
]; ];

1
virtualisation/libvirt.nix
View file

@ -11,7 +11,6 @@
# Users need to be in groups: libvirtd, qemu-libvirtd # Users need to be in groups: libvirtd, qemu-libvirtd
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.runAsRoot = false; virtualisation.libvirtd.qemu.runAsRoot = false;
virtualisation.libvirtd.qemu.ovmf.enable = true;
virtualisation.libvirtd.qemu.swtpm.enable = true; virtualisation.libvirtd.qemu.swtpm.enable = true;
virtualisation.libvirtd.onBoot = "ignore"; virtualisation.libvirtd.onBoot = "ignore";
virtualisation.libvirtd.onShutdown = "shutdown"; virtualisation.libvirtd.onShutdown = "shutdown";