Compare commits

...
6 Commits
Author SHA1 Message Date
Sweetbread eab14ec06b ags: add another accent for chest 2025-12-02 20:00:28 +03:00
Sweetbread ca96e595d5 system: update channels 2025-12-02 00:57:48 +03:00
Sweetbread cdb1cbbe77 fixup! flake: add custom cache 2025-12-01 23:06:45 +03:00
Sweetbread cab9cd0960 ref: remove host.laptop from user modules 2025-12-01 22:22:18 +03:00
Sweetbread 2c69bad6ae sops: fix link 2025-12-01 19:47:00 +03:00
Sweetbread bbed468f45 flake: add custom cache 2025-12-01 19:15:35 +03:00
22 changed files with 87 additions and 90 deletions
Generated
+10 -10
View File
@@ -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",
+8 -10
View File
@@ -3,26 +3,24 @@
nixConfig = {
extra-substituters = [
"https://nix.codrs.ru/main"
"https://nix-community.cachix.org"
# "https://cache.garnix.io"
"https://hyprland.cachix.org"
"https://ezkea.cachix.org"
"https://risdeveau.cachix.org"
];
extra-trusted-public-keys = [
"main:kpwMe+9BsGJ/IUb7i3iadaV38y5/Yuqoct0mf7wI9ds="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
# "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
"risdeveau.cachix.org-1:TsoFSVeLl7iKtUYGX7qsvKPjf2vbNLfLC5v3SAdU8r0="
];
};
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";
@@ -40,17 +38,17 @@
};
};
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
system
;
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 ];
};
+3 -6
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = false;
in {
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
imports = [
./secrets/secrets.nix
./modules/aagl.nix
@@ -17,11 +15,10 @@ in {
(import ../../user/common.nix {
inherit config;
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-fixed;
inherit pkgs-stable;
inherit pkgs-pinned;
inherit lib;
inherit inputs;
inherit laptop;
name = "chest";
})
];
+5 -7
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = true;
in {
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
imports = [
./secrets/secrets.nix
./modules/grub.nix
@@ -15,17 +13,17 @@ in {
(import ../../user/common.nix {
inherit config;
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-fixed;
inherit pkgs-stable;
inherit pkgs-pinned;
inherit lib;
inherit inputs;
inherit laptop;
name = "chest";
})
];
nix.settings.cores = 3;
nixpkgs.config.allowBroken = true;
programs.gamemode.enable = true;
hardware.bluetooth.enable = true;
host.laptop = laptop;
host.laptop = true;
}
+3 -6
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = false;
in {
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
imports = [
./secrets/secrets.nix
./modules/grub.nix
@@ -17,11 +15,10 @@ in {
(import ../../user/common.nix {
inherit config;
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-fixed;
inherit pkgs-stable;
inherit pkgs-pinned;
inherit lib;
inherit inputs;
inherit laptop;
name = "sweetbread";
fullname = "Sweet Bread";
})
+4 -7
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let
laptop = true;
in {
{ config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
imports = [
./secrets/secrets.nix
./modules/grub.nix
@@ -15,18 +13,17 @@ in {
(import ../../user/common.nix {
inherit config;
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-fixed;
inherit pkgs-stable;
inherit pkgs-pinned;
inherit lib;
inherit inputs;
inherit laptop;
name = "sweetbread";
fullname = "Sweet Bread";
})
];
hardware.bluetooth.enable = true;
host.laptop = laptop;
host.laptop = true;
environment.systemPackages = [ pkgs.dbgate ];
}
+1 -1
View File
@@ -4,7 +4,7 @@
secrets = {
vpn_bolt = {
format = "binary";
sopsFile = ./vpn_bolt.db;
sopsFile = ../../Rias/secrets/vpn_bolt.db;
};
};
};
-1
View File
@@ -1 +0,0 @@
../../Rias/secrets/vpn_bolt.db
+6 -1
View File
@@ -11,10 +11,15 @@
};
config = {
nix.settings = {
keep-going = true;
extra-substituters = [ "https://nix.codrs.ru/main" ];
extra-trusted-public-keys = [ "main:kpwMe+9BsGJ/IUb7i3iadaV38y5/Yuqoct0mf7wI9ds=" ];
experimental-features = [ "nix-command" "flakes" ];
};
networking.hostName = hostname;
time.timeZone = lib.mkDefault "Europe/Moscow";
i18n.defaultLocale = lib.mkDefault "ru_RU.UTF-8";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "23.05";
};
}
+6 -6
View File
@@ -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
+3 -3
View File
@@ -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 = {
+3 -3
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, ...}: {
{
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
+1 -1
View File
@@ -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/
+1 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }: {
{
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
}
+2 -2
View File
@@ -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" ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, inputs, pkgs, ... }: {
{ config, inputs, pkgs, username, ... }: {
imports = [ inputs.ags.homeManagerModules.default ];
programs.ags = {
@@ -22,5 +22,5 @@
wayland.windowManager.hyprland.settings.exec-once = [ "ags run" ];
xdg.configFile."ags".source = (pkgs.callPackage ./packages/drvs/ags.nix { colors = config.lib.stylix.colors; });
xdg.configFile."ags".source = (pkgs.callPackage ./packages/drvs/ags.nix { inherit username; colors = config.lib.stylix.colors; });
}
+3 -3
View File
@@ -1,7 +1,7 @@
{ pkgs-fixed, lib, host, ... }:
{ pkgs-pinned, lib, osConfig, ... }:
lib.mkIf (!host.laptop) {
home.packages = with pkgs-fixed; [
lib.mkIf (!osConfig.host.laptop) {
home.packages = with pkgs-pinned; [
(blender.override { cudaSupport = true; })
aseprite
krita
+2 -2
View File
@@ -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
+8 -4
View File
@@ -1,17 +1,21 @@
{ stdenv, lib, config, colors, ... }:
{ stdenv, lib, config, colors, username, ... }:
stdenv.mkDerivation {
name = "AGS theme";
src = ./ags;
dontUnpack = true;
patchPhase = ''
patchPhase = let
accent = if username == "chest"
then colors.base0E
else colors.base0B;
in ''
echo \$bg: \#${colors.base00}\; > colors.scss
echo \$surface0: \#${colors.base02}\; >> colors.scss
echo \$fg: \#${colors.base05}\; >> colors.scss
echo \$accent: \#${colors.base0B}\; >> colors.scss
echo \$accent: \#${accent}\; >> colors.scss
echo \#${colors.base0B} > accent.css
echo \#${accent} > accent.css
'';
installPhase = ''
+13 -11
View File
@@ -1,8 +1,16 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, laptop, 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,18 +30,12 @@
homeDirectory = "/home/${name}";
stateVersion = "23.11";
};
_module.args.pkgs = lib.mkForce pkgs-unstable;
};
extraSpecialArgs = {
inherit inputs;
pkgs-stable = pkgs;
inherit pkgs-fixed;
host = {
laptop = laptop;
name = config.networking.hostName;
};
inherit pkgs-stable;
inherit pkgs-pinned;
username = name;
};
};
@@ -53,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;