use my nur directly

This commit is contained in:
Dmitriy Kholkin 2024-02-01 22:47:27 +03:00
parent 9b670ac6de
commit 4fa2ec5f78
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
3 changed files with 224 additions and 587 deletions

779
flake.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -4,8 +4,6 @@
inputs = { inputs = {
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# 6.1.55 kernel breaks podman. wait for fix
nixpkgs-pinned.url = "github:nixos/nixpkgs/9eebdbb7182caf58dbbc11a4c221c23e867cca08";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
flake-registry = { flake-registry = {
@ -25,6 +23,7 @@
url = "github:arkenfox/user.js"; url = "github:arkenfox/user.js";
flake = false; flake = false;
}; };
ataraxiasjel-nur.url = "github:AtaraxiaSjel/nur";
attic.url = "github:zhaofengli/attic"; attic.url = "github:zhaofengli/attic";
base16.url = "github:AtaraxiaSjel/base16-nix"; base16.url = "github:AtaraxiaSjel/base16-nix";
base16-tokyonight-scheme = { base16-tokyonight-scheme = {
@ -36,7 +35,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
devenv.url = "github:cachix/devenv";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -46,9 +44,7 @@
inputs.nixpkgs.follows = "nixpkgs"; # MESA/OpenGL HW workaround inputs.nixpkgs.follows = "nixpkgs"; # MESA/OpenGL HW workaround
}; };
hyprpaper = { hyprpaper = {
# TODO: return to upstream after fix merge url = "github:hyprwm/hyprpaper";
url = "github:AtaraxiaSjel/hyprpaper/fix-nix";
# url = "github:hyprwm/hyprpaper";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
mms.url = "github:mkaito/nixos-modded-minecraft-servers"; mms.url = "github:mkaito/nixos-modded-minecraft-servers";
@ -69,20 +65,12 @@
url = "github:nix-community/nixos-generators"; url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur.url = "github:nix-community/NUR"; # nur.url = "github:nix-community/NUR";
prismlauncher.url = "github:AtaraxiaSjel/PrismLauncher/develop"; prismlauncher.url = "github:AtaraxiaSjel/PrismLauncher/develop";
rnix-lsp = {
url = "github:nix-community/rnix-lsp";
inputs.nixpkgs.follows = "nixpkgs";
};
rycee = { rycee = {
url = "gitlab:rycee/nur-expressions"; url = "gitlab:rycee/nur-expressions";
flake = false; flake = false;
}; };
simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@ -9,16 +9,16 @@ let
config = config.nixpkgs.config; config = config.nixpkgs.config;
localSystem = { inherit system; }; localSystem = { inherit system; };
}; };
nur = import inputs.nur { # nur = import inputs.nur {
nurpkgs = import inputs.nixpkgs { # nurpkgs = import inputs.nixpkgs {
system = "x86_64-linux"; # system = "x86_64-linux";
}; # };
}; # };
in in
with lib; { with lib; {
nixpkgs.overlays = [ nixpkgs.overlays = [
nur.repos.ataraxiasjel.overlays.default inputs.ataraxiasjel-nur.overlays.default
nur.repos.ataraxiasjel.overlays.grub2-argon2 inputs.ataraxiasjel-nur.overlays.grub2-argon2
inputs.deploy-rs.overlay inputs.deploy-rs.overlay
inputs.hyprland.overlays.default inputs.hyprland.overlays.default
(final: prev: (final: prev: