fix: restrict to pkgs-stable and pkgs-pinned

This commit is contained in:
Black_Raven committed 2026-04-03 22:24:57 +03:00
1 parent 42430283fe
commit ab0520f634
5 files changed
+25 -32

No files matched your search

+15 -22
View File
@@ -25,7 +25,7 @@
ayugram-desktop.url = "github:/ayugram-port/ayugram-desktop/release?submodules=1"; ayugram-desktop.url = "github:/ayugram-port/ayugram-desktop/release?submodules=1";
ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6"; ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
nixpkgs-fixed.url = "github:nixos/nixpkgs/ce01daebf8489ba97bd1609d185ea276efdeb121"; nixpkgs-pinned.url = "github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
@@ -48,28 +48,21 @@
flake = false; flake = false;
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-fixed, home-manager, ... }@inputs: outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let
system = "x86_64-linux";
let config = { allowUnfree = true; };
system = "x86_64-linux"; mkHost = hostname: nixpkgs.lib.nixosSystem {
in { specialArgs = {
inherit inputs;
nixosConfigurations = { pkgs-stable = import nixpkgs-stable { inherit system config; };
WhiteRaven = nixpkgs-stable.lib.nixosSystem { pkgs-pinned = import nixpkgs-pinned { inherit system config; };
specialArgs = {
pkgs-unstable = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system;
};
modules = [ ./host/WhiteRaven/configuration.nix ];
}; };
modules = [ ./host/${hostname}/configuration.nix ];
};
in {
nixosConfigurations = {
WhiteRaven = mkHost "WhiteRaven";
}; };
}; };
} }
+3 -3
View File
@@ -1,7 +1,7 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ... }: { config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }:
{ {
imports = [ imports = [
@@ -16,8 +16,8 @@
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-pinned;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
name = "kirill"; name = "kirill";
+2 -2
View File
@@ -1,11 +1,11 @@
{ pkgs, pkgs-unstable, config, inputs, ...}: { { pkgs, config, inputs, ...}: {
systemd.services.v2raya = { systemd.services.v2raya = {
enable = true; enable = true;
description = "v2rayA gui client"; description = "v2rayA gui client";
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
Restart = "always"; Restart = "always";
ExecStart = "${pkgs-unstable.v2raya}/bin/v2rayA"; ExecStart = "${pkgs.v2raya}/bin/v2rayA";
}; };
path = with pkgs; [ iptables bash iproute2 ]; path = with pkgs; [ iptables bash iproute2 ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
+2 -2
View File
@@ -1,6 +1,6 @@
{ pkgs, inputs, pkgs-fixed, ... }: { { pkgs, inputs, pkgs-pinned, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
pkgs-fixed.ayugram-desktop pkgs-pinned.ayugram-desktop
obs-studio obs-studio
mpv mpv
obsidian obsidian
+3 -3
View File
@@ -1,4 +1,4 @@
{config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, name, fullname ? name, ... }: { {config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, name, fullname ? name, ... }: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
@@ -27,8 +27,8 @@
}; };
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
pkgs-stable = pkgs; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-pinned;
host = { host = {
name = config.networking.hostName; name = config.networking.hostName;
}; };