system: update channels
This commit is contained in:
Generated
+10
-10
@@ -683,34 +683,34 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-fixed": {
|
"nixpkgs-pinned": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754292888,
|
"lastModified": 1764517877,
|
||||||
"narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
|
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
|
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
|
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763948260,
|
"lastModified": 1764522689,
|
||||||
"narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=",
|
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c",
|
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -883,7 +883,7 @@
|
|||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprland-plugins": "hyprland-plugins",
|
"hyprland-plugins": "hyprland-plugins",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-fixed": "nixpkgs-fixed",
|
"nixpkgs-pinned": "nixpkgs-pinned",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"stylix": "stylix",
|
"stylix": "stylix",
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
inputs = {
|
inputs = {
|
||||||
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
|
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
nixpkgs-fixed.url = "github:nixos/nixpkgs/ce01daebf8489ba97bd1609d185ea276efdeb121";
|
nixpkgs-pinned.url = "github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c";
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
stylix.url = "github:danth/stylix";
|
stylix.url = "github:danth/stylix";
|
||||||
ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
|
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";
|
system = "x86_64-linux";
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
mkHost = hostname: nixpkgs-stable.lib.nixosSystem {
|
mkHost = hostname: nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
pkgs-unstable = import nixpkgs { inherit system config; };
|
pkgs-stable = import nixpkgs-stable { inherit system config; };
|
||||||
pkgs-fixed = import nixpkgs-fixed { inherit system config; };
|
pkgs-pinned = import nixpkgs-pinned { inherit system config; };
|
||||||
};
|
};
|
||||||
modules = [ ./host/${hostname}/configuration.nix ];
|
modules = [ ./host/${hostname}/configuration.nix ];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: {
|
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./secrets/secrets.nix
|
./secrets/secrets.nix
|
||||||
./modules/aagl.nix
|
./modules/aagl.nix
|
||||||
@@ -15,8 +15,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 = "chest";
|
name = "chest";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: {
|
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./secrets/secrets.nix
|
./secrets/secrets.nix
|
||||||
./modules/grub.nix
|
./modules/grub.nix
|
||||||
@@ -13,8 +13,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 = "chest";
|
name = "chest";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: {
|
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./secrets/secrets.nix
|
./secrets/secrets.nix
|
||||||
./modules/grub.nix
|
./modules/grub.nix
|
||||||
@@ -15,8 +15,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 = "sweetbread";
|
name = "sweetbread";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: {
|
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./secrets/secrets.nix
|
./secrets/secrets.nix
|
||||||
./modules/grub.nix
|
./modules/grub.nix
|
||||||
@@ -13,8 +13,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 = "sweetbread";
|
name = "sweetbread";
|
||||||
|
|||||||
@@ -1,22 +1,22 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs-stable, ... }:
|
||||||
{
|
{
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs-stable; [
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
intel-compute-runtime
|
intel-compute-runtime
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
];
|
];
|
||||||
extraPackages32 = with pkgs.pkgsi686Linux; [
|
extraPackages32 = with pkgs-stable.pkgsi686Linux; [
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs-stable: {
|
||||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
vaapiIntel = pkgs-stable.vaapiIntel.override { enableHybridCodec = true; };
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs-stable; [
|
||||||
intel-gpu-tools
|
intel-gpu-tools
|
||||||
libva-utils
|
libva-utils
|
||||||
clinfo
|
clinfo
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }: {
|
{ config, pkgs-stable, lib, ... }: {
|
||||||
boot.kernelParams = [ "nvidia-drm.modeset=1" ];
|
boot.kernelParams = [ "nvidia-drm.modeset=1" ];
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
|
||||||
@@ -6,12 +6,12 @@
|
|||||||
graphics = {
|
graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enable32Bit = true;
|
enable32Bit = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs-stable; [
|
||||||
nvidia-vaapi-driver
|
nvidia-vaapi-driver
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
libvdpau-va-gl
|
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 = {
|
nvidia = {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs-unstable, inputs, ... }: {
|
{ pkgs, inputs, ... }: {
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs-unstable; [
|
environment.systemPackages = with pkgs; [
|
||||||
file
|
file
|
||||||
tree
|
tree
|
||||||
wget
|
wget
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultPackages = false;
|
enableDefaultPackages = false;
|
||||||
packages = with pkgs-unstable; [
|
packages = with pkgs; [
|
||||||
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
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, pkgs-unstable, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
lib.mkIf config.programs.gamemode.enable {
|
lib.mkIf config.programs.gamemode.enable {
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
@@ -8,7 +8,7 @@ lib.mkIf config.programs.gamemode.enable {
|
|||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
mangohud
|
mangohud
|
||||||
protonup
|
protonup-ng
|
||||||
bottles
|
bottles
|
||||||
heroic
|
heroic
|
||||||
prismlauncher
|
prismlauncher
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ...}: {
|
{
|
||||||
programs.gnupg.agent = {
|
programs.gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSSHSupport = true;
|
enableSSHSupport = true;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
sol = pkgs.writers.writePython3 "shutdown-on-lan.py" {
|
sol = pkgs.writers.writePython3 "shutdown-on-lan.py" {
|
||||||
libraries = [ pkgs.python312Packages.psutil ];
|
libraries = [ pkgs.python313Packages.psutil ];
|
||||||
flakeIgnore = [ "E302" "E305" "E501" "E701" ];
|
flakeIgnore = [ "E302" "E305" "E501" "E701" ];
|
||||||
} /*py*/ ''
|
} /*py*/ ''
|
||||||
# https://habr.com/ru/articles/816765/
|
# https://habr.com/ru/articles/816765/
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }: {
|
{
|
||||||
virtualisation.libvirtd.enable = true;
|
virtualisation.libvirtd.enable = true;
|
||||||
programs.virt-manager.enable = true;
|
programs.virt-manager.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{ pkgs, pkgs-unstable, config, ...}: {
|
{ pkgs, 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-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" ];
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs-fixed, lib, osConfig, ... }:
|
{ pkgs-pinned, lib, osConfig, ... }:
|
||||||
|
|
||||||
lib.mkIf (!osConfig.host.laptop) {
|
lib.mkIf (!osConfig.host.laptop) {
|
||||||
home.packages = with pkgs-fixed; [
|
home.packages = with pkgs-pinned; [
|
||||||
(blender.override { cudaSupport = true; })
|
(blender.override { cudaSupport = true; })
|
||||||
aseprite
|
aseprite
|
||||||
krita
|
krita
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ pkgs, inputs, pkgs-fixed, ... }: {
|
{ pkgs, pkgs-pinned, inputs, ... }: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
pkgs-fixed.ayugram-desktop
|
pkgs-pinned.ayugram-desktop
|
||||||
vesktop
|
vesktop
|
||||||
obs-studio
|
obs-studio
|
||||||
mpv
|
mpv
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, pkgs-fixed, host, ... }: {
|
{ pkgs, pkgs-pinned, host, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/user/packages/cs_utils.nix
|
../../modules/user/packages/cs_utils.nix
|
||||||
];
|
];
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
nautilus
|
nautilus
|
||||||
python3
|
python3
|
||||||
pkgs-fixed.jetbrains.pycharm-community
|
pkgs-pinned.jetbrains.pycharm-community
|
||||||
aseprite
|
aseprite
|
||||||
krita
|
krita
|
||||||
google-chrome
|
google-chrome
|
||||||
|
|||||||
+13
-7
@@ -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 = [
|
imports = [
|
||||||
inputs.home-manager.nixosModules.home-manager {
|
inputs.home-manager.nixosModules.home-manager {
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = false;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
backupFileExtension = "rebuild";
|
backupFileExtension = "rebuild";
|
||||||
overwriteBackup = true;
|
overwriteBackup = true;
|
||||||
@@ -22,14 +30,12 @@
|
|||||||
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;
|
||||||
pkgs-stable = pkgs;
|
inherit pkgs-stable;
|
||||||
inherit pkgs-fixed;
|
inherit pkgs-pinned;
|
||||||
username = name;
|
username = name;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -49,7 +55,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.greetd = let
|
services.greetd = let
|
||||||
tuigreet = lib.getExe pkgs.greetd.tuigreet;
|
tuigreet = lib.getExe pkgs.tuigreet;
|
||||||
session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
|
session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
|
||||||
in {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user