migrate to 25.11; remove teamspeak and jellyfin player due to webkit deprecation;

This commit is contained in:
2025-11-28 00:42:44 +00:00
parent 4fc8b0f4fa
commit 16980bf9f4
11 changed files with 60 additions and 40 deletions

View File

@@ -51,10 +51,14 @@ with lib;
enableFishIntegration = true;
};
delta = {
enable = true;
enableGitIntegration = true;
};
git = {
enable = true;
delta.enable = true;
extraConfig = {
settings = {
credential = {
helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ];
credentialStore = "secretservice";
@@ -174,6 +178,24 @@ with lib;
settings = mkMerge [{
misc = {
assume_yes = true;
disable = [
"android_studio"
"jetbrains_aqua"
"jetbrains_clion"
"jetbrains_datagrip"
"jetbrains_dataspell"
"jetbrains_gateway"
"jetbrains_goland"
"jetbrains_idea"
"jetbrains_mps"
"jetbrains_phpstorm"
"jetbrains_pycharm"
"jetbrains_rider"
"jetbrains_rubymine"
"jetbrains_rustrover"
"jetbrains_toolbox"
"jetbrains_webstorm"
];
};
}
(mkIf (nixUpdateLocation != null) {

View File

@@ -1,4 +1,4 @@
{ pkgs, inputs, lib, ... }:
{ pkgs, lib, ... }:
{
imports = [
@@ -12,10 +12,12 @@
qbittorrent
libreoffice-qt
# 25.11 Can move to stable when https://github.com/NixOS/nixpkgs/pull/460058 gets backported
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop
joplin-desktop
# comms
teamspeak_client
# TODO: disabled due to qt5-web-engine vulnerable https://github.com/NixOS/nixpkgs/pull/435067
# teamspeak3
teamspeak6-client
discord
vesktop

View File

@@ -1,7 +1,7 @@
{ pkgs, inputs, ... }:
let
pkgs_unstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
pkgs_unstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}";
# https://simpler-website.pages.dev/html/2021/1/wine-environment-variables/#wineesync
wine-wrapped = (pkgs.writeShellApplication {