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

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

View file

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

View file

@ -8,7 +8,7 @@
with lib;
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;

View file

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

View file

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

View file

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

View file

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

View file

@ -28,7 +28,7 @@
signing = {
signByDefault = true;
};
extraConfig = {
settings = {
init = {
defaultBranch = "main";
};
@ -41,15 +41,15 @@
abbreviateCommands = true;
missingCommitsCheck = "warn";
};
};
aliases = {
# 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' -";
# 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' -";
# delete branches locally that have already been merged
# 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' -'';
alias = {
# 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' -";
# 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' -";
# delete branches locally that have already been merged
# 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' -'';
};
};
};
}

View file

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

View file

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

View file

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