mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-09 20:33:15 -06:00
Compare commits
No commits in common. "2e4fdc480559c3500057907c9e295397c22712b3" and "79c7654486977b8e83b13284945b3bd5d2a686b8" have entirely different histories.
2e4fdc4805
...
79c7654486
5 changed files with 68 additions and 89 deletions
106
flake.lock
106
flake.lock
|
|
@ -20,11 +20,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723405438,
|
||||
"narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
|
||||
"lastModified": 1722347739,
|
||||
"narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
|
||||
"rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -125,11 +125,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -298,11 +298,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722623071,
|
||||
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
|
||||
"lastModified": 1721330371,
|
||||
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
|
||||
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -323,11 +323,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723479360,
|
||||
"narHash": "sha256-OLdfP918HiZj4/4ZiNFrYLAXvIAeb4R0iRAJfJIcSUE=",
|
||||
"lastModified": 1723322565,
|
||||
"narHash": "sha256-iwTi2QEc1H6s65Uv7V/Tro/vkvg8WCnpdjzX01mDp7g=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "d361fcbd85a92f0494c6d8ef0c63aad798df20a7",
|
||||
"revCount": 5080,
|
||||
"rev": "01ff5fdf6a00a9231bd3b56400d8bcab378c4257",
|
||||
"revCount": 5076,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -444,11 +444,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722869141,
|
||||
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
|
||||
"lastModified": 1722098849,
|
||||
"narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
|
||||
"rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -500,11 +500,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723378259,
|
||||
"narHash": "sha256-8JZVHJAoDgbAk9nn7blBB+wnQbgCq1lIxBsyT7qgeI8=",
|
||||
"lastModified": 1722773431,
|
||||
"narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "8834c9b308bf4d9d448dd73be5f9782f4635d4ca",
|
||||
"rev": "04a4b4d84e02590715e753da3d35fb03cddc6425",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -516,11 +516,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723331518,
|
||||
"narHash": "sha256-JVnQ3OLbXQAlkOluFc3gWhZMbhared1Rg5YvNEc92m0=",
|
||||
"rev": "5137cea99044d54337e439510a647743110b2d7d",
|
||||
"lastModified": 1723233557,
|
||||
"narHash": "sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM=",
|
||||
"rev": "c7d97802e4f59b8621e67cf62275d6a7fde8fe62",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5137cea99044d54337e439510a647743110b2d7d.tar.gz?rev=5137cea99044d54337e439510a647743110b2d7d"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c7d97802e4f59b8621e67cf62275d6a7fde8fe62.tar.gz?rev=c7d97802e4f59b8621e67cf62275d6a7fde8fe62"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -558,11 +558,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723372011,
|
||||
"narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
|
||||
"lastModified": 1721505437,
|
||||
"narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-eval-jobs",
|
||||
"rev": "8802412b8747633e9d80639897e4d58fa6290909",
|
||||
"rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -600,11 +600,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723352546,
|
||||
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
|
||||
"lastModified": 1722740924,
|
||||
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
|
||||
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -660,11 +660,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1723175592,
|
||||
"narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
|
||||
"lastModified": 1722185531,
|
||||
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
|
||||
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -676,11 +676,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1723337705,
|
||||
"narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=",
|
||||
"lastModified": 1722732880,
|
||||
"narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a",
|
||||
"rev": "8bebd4c74f368aacb047f0141db09ec6b339733c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -697,11 +697,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723472424,
|
||||
"narHash": "sha256-p/Kgq0hyHemFTZMdd6ehO6aEhu/eN0XrICc4Qwbjc6A=",
|
||||
"lastModified": 1723306957,
|
||||
"narHash": "sha256-fuXCd2b3H+cnmkWSPc5VacpS+3QvZnU3fx2HOpAfH0g=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "6d1c004b346b6a80d851cc2a66ef4f4c22be0f19",
|
||||
"rev": "797dc6fb81746869b72537de50a2f3eee4d4a555",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -760,11 +760,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1723221148,
|
||||
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
||||
"lastModified": 1720781449,
|
||||
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
|
||||
"rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -839,11 +839,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723447286,
|
||||
"narHash": "sha256-P3YvswRWaPlBr6YOkeNOVs4P/IcjPC24FfN8gUM7VkY=",
|
||||
"lastModified": 1723299605,
|
||||
"narHash": "sha256-XRju9MHjQ3U4W8F/rHDxJizuXTCLVWmbI3Wa56SAVRM=",
|
||||
"owner": "roc-lang",
|
||||
"repo": "roc",
|
||||
"rev": "3ebff4348ff8a361e59b9ca3997c41ac8076a201",
|
||||
"rev": "3f7f1891f32325bceebb2dc56ebb1c97ff0da04e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1027,11 +1027,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723303070,
|
||||
"narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
|
||||
"lastModified": 1720930114,
|
||||
"narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "14c092e0326de759e16b37535161b3cb9770cea3",
|
||||
"rev": "b92afa1501ac73f1d745526adc4f89b527595f14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1101,11 +1101,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723464708,
|
||||
"narHash": "sha256-4FupzmQFcnMGAUhcr8MPJlgumSRqvAuw9o3wk0/wwaQ=",
|
||||
"lastModified": 1723291738,
|
||||
"narHash": "sha256-C3DobEyzw47Rvs9tRpe8XGrqGl4hLABu1wocjxczJ/U=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "c87c16d6c6aa605c638f8a2b9e1116d705aabe06",
|
||||
"rev": "d132903f2088ee03cf3561368a81cd3bd850f5ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1127,11 +1127,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723396350,
|
||||
"narHash": "sha256-f5RTadUCYeGPDI6Y7xDYa6sJsdKFCdtD4WipGxuof3A=",
|
||||
"lastModified": 1722987529,
|
||||
"narHash": "sha256-r7tnq70psZQXfLlDj+XzidBj352vfQFrICC7hfKHw7M=",
|
||||
"owner": "zigtools",
|
||||
"repo": "zls",
|
||||
"rev": "3ec8ad16337e5fc391fbdfb394f68f155b2a7a69",
|
||||
"rev": "d8084a342f40b444addf772fdef36a589299ebe6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
enabled,
|
||||
enableAttrs,
|
||||
listify,
|
||||
pipeList,
|
||||
...
|
||||
}:
|
||||
{
|
||||
oizys = {
|
||||
rune.motd = enabled;
|
||||
languages = "nim|node|python|nushell" |> listify;
|
||||
} // ("docker|backups|nix-ld" |> listify |> enableAttrs);
|
||||
languages = "nim|node|python|nushell" |> pipeList;
|
||||
} // ("docker|backups|nix-ld" |> pipeList |> enableAttrs);
|
||||
|
||||
services.restic.backups.gdrive = {
|
||||
# directories created by gitea and soft-serve aren't world readable
|
||||
|
|
|
|||
|
|
@ -3,24 +3,15 @@
|
|||
config,
|
||||
enabled,
|
||||
enableAttrs,
|
||||
listify,
|
||||
pipeList,
|
||||
...
|
||||
}:
|
||||
{
|
||||
oizys =
|
||||
{
|
||||
nix-ld = enabled // {
|
||||
overkill = enabled;
|
||||
};
|
||||
languages = "misc|nim|node|nushell|python|roc|tex|zig" |> listify;
|
||||
}
|
||||
// (
|
||||
''
|
||||
vpn|desktop|hyprland|chrome
|
||||
docker|vbox|backups|hp-scanner|llm
|
||||
''
|
||||
|> listify
|
||||
|> enableAttrs
|
||||
);
|
||||
oizys = {
|
||||
nix-ld = enabled // {
|
||||
overkill = enabled;
|
||||
};
|
||||
languages = "misc|nim|node|nushell|python|roc|tex|zig" |> pipeList;
|
||||
} // ("vpn|desktop|hyprland|chrome|docker|vbox|backups|hp-scanner|llm" |> pipeList |> enableAttrs);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ let
|
|||
mkOption
|
||||
types
|
||||
splitString
|
||||
trim
|
||||
;
|
||||
inherit (final.filesystem) listFilesRecursive;
|
||||
in
|
||||
|
|
@ -27,19 +26,8 @@ let
|
|||
enable = false;
|
||||
};
|
||||
|
||||
# split a string on newlines and pipes to generate list
|
||||
# "opt1|opt2" |> listify -> ["opt1" "opt2"]
|
||||
# ''
|
||||
# opt1
|
||||
# opt2|opt3
|
||||
# '' |> listify ["opt1" "opt2" "opt3"]
|
||||
listify =
|
||||
s:
|
||||
s
|
||||
|> replaceStrings [ "\n" ] [ "|" ]
|
||||
|> splitString "|"
|
||||
|> filter (s': s' != "")
|
||||
|> map (s': trim s');
|
||||
# "opt1|opt2" |> pipeList -> ["opt1" "opt2"]
|
||||
pipeList = s: s |> replaceStrings [ "\n" ] [ "|" ] |> splitString "|" |> filter (s': s' != "");
|
||||
|
||||
# ["a" "b"] -> {a.enable = true; b.enable = true;}
|
||||
enableAttrs =
|
||||
|
|
@ -124,6 +112,6 @@ in
|
|||
pkgFromSystem
|
||||
overlayFrom
|
||||
flakeFromSystem
|
||||
listify
|
||||
pipeList
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ let
|
|||
enableAttrs
|
||||
isNixFile
|
||||
flakeFromSystem
|
||||
listify
|
||||
pipeList
|
||||
;
|
||||
inherit (lib.filesystem) listFilesRecursive;
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ let
|
|||
inherit
|
||||
mkDefaultOizysModule
|
||||
mkOizysModule
|
||||
listify
|
||||
pipeList
|
||||
enableAttrs
|
||||
hostName
|
||||
flake
|
||||
|
|
|
|||
Loading…
Reference in a new issue