diff --git a/flake.lock b/flake.lock index 00bd127..11742ed 100644 --- a/flake.lock +++ b/flake.lock @@ -683,34 +683,34 @@ "type": "github" } }, - "nixpkgs-fixed": { + "nixpkgs-pinned": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -883,7 +883,7 @@ "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "nixpkgs": "nixpkgs_5", - "nixpkgs-fixed": "nixpkgs-fixed", + "nixpkgs-pinned": "nixpkgs-pinned", "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", "stylix": "stylix", diff --git a/flake.nix b/flake.nix index fc8f4d0..32438c1 100644 --- a/flake.nix +++ b/flake.nix @@ -19,8 +19,8 @@ inputs = { aagl.url = "github:ezKEa/aagl-gtk-on-nix"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; - nixpkgs-fixed.url = "github:nixos/nixpkgs/ce01daebf8489ba97bd1609d185ea276efdeb121"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs-pinned.url = "github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c"; sops-nix.url = "github:Mic92/sops-nix"; stylix.url = "github:danth/stylix"; ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6"; @@ -38,14 +38,14 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-fixed, home-manager, ... }@inputs: let + outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let system = "x86_64-linux"; config = { allowUnfree = true; }; - mkHost = hostname: nixpkgs-stable.lib.nixosSystem { + mkHost = hostname: nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; - pkgs-unstable = import nixpkgs { inherit system config; }; - pkgs-fixed = import nixpkgs-fixed { inherit system config; }; + pkgs-stable = import nixpkgs-stable { inherit system config; }; + pkgs-pinned = import nixpkgs-pinned { inherit system config; }; }; modules = [ ./host/${hostname}/configuration.nix ]; }; diff --git a/host/Eclipse/configuration.nix b/host/Eclipse/configuration.nix index 75ca2b9..34e2236 100644 --- a/host/Eclipse/configuration.nix +++ b/host/Eclipse/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { +{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: { imports = [ ./secrets/secrets.nix ./modules/aagl.nix @@ -15,8 +15,8 @@ (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-unstable; - inherit pkgs-fixed; + inherit pkgs-stable; + inherit pkgs-pinned; inherit lib; inherit inputs; name = "chest"; diff --git a/host/Impreza/configuration.nix b/host/Impreza/configuration.nix index 6a41404..0b5065f 100644 --- a/host/Impreza/configuration.nix +++ b/host/Impreza/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { +{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: { imports = [ ./secrets/secrets.nix ./modules/grub.nix @@ -13,8 +13,8 @@ (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-unstable; - inherit pkgs-fixed; + inherit pkgs-stable; + inherit pkgs-pinned; inherit lib; inherit inputs; name = "chest"; diff --git a/host/Rias/configuration.nix b/host/Rias/configuration.nix index abd2f58..66ff0f6 100644 --- a/host/Rias/configuration.nix +++ b/host/Rias/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { +{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: { imports = [ ./secrets/secrets.nix ./modules/grub.nix @@ -15,8 +15,8 @@ (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-unstable; - inherit pkgs-fixed; + inherit pkgs-stable; + inherit pkgs-pinned; inherit lib; inherit inputs; name = "sweetbread"; diff --git a/host/Senko/configuration.nix b/host/Senko/configuration.nix index e32c2a1..ff1d29f 100644 --- a/host/Senko/configuration.nix +++ b/host/Senko/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { +{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: { imports = [ ./secrets/secrets.nix ./modules/grub.nix @@ -13,8 +13,8 @@ (import ../../user/common.nix { inherit config; inherit pkgs; - inherit pkgs-unstable; - inherit pkgs-fixed; + inherit pkgs-stable; + inherit pkgs-pinned; inherit lib; inherit inputs; name = "sweetbread"; diff --git a/host/modules/gpu/intel.nix b/host/modules/gpu/intel.nix index c675b05..063cfe9 100644 --- a/host/modules/gpu/intel.nix +++ b/host/modules/gpu/intel.nix @@ -1,22 +1,22 @@ -{ config, pkgs, ... }: +{ config, pkgs-stable, ... }: { hardware.graphics = { enable = true; - extraPackages = with pkgs; [ + extraPackages = with pkgs-stable; [ intel-media-driver intel-compute-runtime libvdpau-va-gl ]; - extraPackages32 = with pkgs.pkgsi686Linux; [ + extraPackages32 = with pkgs-stable.pkgsi686Linux; [ intel-media-driver ]; }; - nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + nixpkgs.config.packageOverrides = pkgs-stable: { + vaapiIntel = pkgs-stable.vaapiIntel.override { enableHybridCodec = true; }; }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs-stable; [ intel-gpu-tools libva-utils clinfo diff --git a/host/modules/gpu/nvidia.nix b/host/modules/gpu/nvidia.nix index 36394a0..e779d48 100644 --- a/host/modules/gpu/nvidia.nix +++ b/host/modules/gpu/nvidia.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: { +{ config, pkgs-stable, lib, ... }: { boot.kernelParams = [ "nvidia-drm.modeset=1" ]; services.xserver.videoDrivers = [ "nvidia" ]; @@ -6,12 +6,12 @@ graphics = { enable = true; enable32Bit = true; - extraPackages = with pkgs; [ + extraPackages = with pkgs-stable; [ nvidia-vaapi-driver intel-media-driver libvdpau-va-gl ]; - extraPackages32 = with pkgs.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver]; + extraPackages32 = with pkgs-stable.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver]; }; nvidia = { diff --git a/host/modules/packages.nix b/host/modules/packages.nix index a00417a..47c84fd 100644 --- a/host/modules/packages.nix +++ b/host/modules/packages.nix @@ -1,7 +1,7 @@ -{ pkgs-unstable, inputs, ... }: { +{ pkgs, inputs, ... }: { nixpkgs.config.allowUnfree = true; - environment.systemPackages = with pkgs-unstable; [ + environment.systemPackages = with pkgs; [ file tree wget @@ -20,7 +20,7 @@ fonts = { enableDefaultPackages = false; - packages = with pkgs-unstable; [ + packages = with pkgs; [ 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 419ccf5..82e8036 100644 --- a/modules/host/gamemode.nix +++ b/modules/host/gamemode.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, lib, ... }: +{ config, pkgs, lib, ... }: lib.mkIf config.programs.gamemode.enable { programs.steam = { @@ -8,7 +8,7 @@ lib.mkIf config.programs.gamemode.enable { environment.systemPackages = with pkgs; [ mangohud - protonup + protonup-ng bottles heroic prismlauncher diff --git a/modules/host/gpg.nix b/modules/host/gpg.nix index 1f4dd05..5785e22 100644 --- a/modules/host/gpg.nix +++ b/modules/host/gpg.nix @@ -1,4 +1,4 @@ -{ pkgs, ...}: { +{ programs.gnupg.agent = { enable = true; enableSSHSupport = true; diff --git a/modules/host/shutdown-on-lan.nix b/modules/host/shutdown-on-lan.nix index 533c153..552ed16 100644 --- a/modules/host/shutdown-on-lan.nix +++ b/modules/host/shutdown-on-lan.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: let sol = pkgs.writers.writePython3 "shutdown-on-lan.py" { - libraries = [ pkgs.python312Packages.psutil ]; + libraries = [ pkgs.python313Packages.psutil ]; flakeIgnore = [ "E302" "E305" "E501" "E701" ]; } /*py*/ '' # https://habr.com/ru/articles/816765/ diff --git a/modules/host/virtmanager.nix b/modules/host/virtmanager.nix index bb554bb..52f42d6 100644 --- a/modules/host/virtmanager.nix +++ b/modules/host/virtmanager.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; } diff --git a/modules/host/vpn.nix b/modules/host/vpn.nix index b38e6bf..343cb7e 100644 --- a/modules/host/vpn.nix +++ b/modules/host/vpn.nix @@ -1,11 +1,11 @@ -{ pkgs, pkgs-unstable, config, ...}: { +{ pkgs, config, ... }: { systemd.services.v2raya = { enable = true; description = "v2rayA gui client"; after = [ "network.target" ]; serviceConfig = { Restart = "always"; - ExecStart = "${pkgs-unstable.v2raya}/bin/v2rayA"; + ExecStart = "${pkgs.v2raya}/bin/v2rayA"; }; path = with pkgs; [ iptables bash iproute2 ]; wantedBy = [ "multi-user.target" ]; diff --git a/modules/user/packages/art.nix b/modules/user/packages/art.nix index 16c9e0a..1f57589 100644 --- a/modules/user/packages/art.nix +++ b/modules/user/packages/art.nix @@ -1,7 +1,7 @@ -{ pkgs-fixed, lib, osConfig, ... }: +{ pkgs-pinned, lib, osConfig, ... }: lib.mkIf (!osConfig.host.laptop) { - home.packages = with pkgs-fixed; [ + home.packages = with pkgs-pinned; [ (blender.override { cudaSupport = true; }) aseprite krita diff --git a/modules/user/packages/desktop.nix b/modules/user/packages/desktop.nix index d614f43..b36d7bb 100644 --- a/modules/user/packages/desktop.nix +++ b/modules/user/packages/desktop.nix @@ -1,6 +1,6 @@ -{ pkgs, inputs, pkgs-fixed, ... }: { +{ pkgs, pkgs-pinned, inputs, ... }: { home.packages = with pkgs; [ - pkgs-fixed.ayugram-desktop + pkgs-pinned.ayugram-desktop vesktop obs-studio mpv diff --git a/user/chest/home.nix b/user/chest/home.nix index c6c2c95..f6a91bd 100644 --- a/user/chest/home.nix +++ b/user/chest/home.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-fixed, host, ... }: { +{ pkgs, pkgs-pinned, host, ... }: { imports = [ ../../modules/user/packages/cs_utils.nix ]; @@ -10,7 +10,7 @@ home.packages = with pkgs; [ nautilus python3 - pkgs-fixed.jetbrains.pycharm-community + pkgs-pinned.jetbrains.pycharm-community aseprite krita google-chrome diff --git a/user/common.nix b/user/common.nix index 7f917c8..4e59dc4 100644 --- a/user/common.nix +++ b/user/common.nix @@ -1,8 +1,16 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, name, fullname ? name, ... }: { +{ config +, pkgs +, pkgs-stable +, pkgs-pinned +, lib +, inputs +, name +, fullname ? name +}: { imports = [ inputs.home-manager.nixosModules.home-manager { home-manager = { - useGlobalPkgs = false; + useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "rebuild"; overwriteBackup = true; @@ -22,14 +30,12 @@ homeDirectory = "/home/${name}"; stateVersion = "23.11"; }; - - _module.args.pkgs = lib.mkForce pkgs-unstable; }; extraSpecialArgs = { inherit inputs; - pkgs-stable = pkgs; - inherit pkgs-fixed; + inherit pkgs-stable; + inherit pkgs-pinned; username = name; }; }; @@ -49,7 +55,7 @@ }; services.greetd = let - tuigreet = lib.getExe pkgs.greetd.tuigreet; + tuigreet = lib.getExe pkgs.tuigreet; session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default; in { enable = true;