daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-19 14:37:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:79c7654486977b8e83b13284945b3bd5d2a686b8
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
...
compare: daylin:2e4fdc480559c3500057907c9e295397c22712b3
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

2 commits
79c7654486 ... 2e4fdc4805

Author SHA1 Message Date
Daylin Morgan
2e4fdc4805
flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=01ff5fdf6a00a9231bd3b56400d8bcab378c4257' (2024-08-10)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=d361fcbd85a92f0494c6d8ef0c63aad798df20a7' (2024-08-12)
• Updated input 'hyprland/aquamarine':
    'github:hyprwm/aquamarine/7c3565f9bedc7cb601cc0baa14792247e4dc1d5a' (2024-07-30)
  → 'github:hyprwm/aquamarine/9312aa28271c91e5d67ecb9def527b2bbcff0e66' (2024-08-11)
• Updated input 'hyprland/hyprcursor':
    'github:hyprwm/hyprcursor/4493a972b48f9c3014befbbf381ed5fff91a65dc' (2024-07-18)
  → 'github:hyprwm/hyprcursor/912d56025f03d41b1ad29510c423757b4379eb1c' (2024-08-02)
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/5dcbbc1e3de40b2cecfd2007434d86e924468f1f' (2024-07-27)
  → 'github:hyprwm/hyprutils/0252fd13e78e60fb0da512a212e56007515a49f7' (2024-08-05)
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28)
  → 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09)
• Updated input 'lix':
    'c7d97802e4.tar.gz?narHash=sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM%3D&rev=c7d97802e4f59b8621e67cf62275d6a7fde8fe62' (2024-08-09)
  → '5137cea990.tar.gz?narHash=sha256-JVnQ3OLbXQAlkOluFc3gWhZMbhared1Rg5YvNEc92m0%3D&rev=5137cea99044d54337e439510a647743110b2d7d' (2024-08-10)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/97ca0a0fca0391de835f57e44f369a283e37890f' (2024-08-04)
  → 'github:nix-community/nix-index-database/ec78079a904d7d55e81a0468d764d0fffb50ac06' (2024-08-11)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/797dc6fb81746869b72537de50a2f3eee4d4a555' (2024-08-10)
  → 'github:nix-community/nixpkgs-wayland/6d1c004b346b6a80d851cc2a66ef4f4c22be0f19' (2024-08-12)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/04a4b4d84e02590715e753da3d35fb03cddc6425' (2024-08-04)
  → 'github:nix-community/lib-aggregate/8834c9b308bf4d9d448dd73be5f9782f4635d4ca' (2024-08-11)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/8bebd4c74f368aacb047f0141db09ec6b339733c' (2024-08-04)
  → 'github:nix-community/nixpkgs.lib/ace7856d327b618d3777e31b1f224b3ab57ed71a' (2024-08-11)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/2e522fb78d7613cecaf683875ab27b6c90e8a84f' (2024-07-20)
  → 'github:nix-community/nix-eval-jobs/8802412b8747633e9d80639897e4d58fa6290909' (2024-08-11)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/flake-parts':
    'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03)
  → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs':
    'github:NixOS/nixpkgs/8b5a3d5a1d951344d683b442c0739010b80039db' (2024-07-12)
  → 'github:NixOS/nixpkgs/154bcb95ad51bc257c2ce4043a725de6ca700ef6' (2024-08-09)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/treefmt-nix':
    'github:numtide/treefmt-nix/b92afa1501ac73f1d745526adc4f89b527595f14' (2024-07-14)
  → 'github:numtide/treefmt-nix/14c092e0326de759e16b37535161b3cb9770cea3' (2024-08-10)
• Updated input 'roc':
    'github:roc-lang/roc/3f7f1891f32325bceebb2dc56ebb1c97ff0da04e' (2024-08-10)
  → 'github:roc-lang/roc/3ebff4348ff8a361e59b9ca3997c41ac8076a201' (2024-08-12)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/d132903f2088ee03cf3561368a81cd3bd850f5ff' (2024-08-10)
  → 'github:mitchellh/zig-overlay/c87c16d6c6aa605c638f8a2b9e1116d705aabe06' (2024-08-12)
• Updated input 'zls':
    'github:zigtools/zls/d8084a342f40b444addf772fdef36a589299ebe6' (2024-08-06)
  → 'github:zigtools/zls/3ec8ad16337e5fc391fbdfb394f68f155b2a7a69' (2024-08-11)
 2024-08-12 11:42:54 -05:00
Daylin Morgan
2635aa5b57
pipeList -> listify 2024-08-12 11:39:14 -05:00
5 changed files with 89 additions and 68 deletions
Show stats Expand all files Collapse all files

106
flake.lock
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722347739, "lastModified": 1723405438,
"narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719994518, "lastModified": 1722555600,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721330371, "lastModified": 1722623071,
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723322565, "lastModified": 1723479360,
"narHash": "sha256-iwTi2QEc1H6s65Uv7V/Tro/vkvg8WCnpdjzX01mDp7g=", "narHash": "sha256-OLdfP918HiZj4/4ZiNFrYLAXvIAeb4R0iRAJfJIcSUE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "01ff5fdf6a00a9231bd3b56400d8bcab378c4257", "rev": "d361fcbd85a92f0494c6d8ef0c63aad798df20a7",
"revCount": 5076, "revCount": 5080,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -444,11 +444,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722098849, "lastModified": 1722869141,
"narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -500,11 +500,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1722773431, "lastModified": 1723378259,
"narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=", "narHash": "sha256-8JZVHJAoDgbAk9nn7blBB+wnQbgCq1lIxBsyT7qgeI8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "04a4b4d84e02590715e753da3d35fb03cddc6425", "rev": "8834c9b308bf4d9d448dd73be5f9782f4635d4ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +516,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723233557, "lastModified": 1723331518,
"narHash": "sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM=", "narHash": "sha256-JVnQ3OLbXQAlkOluFc3gWhZMbhared1Rg5YvNEc92m0=",
"rev": "c7d97802e4f59b8621e67cf62275d6a7fde8fe62", "rev": "5137cea99044d54337e439510a647743110b2d7d",
"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/5137cea99044d54337e439510a647743110b2d7d.tar.gz?rev=5137cea99044d54337e439510a647743110b2d7d"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -558,11 +558,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1721505437, "lastModified": 1723372011,
"narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=", "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f", "rev": "8802412b8747633e9d80639897e4d58fa6290909",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,11 +600,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722740924, "lastModified": 1723352546,
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -660,11 +660,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722185531, "lastModified": 1723175592,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +676,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1722732880, "lastModified": 1723337705,
"narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -697,11 +697,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723306957, "lastModified": 1723472424,
"narHash": "sha256-fuXCd2b3H+cnmkWSPc5VacpS+3QvZnU3fx2HOpAfH0g=", "narHash": "sha256-p/Kgq0hyHemFTZMdd6ehO6aEhu/eN0XrICc4Qwbjc6A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "797dc6fb81746869b72537de50a2f3eee4d4a555", "rev": "6d1c004b346b6a80d851cc2a66ef4f4c22be0f19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -760,11 +760,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1720781449, "lastModified": 1723221148,
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b5a3d5a1d951344d683b442c0739010b80039db", "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -839,11 +839,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723299605, "lastModified": 1723447286,
"narHash": "sha256-XRju9MHjQ3U4W8F/rHDxJizuXTCLVWmbI3Wa56SAVRM=", "narHash": "sha256-P3YvswRWaPlBr6YOkeNOVs4P/IcjPC24FfN8gUM7VkY=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "3f7f1891f32325bceebb2dc56ebb1c97ff0da04e", "rev": "3ebff4348ff8a361e59b9ca3997c41ac8076a201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1027,11 +1027,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720930114, "lastModified": 1723303070,
"narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=", "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "b92afa1501ac73f1d745526adc4f89b527595f14", "rev": "14c092e0326de759e16b37535161b3cb9770cea3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1101,11 +1101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723291738, "lastModified": 1723464708,
"narHash": "sha256-C3DobEyzw47Rvs9tRpe8XGrqGl4hLABu1wocjxczJ/U=", "narHash": "sha256-4FupzmQFcnMGAUhcr8MPJlgumSRqvAuw9o3wk0/wwaQ=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "d132903f2088ee03cf3561368a81cd3bd850f5ff", "rev": "c87c16d6c6aa605c638f8a2b9e1116d705aabe06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1127,11 +1127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722987529, "lastModified": 1723396350,
"narHash": "sha256-r7tnq70psZQXfLlDj+XzidBj352vfQFrICC7hfKHw7M=", "narHash": "sha256-f5RTadUCYeGPDI6Y7xDYa6sJsdKFCdtD4WipGxuof3A=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "d8084a342f40b444addf772fdef36a589299ebe6", "rev": "3ec8ad16337e5fc391fbdfb394f68f155b2a7a69",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
hosts/algiz/default.nix
View file

@ -1,14 +1,14 @@
{ {
enabled, enabled,
enableAttrs, enableAttrs,
pipeList, listify,
... ...
}: }:
{ {
oizys = { oizys = {
rune.motd = enabled; rune.motd = enabled;
languages = "nim|node|python|nushell" |> pipeList; languages = "nim|node|python|nushell" |> listify;
} // ("docker|backups|nix-ld" |> pipeList |> enableAttrs); } // ("docker|backups|nix-ld" |> listify |> enableAttrs);
services.restic.backups.gdrive = { services.restic.backups.gdrive = {
# directories created by gitea and soft-serve aren't world readable # directories created by gitea and soft-serve aren't world readable

17
hosts/othalan/default.nix
View file

@ -3,15 +3,24 @@
config, config,
enabled, enabled,
enableAttrs, enableAttrs,
pipeList, listify,
... ...
}: }:
{ {
oizys = { oizys =
{
nix-ld = enabled // { nix-ld = enabled // {
overkill = enabled; overkill = enabled;
}; };
languages = "misc|nim|node|nushell|python|roc|tex|zig" |> pipeList; languages = "misc|nim|node|nushell|python|roc|tex|zig" |> listify;
} // ("vpn|desktop|hyprland|chrome|docker|vbox|backups|hp-scanner|llm" |> pipeList |> enableAttrs); }
// (
''
vpn|desktop|hyprland|chrome
docker|vbox|backups|hp-scanner|llm
''
|> listify
|> enableAttrs
);
} }

18
lib/extended.nix
View file

@ -14,6 +14,7 @@ let
mkOption mkOption
types types
splitString splitString
trim
; ;
inherit (final.filesystem) listFilesRecursive; inherit (final.filesystem) listFilesRecursive;
in in
@ -26,8 +27,19 @@ let
enable = false; enable = false;
}; };
# "opt1|opt2" |> pipeList -> ["opt1" "opt2"] # split a string on newlines and pipes to generate list
pipeList = s: s |> replaceStrings [ "\n" ] [ "|" ] |> splitString "|" |> filter (s': s' != ""); # "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');
# ["a" "b"] -> {a.enable = true; b.enable = true;} # ["a" "b"] -> {a.enable = true; b.enable = true;}
enableAttrs = enableAttrs =
@ -112,6 +124,6 @@ in
pkgFromSystem pkgFromSystem
overlayFrom overlayFrom
flakeFromSystem flakeFromSystem
pipeList listify
; ;
} }

4
lib/generators.nix
View file

@ -14,7 +14,7 @@ let
enableAttrs enableAttrs
isNixFile isNixFile
flakeFromSystem flakeFromSystem
pipeList listify
; ;
inherit (lib.filesystem) listFilesRecursive; inherit (lib.filesystem) listFilesRecursive;
@ -59,7 +59,7 @@ let
inherit inherit
mkDefaultOizysModule mkDefaultOizysModule
mkOizysModule mkOizysModule
pipeList listify
enableAttrs enableAttrs
hostName hostName
flake flake