Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce the psycho-horror aspect of the flake

Browse Source
This commit is contained in:
Grimmauld 2024-05-06 08:42:28 +02:00
parent 3f96acd255
commit fb1ab5ec9c
Signed by: Grimmauld
GPG Key ID: C2946668769F91FB
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -563,11 +563,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714763106, "lastModified": 1714906307,
"narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=", "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d", "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -607,11 +607,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1714685007, "lastModified": 1714782413,
"narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", "rev": "651b4702e27a388f0f18e1b970534162dec09aff",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
flake.nix
View File

@ -39,11 +39,6 @@
url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch"; url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch";
hash = "sha256-8RvPI8Id+Ttgv07IMBTAxkSc+K00WhiWgdgrCcULd7o="; hash = "sha256-8RvPI8Id+Ttgv07IMBTAxkSc+K00WhiWgdgrCcULd7o=";
} }
{
# xdg term
url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/303225.patch";
hash = "sha256-+CBCMeBc5NqtjaUUTX1DBKhlFlKf1G6ovWrAo6xHH+I=";
}
]; ];
customNixosSystem = system: definitions: customNixosSystem = system: definitions:
@ -52,7 +47,6 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
overlays = if (builtins.hasAttr "overlays" definitions) then definitions.overlays else [ ];
unpatched = nixpkgs.legacyPackages.${system}; unpatched = nixpkgs.legacyPackages.${system};
patched = unpatched.applyPatches { patched = unpatched.applyPatches {
name = "nixpkgs-patched"; name = "nixpkgs-patched";
@ -63,22 +57,17 @@
in in
nixosSystem ({ nixosSystem ({
inherit system; inherit system;
modules = definitions.modules ++ [
({ config, lib, ... }: {
nixpkgs.overlays = map (f: (final: prev: (import f { inherit final prev lib config; }))) overlays;
})
];
specialArgs = { inherit inputs system stable; }; specialArgs = { inherit inputs system stable; };
} // builtins.removeAttrs definitions [ "overlays" "modules" ]); } // definitions);
in in
{ {
nixosConfigurations = { nixosConfigurations = {
grimmauld-nixos = customNixosSystem "x86_64-linux" { grimmauld-nixos = customNixosSystem "x86_64-linux" {
overlays = import ./overlays;
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
chaotic.nixosModules.default chaotic.nixosModules.default
nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.pipewireLowLatency
./overlays
./common ./common
./specific/grimm-nixos-laptop/configuration.nix ./specific/grimm-nixos-laptop/configuration.nix
./configuration.nix ./configuration.nix

12
overlays/default.nix
View File

@ -1,5 +1,7 @@
[ { config, lib, ... }: {
./deskwhich.nix nixpkgs.overlays = map (f: (final: prev: (import f { inherit final prev lib config; }))) [
./mcontrolcenter.nix ./deskwhich.nix
./the-powder-toy.nix ./mcontrolcenter.nix
] ./the-powder-toy.nix
];
}