diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index 6367e0e..325e636 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { 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 - # 25.11 move to stable - environment.systemPackages = [ - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui + environment.systemPackages = with pkgs;[ + lsfg-vk + lsfg-vk-ui ]; } diff --git a/configuration/modules/i18n.nix b/configuration/modules/i18n.nix index 9f8f188..85d77b3 100644 --- a/configuration/modules/i18n.nix +++ b/configuration/modules/i18n.nix @@ -11,7 +11,6 @@ # }; fcitx5 = { waylandFrontend = true; - plasma6Support = true; addons = with pkgs; [ fcitx5-mozc fcitx5-anthy diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 9f747d7..5ff83b3 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, inputs, ... }: +{ pkgs, lib, config, ... }: with lib; { @@ -17,7 +17,6 @@ with lib; enable = true; qemu = { vhostUserPackages = [ pkgs.virtiofsd ]; - ovmf.enable = true; }; }; # remember to add the necessary users to the podman group @@ -34,14 +33,13 @@ with lib; }; waydroid = { enable = true; - # 25.11 move to stable - package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-nftables; + package = pkgs.waydroid-nftables; }; }; programs.virt-manager.enable = true; environment.systemPackages = with pkgs;[ - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-helper + waydroid-helper ] ++ optionals (config.virtualisation.containerManagement == "podman") [ docker-compose # podman-compose diff --git a/devices/deck/flake.nix b/devices/deck/flake.nix index b879c61..4c1743a 100644 --- a/devices/deck/flake.nix +++ b/devices/deck/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] + 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.stdenv.hostPlatform.system}".[package name] 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"; }; diff --git a/devices/starlite/flake.nix b/devices/starlite/flake.nix index 4243782..0c5fd74 100644 --- a/devices/starlite/flake.nix +++ b/devices/starlite/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] + 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.stdenv.hostPlatform.system}".[package name] 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"; }; diff --git a/devices/tuxedo/flake.lock b/devices/tuxedo/flake.lock index cd346f9..91f13f8 100644 --- a/devices/tuxedo/flake.lock +++ b/devices/tuxedo/flake.lock @@ -27,16 +27,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1764177491, + "narHash": "sha256-dhX2abFWxeXab3Aad4Pg1xGtn9W84/qetNXfmYUwktw=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "2217780c39169a9c77915200137550c2ef0fa974", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -66,11 +66,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764035918, - "narHash": "sha256-oqgJf3AiFQOJnIZPasynVAnul1E8tioWnAo9iFEjRKI=", + "lastModified": 1764208554, + "narHash": "sha256-9cHI5OyIcTuaWYrgq3ng7W0q+wgX8II2fkqCHNot5jY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "3c62392b5583a9eb399e53291dc2659d5ae14e9f", + "rev": "8cd52edf9dea91d1610c50b494dc20636b61b862", "type": "github" }, "original": { @@ -113,16 +113,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/devices/tuxedo/flake.nix b/devices/tuxedo/flake.nix index 1d612c6..581f266 100644 --- a/devices/tuxedo/flake.nix +++ b/devices/tuxedo/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] + 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.stdenv.hostPlatform.system}".[package name] 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"; }; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 7d402ed..03ea1e3 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -30,12 +30,12 @@ ffmpeg-full # comms - # 25.11 move to stable - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".teams-for-linux + teams-for-linux teamspeak6-client # media - jellyfin-media-player + # TODO: disabled due to qt5-web-engine vulnerable https://github.com/NixOS/nixpkgs/pull/435067 + # jellyfin-media-player haruna # misc diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index f031fdf..003e867 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -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) { diff --git a/home-manager/default.nix b/home-manager/default.nix index 6187443..1a2d052 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -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 diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index 8391e67..3dde972 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -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 {