daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 18:30:43 -06:00
Code Issues Projects Releases Packages Wiki Activity

less in flake.nix because why not

Browse source
This commit is contained in:
Daylin Morgan 2024-02-21 14:36:33 -06:00
parent 57c6c0ac0a
commit 2e0ec36c0a
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
3 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
flake.lock
View file

@ -15,10 +15,31 @@
"type": "github" "type": "github"
} }
}, },
"flake-inputs": {
"inputs": {
"hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib",
"nix-eval-jobs": "nix-eval-jobs",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs-wayland": "nixpkgs-wayland",
"pinix": "pinix"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-pNq475t8Hbj+GhSfheiUYA7hVRMjFmTa3B8iAaLtE74=",
"path": "./inputs",
"type": "path"
},
"original": {
"path": "./inputs",
"type": "path"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"inputs", "flake-inputs",
"nix-eval-jobs", "nix-eval-jobs",
"nixpkgs" "nixpkgs"
] ]
@ -60,7 +81,7 @@
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems", "systems": "systems",
@ -85,7 +106,7 @@
"hyprland-contrib": { "hyprland-contrib": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -106,12 +127,12 @@
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"inputs", "flake-inputs",
"hyprland", "hyprland",
"systems" "systems"
] ]
@ -133,7 +154,7 @@
"hyprlang": { "hyprlang": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
] ]
@ -155,7 +176,7 @@
"hyprlang_2": { "hyprlang_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"hyprland", "hyprland",
"xdph", "xdph",
"nixpkgs" "nixpkgs"
@ -175,27 +196,6 @@
"type": "github" "type": "github"
} }
}, },
"inputs": {
"inputs": {
"hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib",
"nix-eval-jobs": "nix-eval-jobs",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs-wayland": "nixpkgs-wayland",
"pinix": "pinix"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-pNq475t8Hbj+GhSfheiUYA7hVRMjFmTa3B8iAaLtE74=",
"path": "./inputs",
"type": "path"
},
"original": {
"path": "./inputs",
"type": "path"
}
},
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -220,7 +220,7 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nixpkgs" "nixpkgs"
], ],
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
@ -242,7 +242,7 @@
"nix-github-actions": { "nix-github-actions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nix-eval-jobs", "nix-eval-jobs",
"nixpkgs" "nixpkgs"
] ]
@ -264,7 +264,7 @@
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -318,11 +318,11 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"nix-eval-jobs": [ "nix-eval-jobs": [
"inputs", "flake-inputs",
"nix-eval-jobs" "nix-eval-jobs"
], ],
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -343,7 +343,7 @@
"pinix": { "pinix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -363,7 +363,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"inputs": "inputs" "flake-inputs": "flake-inputs"
} }
}, },
"systems": { "systems": {
@ -399,7 +399,7 @@
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"nix-eval-jobs", "nix-eval-jobs",
"nixpkgs" "nixpkgs"
] ]
@ -440,18 +440,18 @@
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [
"inputs", "flake-inputs",
"hyprland", "hyprland",
"hyprland-protocols" "hyprland-protocols"
], ],
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"nixpkgs": [ "nixpkgs": [
"inputs", "flake-inputs",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"inputs", "flake-inputs",
"hyprland", "hyprland",
"systems" "systems"
] ]

23
flake.nix
View file

@ -1,23 +1,16 @@
{ {
description = "nix begat oizys"; description = "nix begat oizys";
# inputs.inputs.url = "github:daylinmorgan/oizys?dir=inputs"; # inputs.flake-inputs.url = "github:daylinmorgan/oizys?dir=inputs";
inputs.inputs.url = "path:./inputs"; inputs.flake-inputs.url = "path:./inputs";
outputs = { outputs = {
inputs,
self, self,
... flake-inputs,
}: let }:
lib = import ./lib { (import ./lib {
nixpkgs = inputs.inputs.nixpkgs;
inputs = inputs.inputs;
inherit self; inherit self;
}; inputs = flake-inputs.inputs;
inherit (lib) findModules buildHosts buildOizys; })
in { .oizysFlake {};
nixosModules = findModules {};
nixosConfigurations = buildHosts {};
packages = buildOizys {};
};
} }

9
lib/default.nix
View file

@ -1,9 +1,9 @@
{ {
inputs, inputs,
nixpkgs,
self, self,
... ...
}: let }: let
nixpkgs = inputs.nixpkgs;
inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs; inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
inherit (nixpkgs.lib) hasSuffix nixosSystem genAttrs; inherit (nixpkgs.lib) hasSuffix nixosSystem genAttrs;
inherit (nixpkgs.lib.filesystem) listFilesRecursive; inherit (nixpkgs.lib.filesystem) listFilesRecursive;
@ -69,4 +69,11 @@ in rec {
} }
] ]
else findModulesList (dir + "/${name}")) (readDir dir))); else findModulesList (dir + "/${name}")) (readDir dir)));
oizysFlake = _: {
nixosModules = findModules {};
nixosConfigurations = buildHosts {};
packages = buildOizys {};
formatter = forAllSystems (pkgs: pkgs.alejandra);
};
} }