diff --git a/flake.lock b/flake.lock index 471ab8a..93bf42e 100644 --- a/flake.lock +++ b/flake.lock @@ -815,17 +815,17 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742071653, - "narHash": "sha256-BIyMLt0DhN8vSeRPnSxfIJVKL2MYxu/kM14y1mD1s24=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30b27177a006d425120fb850a64ceb792636501a", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "30b27177a006d425120fb850a64ceb792636501a", "type": "github" } }, diff --git a/flake.nix b/flake.nix index b49b717..340dc7b 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ inputs = { aagl.url = "github:ezKEa/aagl-gtk-on-nix"; - nixpkgs.url = "github:nixos/nixpkgs/30b27177a006d425120fb850a64ceb792636501a"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-fixed.url = "github:nixos/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d"; sops-nix.url = "github:Mic92/sops-nix"; @@ -44,9 +44,9 @@ system = "x86_64-linux"; in { nixosConfigurations = { - Rias = nixpkgs.lib.nixosSystem { + Rias = nixpkgs-stable.lib.nixosSystem { specialArgs = { - pkgs-stable = import nixpkgs-stable { + pkgs-unstable = import nixpkgs { inherit system; config.allowUnfree = true; }; @@ -59,9 +59,9 @@ modules = [ ./host/Rias/configuration.nix ]; }; - Senko = nixpkgs.lib.nixosSystem { + Senko = nixpkgs-stable.lib.nixosSystem { specialArgs = { - pkgs-stable = import nixpkgs-stable { + pkgs-unstable = import nixpkgs { inherit system; config.allowUnfree = true; }; @@ -74,9 +74,9 @@ modules = [ ./host/Senko/configuration.nix ]; }; - Eclipse = nixpkgs.lib.nixosSystem { + Eclipse = nixpkgs-stable.lib.nixosSystem { specialArgs = { - pkgs-stable = import nixpkgs-stable { + pkgs-unstable = import nixpkgs { inherit system; config.allowUnfree = true; }; @@ -89,9 +89,9 @@ modules = [ ./host/Eclipse/configuration.nix ]; }; - Impreza = nixpkgs.lib.nixosSystem { + Impreza = nixpkgs-stable.lib.nixosSystem { specialArgs = { - pkgs-stable = import nixpkgs-stable { + pkgs-unstable = import nixpkgs { inherit system; config.allowUnfree = true; }; diff --git a/host/Eclipse/configuration.nix b/host/Eclipse/configuration.nix index 55e24a5..803593f 100644 --- a/host/Eclipse/configuration.nix +++ b/host/Eclipse/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let laptop = false; in { imports = [ @@ -17,7 +17,7 @@ in { (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-stable; + inherit pkgs-unstable; inherit pkgs-fixed; inherit lib; inherit inputs; diff --git a/host/Impreza/configuration.nix b/host/Impreza/configuration.nix index d579456..2d7389f 100644 --- a/host/Impreza/configuration.nix +++ b/host/Impreza/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let laptop = true; in { imports = [ @@ -15,7 +15,7 @@ in { (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-stable; + inherit pkgs-unstable; inherit pkgs-fixed; inherit lib; inherit inputs; diff --git a/host/Rias/configuration.nix b/host/Rias/configuration.nix index 878da17..e139bd6 100644 --- a/host/Rias/configuration.nix +++ b/host/Rias/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let laptop = false; in { imports = [ @@ -17,7 +17,7 @@ in { (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-stable; + inherit pkgs-unstable; inherit pkgs-fixed; inherit lib; inherit inputs; diff --git a/host/Senko/configuration.nix b/host/Senko/configuration.nix index e7e564f..87245c3 100644 --- a/host/Senko/configuration.nix +++ b/host/Senko/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let laptop = true; in { imports = [ @@ -15,7 +15,7 @@ in { (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-stable; + inherit pkgs-unstable; inherit pkgs-fixed; inherit lib; inherit inputs; diff --git a/host/modules/gpu/nvidia.nix b/host/modules/gpu/nvidia.nix index edac7a6..5e60211 100644 --- a/host/modules/gpu/nvidia.nix +++ b/host/modules/gpu/nvidia.nix @@ -16,7 +16,7 @@ }; open = false; nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.stable; prime = lib.optionalAttrs config.host.laptop { intelBusId = "PCI:0:2:0"; diff --git a/host/modules/packages.nix b/host/modules/packages.nix index 6b4f667..3bf01b4 100644 --- a/host/modules/packages.nix +++ b/host/modules/packages.nix @@ -1,7 +1,7 @@ -{ pkgs, inputs, ... }: { +{ pkgs-unstable, inputs, ... }: { nixpkgs.config.allowUnfree = true; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs-unstable; [ file tree wget @@ -20,7 +20,7 @@ fonts = { enableDefaultPackages = false; - packages = with pkgs; [ + packages = with pkgs-unstable; [ jetbrains-mono # Best mono font noto-fonts-cjk-sans # Japanese powerline-symbols # Console decoration diff --git a/modules/host/gamemode.nix b/modules/host/gamemode.nix index eca7404..419ccf5 100644 --- a/modules/host/gamemode.nix +++ b/modules/host/gamemode.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, lib, ... }: +{ config, pkgs, pkgs-unstable, lib, ... }: lib.mkIf config.programs.gamemode.enable { programs.steam = { @@ -6,12 +6,12 @@ lib.mkIf config.programs.gamemode.enable { gamescopeSession.enable = true; }; - environment.systemPackages = with pkgs-stable; [ + environment.systemPackages = with pkgs; [ mangohud protonup - pkgs.bottles + bottles heroic - pkgs.prismlauncher + prismlauncher ]; environment.sessionVariables = { diff --git a/modules/host/sound.nix b/modules/host/sound.nix index b1fdffe..db3134d 100644 --- a/modules/host/sound.nix +++ b/modules/host/sound.nix @@ -1,8 +1,8 @@ { security.rtkit.enable = true; + hardware.pulseaudio.enable = false; services = { - pulseaudio.enable = false; pipewire = { enable = true; diff --git a/modules/host/vpn.nix b/modules/host/vpn.nix index 0a2b529..b516e52 100644 --- a/modules/host/vpn.nix +++ b/modules/host/vpn.nix @@ -1,11 +1,11 @@ -{pkgs, config, ...}: { +{ pkgs, pkgs-unstable, config, ...}: { systemd.services.v2raya = { enable = true; description = "v2rayA gui client"; after = [ "network.target" ]; serviceConfig = { Restart = "always"; - ExecStart = "${pkgs.v2raya}/bin/v2rayA"; + ExecStart = "${pkgs-unstable.v2raya}/bin/v2rayA"; }; path = with pkgs; [ iptables bash iproute2 ]; wantedBy = [ "multi-user.target" ]; diff --git a/modules/user/zsh.nix b/modules/user/zsh.nix index a6a8275..2c8f78a 100644 --- a/modules/user/zsh.nix +++ b/modules/user/zsh.nix @@ -75,7 +75,7 @@ initExtra = '' eval "$(zoxide init zsh)" - eval "$(nh completions --shell zsh)" + eval "$(nh completions zsh)" source "$(fzf-share)/key-bindings.zsh" source "$(fzf-share)/completion.zsh" ''; diff --git a/user/common.nix b/user/common.nix index 471074b..98e300b 100644 --- a/user/common.nix +++ b/user/common.nix @@ -1,8 +1,8 @@ -{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, laptop, name, fullname ? name, ... }: { +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, laptop, name, fullname ? name, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager { home-manager = { - useGlobalPkgs = true; + useGlobalPkgs = false; useUserPackages = true; backupFileExtension = "rebuild"; @@ -22,10 +22,13 @@ homeDirectory = "/home/${name}"; stateVersion = "23.11"; }; + + _module.args.pkgs = lib.mkForce pkgs-unstable; }; + extraSpecialArgs = { inherit inputs; - inherit pkgs-stable; + pkgs-stable = pkgs; inherit pkgs-fixed; host = { laptop = laptop;