system: change channels

This commit is contained in:
Sweetbread 2025-05-05 14:58:11 +03:00
parent 7eedb9098a
commit 724633d928
Signed by: Sweetbread
GPG Key ID: 17A5CB9A7DD85319
13 changed files with 39 additions and 36 deletions

8
flake.lock generated
View File

@ -815,17 +815,17 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1742071653, "lastModified": 1746328495,
"narHash": "sha256-BIyMLt0DhN8vSeRPnSxfIJVKL2MYxu/kM14y1mD1s24=", "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30b27177a006d425120fb850a64ceb792636501a", "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30b27177a006d425120fb850a64ceb792636501a",
"type": "github" "type": "github"
} }
}, },

View File

@ -20,7 +20,7 @@
inputs = { inputs = {
aagl.url = "github:ezKEa/aagl-gtk-on-nix"; 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-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-fixed.url = "github:nixos/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d"; nixpkgs-fixed.url = "github:nixos/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
@ -44,9 +44,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
in { in {
nixosConfigurations = { nixosConfigurations = {
Rias = nixpkgs.lib.nixosSystem { Rias = nixpkgs-stable.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -59,9 +59,9 @@
modules = [ ./host/Rias/configuration.nix ]; modules = [ ./host/Rias/configuration.nix ];
}; };
Senko = nixpkgs.lib.nixosSystem { Senko = nixpkgs-stable.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -74,9 +74,9 @@
modules = [ ./host/Senko/configuration.nix ]; modules = [ ./host/Senko/configuration.nix ];
}; };
Eclipse = nixpkgs.lib.nixosSystem { Eclipse = nixpkgs-stable.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -89,9 +89,9 @@
modules = [ ./host/Eclipse/configuration.nix ]; modules = [ ./host/Eclipse/configuration.nix ];
}; };
Impreza = nixpkgs.lib.nixosSystem { Impreza = nixpkgs-stable.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = false; laptop = false;
in { in {
imports = [ imports = [
@ -17,7 +17,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-stable; inherit pkgs-unstable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = true; laptop = true;
in { in {
imports = [ imports = [
@ -15,7 +15,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-stable; inherit pkgs-unstable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = false; laptop = false;
in { in {
imports = [ imports = [
@ -17,7 +17,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-stable; inherit pkgs-unstable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = true; laptop = true;
in { in {
imports = [ imports = [
@ -15,7 +15,7 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-stable; inherit pkgs-unstable;
inherit pkgs-fixed; inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;

View File

@ -16,7 +16,7 @@
}; };
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.stable;
prime = lib.optionalAttrs config.host.laptop { prime = lib.optionalAttrs config.host.laptop {
intelBusId = "PCI:0:2:0"; intelBusId = "PCI:0:2:0";

View File

@ -1,7 +1,7 @@
{ pkgs, inputs, ... }: { { pkgs-unstable, inputs, ... }: {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs-unstable; [
file file
tree tree
wget wget
@ -20,7 +20,7 @@
fonts = { fonts = {
enableDefaultPackages = false; enableDefaultPackages = false;
packages = with pkgs; [ packages = with pkgs-unstable; [
jetbrains-mono # Best mono font jetbrains-mono # Best mono font
noto-fonts-cjk-sans # Japanese noto-fonts-cjk-sans # Japanese
powerline-symbols # Console decoration powerline-symbols # Console decoration

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, lib, ... }: { config, pkgs, pkgs-unstable, lib, ... }:
lib.mkIf config.programs.gamemode.enable { lib.mkIf config.programs.gamemode.enable {
programs.steam = { programs.steam = {
@ -6,12 +6,12 @@ lib.mkIf config.programs.gamemode.enable {
gamescopeSession.enable = true; gamescopeSession.enable = true;
}; };
environment.systemPackages = with pkgs-stable; [ environment.systemPackages = with pkgs; [
mangohud mangohud
protonup protonup
pkgs.bottles bottles
heroic heroic
pkgs.prismlauncher prismlauncher
]; ];
environment.sessionVariables = { environment.sessionVariables = {

View File

@ -1,8 +1,8 @@
{ {
security.rtkit.enable = true; security.rtkit.enable = true;
hardware.pulseaudio.enable = false;
services = { services = {
pulseaudio.enable = false;
pipewire = { pipewire = {
enable = true; enable = true;

View File

@ -1,11 +1,11 @@
{pkgs, config, ...}: { { pkgs, pkgs-unstable, config, ...}: {
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.v2raya}/bin/v2rayA"; ExecStart = "${pkgs-unstable.v2raya}/bin/v2rayA";
}; };
path = with pkgs; [ iptables bash iproute2 ]; path = with pkgs; [ iptables bash iproute2 ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

View File

@ -75,7 +75,7 @@
initExtra = '' initExtra = ''
eval "$(zoxide init zsh)" eval "$(zoxide init zsh)"
eval "$(nh completions --shell zsh)" eval "$(nh completions zsh)"
source "$(fzf-share)/key-bindings.zsh" source "$(fzf-share)/key-bindings.zsh"
source "$(fzf-share)/completion.zsh" source "$(fzf-share)/completion.zsh"
''; '';

View File

@ -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 = [ imports = [
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = false;
useUserPackages = true; useUserPackages = true;
backupFileExtension = "rebuild"; backupFileExtension = "rebuild";
@ -22,10 +22,13 @@
homeDirectory = "/home/${name}"; homeDirectory = "/home/${name}";
stateVersion = "23.11"; stateVersion = "23.11";
}; };
_module.args.pkgs = lib.mkForce pkgs-unstable;
}; };
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-stable; pkgs-stable = pkgs;
inherit pkgs-fixed; inherit pkgs-fixed;
host = { host = {
laptop = laptop; laptop = laptop;