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

Compare commits

base: daylin:8f8c5515033dfa72137134ff27cf0238d3dd6256
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:afac7e637b71541e101dc9c9393bf67baf83d53d
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "8f8c5515033dfa72137134ff27cf0238d3dd6256" and "afac7e637b71541e101dc9c9393bf67baf83d53d" have entirely different histories.
8f8c551503 ... afac7e637b

6 changed files with 54 additions and 65 deletions
Show stats Expand all files Collapse all files

48
flake.lock
View file

@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723322565, "lastModified": 1723224800,
"narHash": "sha256-iwTi2QEc1H6s65Uv7V/Tro/vkvg8WCnpdjzX01mDp7g=", "narHash": "sha256-2b+cECwR+3FL/ikuZnXE94H8bXdlnYUbhmi1KNpD/tc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "01ff5fdf6a00a9231bd3b56400d8bcab378c4257", "rev": "8b37e81374928856d8fd859b95a62c8bf4211901",
"revCount": 5076, "revCount": 5073,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -516,11 +516,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723233557, "lastModified": 1723213513,
"narHash": "sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM=", "narHash": "sha256-XbtSx3sxE6rf/D31fBX9d28CuXnokkbHW6tzOEMVfxw=",
"rev": "c7d97802e4f59b8621e67cf62275d6a7fde8fe62", "rev": "346e340cbfe450df3709cf5d51e26ba247a2c1ad",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c7d97802e4f59b8621e67cf62275d6a7fde8fe62.tar.gz?rev=c7d97802e4f59b8621e67cf62275d6a7fde8fe62" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/346e340cbfe450df3709cf5d51e26ba247a2c1ad.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -543,7 +543,7 @@
"narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=", "narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=",
"rev": "e350380d72f94035c309e19fda2fd550f6ab7376", "rev": "e350380d72f94035c309e19fda2fd550f6ab7376",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/e350380d72f94035c309e19fda2fd550f6ab7376.tar.gz?rev=e350380d72f94035c309e19fda2fd550f6ab7376" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/e350380d72f94035c309e19fda2fd550f6ab7376.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -697,11 +697,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723306957, "lastModified": 1723206805,
"narHash": "sha256-fuXCd2b3H+cnmkWSPc5VacpS+3QvZnU3fx2HOpAfH0g=", "narHash": "sha256-C75q+dsWnjObUKukRsFj2VKNRtULvZw/XszfGu97PyY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "797dc6fb81746869b72537de50a2f3eee4d4a555", "rev": "f9b6659b7a856ad5c470ce224a0d69696c6f8c73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1723221148, "lastModified": 1723151389,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "rev": "13fe00cb6c75461901f072ae62b5805baef9f8b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -776,11 +776,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1723175592, "lastModified": 1722813957,
"narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -839,11 +839,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723299605, "lastModified": 1723012587,
"narHash": "sha256-XRju9MHjQ3U4W8F/rHDxJizuXTCLVWmbI3Wa56SAVRM=", "narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "3f7f1891f32325bceebb2dc56ebb1c97ff0da04e", "rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1101,11 +1101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723291738, "lastModified": 1723205416,
"narHash": "sha256-C3DobEyzw47Rvs9tRpe8XGrqGl4hLABu1wocjxczJ/U=", "narHash": "sha256-VF5o0Ogk2PyQSs22aQijjqIC0U3Z4mzjTcrsnhSfQ9U=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "d132903f2088ee03cf3561368a81cd3bd850f5ff", "rev": "f4d2e3b5855a66a763e49d8030edbb6b852c4b1a",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
lib/checks.nix
View file

@ -24,7 +24,7 @@ let
# TODO: start using pipes once support lands in nixd # TODO: start using pipes once support lands in nixd
# selfPackages = self.packages.${pkgs.system} |> attrValues; # selfPackages = self.packages.${pkgs.system} |> attrValues;
selfPackages = attrValues self.packages.${pkgs.system}; selfPackages = (attrValues self.packages.${pkgs.system});
in in
{ {
makePackages = makePackages =
@ -34,7 +34,7 @@ in
# packages from overlays # packages from overlays
(with pkgs; [ (with pkgs; [
swww swww
nixVersions.git # nixVersions.git
]) ])
++ [ ++ [
(flake.pkgs "roc").full (flake.pkgs "roc").full

18
lib/extended.nix
View file

@ -12,7 +12,6 @@ let
inherit (final.filesystem) listFilesRecursive; inherit (final.filesystem) listFilesRecursive;
in in
let let
enabled = { enabled = {
enable = true; enable = true;
}; };
@ -67,14 +66,10 @@ let
flakeVer = flakeVer =
flake: "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}"; flake: "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}";
isNixFile = p: p |> hasSuffix ".nix"; isNixFile = p: hasSuffix ".nix" p;
isDefaultNixFile = p: p |> hasSuffix "default.nix"; isDefaultNixFile = p: hasSuffix "default.nix" p;
# filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths; filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
filterNotDefaultNixFile = paths: listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
paths |> filter (p: !(isDefaultNixFile p) && (isNixFile p));
# listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
listNixFilesRecursive = dir:
dir |> listFilesRecursive |> filterNotDefaultNixFile;
# defaultLinuxPackage = flake: flake.packages.x86_64-linux.default; # defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
# defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default"; # defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
@ -86,10 +81,6 @@ let
pkgs = pkgsFromSystem system; pkgs = pkgsFromSystem system;
pkg = pkgFromSystem system; pkg = pkgFromSystem system;
}; };
functional = {
filterF = list: f: builtins.filter f list;
};
in in
{ {
inherit inherit
@ -108,6 +99,5 @@ in
pkgFromSystem pkgFromSystem
overlayFrom overlayFrom
flakeFromSystem flakeFromSystem
functional
; ;
} }

38
lib/generators.nix
View file

@ -17,30 +17,34 @@ let
; ;
inherit (lib.filesystem) listFilesRecursive; inherit (lib.filesystem) listFilesRecursive;
# pkgFrom = pkgFromSystem "x86_64-linux";
# pkgsFrom = pkgsFromSystem "x86_64-linux";
flake = flakeFromSystem "x86_64-linux"; flake = flakeFromSystem "x86_64-linux";
hostPath = host: ../. + "/hosts/${host}"; hostPath = host: ../. + "/hosts/${host}";
# all nix files not including pkgs.nix # all nix files not including pkgs.nix
# hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host)); hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
hostFiles = host: host |> hostPath |> listFilesRecursive |> filter isNixFile;
commonSpecialArgs = {
inherit
self
inputs
lib
enabled
;
};
mkIso = nixosSystem { mkIso = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
inputs.lix-module.nixosModules.default
self.nixosModules.nix self.nixosModules.nix
self.nixosModules.essentials self.nixosModules.essentials
self.nixosModules.iso (
{ pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (flake.pkg "self") ];
}
)
]; ];
specialArgs = commonSpecialArgs; specialArgs = {
inherit
inputs
lib
self
enabled
;
};
}; };
mkSystem = mkSystem =
@ -54,10 +58,14 @@ let
inputs.hyprland.nixosModules.default inputs.hyprland.nixosModules.default
] ++ (hostFiles hostName); ] ++ (hostFiles hostName);
specialArgs = commonSpecialArgs // { specialArgs = {
inherit inherit
inputs
lib
self
mkDefaultOizysModule mkDefaultOizysModule
mkOizysModule mkOizysModule
enabled
enableAttrs enableAttrs
hostName hostName
flake flake

5
modules/iso.nix
View file

@ -1,5 +0,0 @@
{ pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
environment.systemPackages = (with pkgs; [ neovim ]);
}

6
modules/nix.nix
View file

@ -16,11 +16,7 @@ in
# nix.package = pkgs.nixVersions.latest; # nix.package = pkgs.nixVersions.latest;
nix = { nix = {
settings = { settings = {
experimental-features = [ experimental-features = [ "nix-command" "flakes" "pipe-operator"];
"nix-command"
"flakes"
"pipe-operator"
];
use-xdg-base-directories = true; use-xdg-base-directories = true;
}; };