worble/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
worble
2025-11-28 00:42:44 +00:00
parent 4fc8b0f4fa
commit 16980bf9f4
11 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configuration/modules/gaming.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: { pkgs, ... }:
{ {
hardware.graphics.enable32Bit = true; # For 32 bit applications hardware.graphics.enable32Bit = true; # For 32 bit applications
@@ -36,9 +36,8 @@
programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work
# 25.11 move to stable environment.systemPackages = with pkgs;[
environment.systemPackages = [ lsfg-vk
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk lsfg-vk-ui
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui
]; ];
} }

1
configuration/modules/i18n.nix
View File

@@ -11,7 +11,6 @@
# }; # };
fcitx5 = { fcitx5 = {
waylandFrontend = true; waylandFrontend = true;
plasma6Support = true;
addons = with pkgs; [ addons = with pkgs; [
fcitx5-mozc fcitx5-mozc
fcitx5-anthy fcitx5-anthy

8
configuration/modules/virtualisation.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, lib, config, inputs, ... }: { pkgs, lib, config, ... }:
with lib; with lib;
{ {
@@ -17,7 +17,6 @@ with lib;
enable = true; enable = true;
qemu = { qemu = {
vhostUserPackages = [ pkgs.virtiofsd ]; vhostUserPackages = [ pkgs.virtiofsd ];
ovmf.enable = true;
}; };
}; };
# remember to add the necessary users to the podman group # remember to add the necessary users to the podman group
@@ -34,14 +33,13 @@ with lib;
}; };
waydroid = { waydroid = {
enable = true; enable = true;
# 25.11 move to stable package = pkgs.waydroid-nftables;
package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-nftables;
}; };
}; };
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
environment.systemPackages = with pkgs;[ environment.systemPackages = with pkgs;[
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-helper waydroid-helper
] ++ optionals (config.virtualisation.containerManagement == "podman") [ ] ++ optionals (config.virtualisation.containerManagement == "podman") [
docker-compose docker-compose
# podman-compose # podman-compose

6
devices/deck/flake.nix
View File

@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11?shallow=1";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}".[package name]
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05?shallow=1"; url = "github:nix-community/home-manager/release-25.11?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

6
devices/starlite/flake.nix
View File

@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11?shallow=1";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}".[package name]
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05?shallow=1"; url = "github:nix-community/home-manager/release-25.11?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

22
devices/tuxedo/flake.lock generated
View File

@@ -27,16 +27,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763992789, "lastModified": 1764177491,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "narHash": "sha256-dhX2abFWxeXab3Aad4Pg1xGtn9W84/qetNXfmYUwktw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "rev": "2217780c39169a9c77915200137550c2ef0fa974",
"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"
} }
@@ -66,11 +66,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1764035918, "lastModified": 1764208554,
"narHash": "sha256-oqgJf3AiFQOJnIZPasynVAnul1E8tioWnAo9iFEjRKI=", "narHash": "sha256-9cHI5OyIcTuaWYrgq3ng7W0q+wgX8II2fkqCHNot5jY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "3c62392b5583a9eb399e53291dc2659d5ae14e9f", "rev": "8cd52edf9dea91d1610c50b494dc20636b61b862",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,16 +113,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1763948260, "lastModified": 1764020296,
"narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
"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"
} }

6
devices/tuxedo/flake.nix
View File

@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11?shallow=1";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}".[package name]
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05?shallow=1"; url = "github:nix-community/home-manager/release-25.11?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

6
devices/tuxedo/home.nix
View File

@@ -30,12 +30,12 @@
ffmpeg-full ffmpeg-full
# comms # comms
# 25.11 move to stable teams-for-linux
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".teams-for-linux
teamspeak6-client teamspeak6-client
# media # media
jellyfin-media-player # TODO: disabled due to qt5-web-engine vulnerable https://github.com/NixOS/nixpkgs/pull/435067
# jellyfin-media-player
haruna haruna
# misc # misc

26
home-manager/base/terminal.nix
View File

@@ -51,10 +51,14 @@ with lib;
enableFishIntegration = true; enableFishIntegration = true;
}; };
delta = {
enable = true;
enableGitIntegration = true;
};
git = { git = {
enable = true; enable = true;
delta.enable = true; settings = {
extraConfig = {
credential = { credential = {
helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ]; helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ];
credentialStore = "secretservice"; credentialStore = "secretservice";
@@ -174,6 +178,24 @@ with lib;
settings = mkMerge [{ settings = mkMerge [{
misc = { misc = {
assume_yes = true; 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) { (mkIf (nixUpdateLocation != null) {

8
home-manager/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, inputs, lib, ... }: { pkgs, lib, ... }:
{ {
imports = [ imports = [
@@ -12,10 +12,12 @@
qbittorrent qbittorrent
libreoffice-qt libreoffice-qt
# 25.11 Can move to stable when https://github.com/NixOS/nixpkgs/pull/460058 gets backported # 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 # comms
teamspeak_client # TODO: disabled due to qt5-web-engine vulnerable https://github.com/NixOS/nixpkgs/pull/435067
# teamspeak3
teamspeak6-client
discord discord
vesktop vesktop

2
home-manager/gaming.nix
View File

@@ -1,7 +1,7 @@
{ pkgs, inputs, ... }: { pkgs, inputs, ... }:
let 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 # https://simpler-website.pages.dev/html/2021/1/wine-environment-variables/#wineesync
wine-wrapped = (pkgs.writeShellApplication { wine-wrapped = (pkgs.writeShellApplication {