AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: switch to stable nixos

Browse Source
This commit is contained in:
Dmitriy Kholkin 2025-05-28 12:02:08 +03:00
parent 967a68d81f
commit 1fa421ddb8
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
3 changed files with 206 additions and 612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

786
flake.lock generated
View File

File diff suppressed because it is too large Load Diff

6
flake.nix
View File

@ -18,8 +18,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
lite-config.url = "github:ataraxiasjel/lite-config/v0.8.0"; lite-config.url = "github:ataraxiasjel/lite-config/v0.8.0";
flake-registry = { flake-registry = {
@ -124,7 +124,7 @@
enable = true; enable = true;
lsp.package = pkgs.nixd; lsp.package = pkgs.nixd;
}; };
pre-commit.hooks = git-hooks.hooks =
let let
default = { default = {
enable = true; enable = true;

26
overlays/default.nix
View File

@ -1,8 +1,8 @@
inputs: final: prev: inputs: _final: prev:
let let
inherit inputs; inherit inputs;
inherit (prev.hostPlatform) system; inherit (prev.hostPlatform) system;
master = import inputs.nixpkgs-master { unstable = import inputs.nixpkgs-unstable {
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
@ -13,22 +13,21 @@ in
# attic-client = inputs.attic.packages.${system}.attic; # attic-client = inputs.attic.packages.${system}.attic;
# attic-server = inputs.attic.packages.${system}.attic-server; # attic-server = inputs.attic.packages.${system}.attic-server;
# cassowary-py = inputs.cassowary.packages.${system}.cassowary; # cassowary-py = inputs.cassowary.packages.${system}.cassowary;
heroic = (prev.heroic.override { extraPkgs = [ final.umu-launcher ]; });
intel-vaapi-driver = prev.intel-vaapi-driver.override { enableHybridCodec = true; }; intel-vaapi-driver = prev.intel-vaapi-driver.override { enableHybridCodec = true; };
# nix-alien = inputs.nix-alien.packages.${system}.nix-alien; # nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
# nix-direnv = inputs.nix-direnv.packages.${system}.default.override { nix = final.nix; }; # nix-direnv = inputs.nix-direnv.packages.${system}.default.override { nix = final.nix; };
# nix-fast-build = inputs.nix-fast-build.packages.${system}.default; # nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
# nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update; # nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
osu-lazer = master.osu-lazer; osu-lazer = unstable.osu-lazer;
osu-lazer-bin = master.osu-lazer-bin; osu-lazer-bin = unstable.osu-lazer-bin;
# prismlauncher = inputs.prismlauncher.packages.${system}.prismlauncher.override { # prismlauncher = inputs.prismlauncher.packages.${system}.prismlauncher.override {
# jdks = [ final.temurin-bin ]; # jdks = [ final.temurin-bin ];
# }; # };
xray = master.xray; xray = unstable.xray;
# youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; }; # youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
# yt-archivist = prev.callPackage ./packages/yt-archivist { }; # yt-archivist = prev.callPackage ./packages/yt-archivist { };
yt-dlp = master.yt-dlp; yt-dlp = unstable.yt-dlp;
sing-box = master.sing-box; sing-box = unstable.sing-box;
steam = prev.steam.override { steam = prev.steam.override {
extraPkgs = extraPkgs =
pkgs: pkgs:
@ -54,17 +53,6 @@ in
''; '';
}); });
# TODO: remove after ver > v0.47.2
hyprland =
if prev.hyprland.version == "0.47.2" then
(prev.hyprland.overrideAttrs (oa: {
patches = (oa.patches or [ ]) ++ [
./patches/hyprland-tablet.patch
];
}))
else
prev.hyprland;
pass-secret-service = prev.pass-secret-service.overrideAttrs (_: { pass-secret-service = prev.pass-secret-service.overrideAttrs (_: {
installCheckPhase = null; installCheckPhase = null;
postInstall = '' postInstall = ''