system: update

This commit is contained in:
Sweetbread 2025-03-30 22:22:46 +03:00
parent 8c39e606e3
commit f1fe966094
13 changed files with 113 additions and 79 deletions

117
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1740876632, "lastModified": 1742237177,
"narHash": "sha256-u695YUS3R5HI1VQp7feCifWYOn3Gh6yGde1vp5rKqTg=", "narHash": "sha256-SZO34S9RKyp0Vub/7JFyNrpxtS/i+2q6Vqi4NIF5NH0=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "5505af25160f16ad26f9107aebee9ea7713b59d9", "rev": "796472887bd6362917f26f3ceac019ef21a39e75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741282631, "lastModified": 1742213273,
"narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "81498562d0f53e613d30368bb5b076784fa86f80", "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +97,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1741757048, "lastModified": 1743315309,
"narHash": "sha256-MN3LM3xugPm8EnDQ57RxS8WWhyPYF4eGUicAvu6Sk9k=", "narHash": "sha256-d2Ly7HixgLZQGnqU+1CRnIrJ6/OFb4jgmzpPsYEq/eY=",
"owner": "ayugram-port", "owner": "ayugram-port",
"repo": "ayugram-desktop", "repo": "ayugram-desktop",
"rev": "715dc517f4f243fb406a6a2f17edb8833cc33463", "rev": "a8a612d86ed4f85c4f345706342a23a7001aaae4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741791118, "lastModified": 1743351736,
"narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", "narHash": "sha256-bpPX3E8EG4tGuMlu3+fFUfRYlNRCmQk2PFfnZDpgroM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "18780912345970e5b546b1b085385789b6935a83", "rev": "09280e17bbd29536efd1549751038fa155489bd4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,11 +444,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738664950, "lastModified": 1742215578,
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1741788549, "lastModified": 1743297135,
"narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=", "narHash": "sha256-nkbX1N0UxFIQTq794UxffLUg3a/wFy/Zf6goUtzmEug=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", "rev": "da2d7c3971d40f841f2afd7def8e4bad9a351e41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,11 +532,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738966025, "lastModified": 1743339740,
"narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=", "narHash": "sha256-G6a7R/gb1xH0yI2uevTmDpxZf6rvMh1lOu0gYrqVu5U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451", "rev": "6dca4ece21864e329394b81cfc767778089097e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -679,11 +679,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741123584, "lastModified": 1741534688,
"narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -733,7 +733,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-fixed": {
"locked": { "locked": {
"lastModified": 1740743217, "lastModified": 1740743217,
"narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=", "narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=",
@ -742,6 +742,22 @@
"rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c", "rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c",
"type": "github" "type": "github"
}, },
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1743231893,
"narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6",
"type": "github"
},
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-24.11",
@ -767,11 +783,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741379970, "lastModified": 1743095683,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +799,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1741246872, "lastModified": 1742669843,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,27 +815,27 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1741865919, "lastModified": 1742071653,
"narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "narHash": "sha256-BIyMLt0DhN8vSeRPnSxfIJVKL2MYxu/kM14y1mD1s24=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "rev": "30b27177a006d425120fb850a64ceb792636501a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30b27177a006d425120fb850a64ceb792636501a",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1731763621, "lastModified": 1743076231,
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "rev": "6c5963357f3c1c840201eda129a99d455074db04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -878,11 +894,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741379162, "lastModified": 1742649964,
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,6 +916,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-fixed": "nixpkgs-fixed",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix" "stylix": "stylix"
@ -910,11 +927,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1741644481, "lastModified": 1743305778,
"narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e653d71e82575a43fe9d228def8eddb73887b866", "rev": "8e873886bbfc32163fe027b8676c75637b7da114",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -945,11 +962,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1741801299, "lastModified": 1743347063,
"narHash": "sha256-ZN5xn3HmG5+RWBc3gGdRfkyt98Tc1IhsUK7txwAw46s=", "narHash": "sha256-2wCoQhyHo3lIRkm/Y4d2ViknCQHhoS2qGvjm//Noo90=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "9e3ab4d208e2cc2aef5ab0f8e18932ebf8064fc5", "rev": "eede71351571c60b87dbf9eefb7ddf2b11fb1354",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1120,11 +1137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737634991, "lastModified": 1741934139,
"narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -18,8 +18,9 @@
inputs = { inputs = {
aagl.url = "github:ezKEa/aagl-gtk-on-nix"; aagl.url = "github:ezKEa/aagl-gtk-on-nix";
nixpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/30b27177a006d425120fb850a64ceb792636501a";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-fixed.url = "github:nixos/nixpkgs/b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c";
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"; ags.url = "github:Aylur/ags";
@ -37,7 +38,7 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: let outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-fixed, home-manager, ... }@inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
in { in {
nixosConfigurations = { nixosConfigurations = {
@ -47,6 +48,10 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system; inherit inputs system;
}; };
modules = [ ./host/Rias/configuration.nix ]; modules = [ ./host/Rias/configuration.nix ];
@ -58,6 +63,10 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system; inherit inputs system;
}; };
modules = [ ./host/Senko/configuration.nix ]; modules = [ ./host/Senko/configuration.nix ];
@ -69,6 +78,10 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system; inherit inputs system;
}; };
modules = [ ./host/Eclipse/configuration.nix ]; modules = [ ./host/Eclipse/configuration.nix ];

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, lib, inputs, ...}: { { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: {
imports = [ imports = [
./secrets/secrets.nix ./secrets/secrets.nix
./modules/aagl.nix ./modules/aagl.nix
@ -16,6 +16,7 @@
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-stable; inherit pkgs-stable;
inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
name = "chest"; name = "chest";

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, lib, inputs, ...}: { { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: {
imports = [ imports = [
./secrets/secrets.nix ./secrets/secrets.nix
./modules/grub.nix ./modules/grub.nix
@ -16,6 +16,7 @@
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-stable; inherit pkgs-stable;
inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
name = "sweetbread"; name = "sweetbread";

View File

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, lib, inputs, ...}: { { config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: {
imports = [ imports = [
./secrets/secrets.nix ./secrets/secrets.nix
./modules/grub.nix ./modules/grub.nix
@ -14,6 +14,7 @@
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-stable; inherit pkgs-stable;
inherit pkgs-fixed;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
name = "sweetbread"; name = "sweetbread";

View File

@ -19,8 +19,8 @@
environment.etc = { environment.etc = {
"v2raya/ru_geoip.dat".source = pkgs.fetchurl { "v2raya/ru_geoip.dat".source = pkgs.fetchurl {
name = "geoip.dat"; name = "geoip.dat";
url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202502081519/geoip.dat"; url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202503301521/geoip.dat";
hash = "sha256-uzv+aNlTD/UycNK2WWbI9timBbaFLAK3ME/lOrzpFdg="; hash = "sha256-IhMK8IzAYo1RtTFCPKaJ515JtZHv08UXDssg3fPgh+I=";
}; };
"v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path; "v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;

View File

@ -1,5 +1,5 @@
{ pkgs-stable, ... }: { { pkgs-fixed, ... }: {
home.packages = with pkgs-stable; [ home.packages = with pkgs-fixed; [
(blender.override { cudaSupport = true; }) (blender.override { cudaSupport = true; })
aseprite aseprite
]; ];

View File

@ -1,5 +1,5 @@
{ pkgs, pkgs-stable, ... }: { { pkgs-fixed, ... }: {
home.packages = with pkgs-stable; [ home.packages = with pkgs-fixed; [
vscode vscode
jetbrains.pycharm-community jetbrains.pycharm-community
jetbrains.idea-community jetbrains.idea-community

View File

@ -1,12 +1,13 @@
{ pkgs, inputs, pkgs-stable, ... }: { { pkgs, inputs, pkgs-fixed, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
google-chrome google-chrome
inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop
pkgs-stable.vesktop # pkgs-stable.vesktop
vesktop
obs-studio obs-studio
mpv mpv
obsidian obsidian
thunderbird pkgs-fixed.thunderbird
libreoffice libreoffice
]; ];
} }

View File

@ -80,7 +80,10 @@
settings = { settings = {
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
ecosystem.no_donation_nag = true; ecosystem = {
no_donation_nag = true;
no_update_news = true;
};
env = [ env = [
"LIBVA_DRIVER_NAME,nvidia" "LIBVA_DRIVER_NAME,nvidia"
@ -121,15 +124,11 @@
}; };
windowrule = [ windowrule = [
"float, ^(imv)$" "float, class:^(imv)$"
"float, ^(feh)$" "float, class:^(feh)$"
"float, ^(mpv)$" "float, class:^(mpv)$"
"float, ^(nmtui)$"
"float, title:^(Список друзей)" "float, title:^(Список друзей)"
"move onscreen cursor -50% -50%, ^(xdragon)$" "move onscreen cursor -50% -50%, class:^(xdragon)$"
];
windowrulev2 = [
"float, title:(nmtui)" "float, title:(nmtui)"
"float, title:(pulsemixer)" "float, title:(pulsemixer)"
"float, title:(clipse)" "float, title:(clipse)"

View File

@ -2,14 +2,14 @@
yazi-plugins = pkgs.fetchFromGitHub { yazi-plugins = pkgs.fetchFromGitHub {
owner = "yazi-rs"; owner = "yazi-rs";
repo = "plugins"; repo = "plugins";
rev = "07258518f3bffe28d87977bc3e8a88e4b825291b"; rev = "273019910c1111a388dd20e057606016f4bd0d17";
hash = "sha256-axoMrOl0pdlyRgckFi4DiS+yBKAIHDhVeZQJINh8+wk="; hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I=";
}; };
starship = pkgs.fetchFromGitHub { starship = pkgs.fetchFromGitHub {
owner = "Rolv-Apneseth"; owner = "Rolv-Apneseth";
repo = "starship.yazi"; repo = "starship.yazi";
rev = "d1cd0a38aa6a2c2e86e62a466f43e415f781031e"; rev = "6c639b474aabb17f5fecce18a4c97bf90b016512";
sha256 = "sha256-XiEsykudwYmwSNDO41b5layP1DqVa89e6Emv9Qf0mz0="; sha256 = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A=";
}; };
in { in {
programs.yazi = { programs.yazi = {

View File

@ -5,6 +5,6 @@
burpsuite burpsuite
exiftool exiftool
python3 python3
pkgs-stable.jetbrains.pycharm-community pkgs-fixed.jetbrains.pycharm-community
]; ];
} }

View File

@ -1,4 +1,4 @@
{ pkgs, pkgs-stable, lib, inputs, name, fullname ? name, ... }: { { pkgs, pkgs-stable, pkgs-fixed, lib, inputs, name, fullname ? name, ... }: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
@ -26,6 +26,7 @@
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-stable; inherit pkgs-stable;
inherit pkgs-fixed;
}; };
}; };
} }