Compare commits

...

3 commits

Author SHA1 Message Date
67bd933267 flake.lock: Update
Flake lock file updates:

• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=7517d0a86b4008fe7d1a05b675cf1f93152e8b71' (2024-11-07)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=72659d48ac0e27d815fb8b0b96eb8aa2614a4dd9' (2024-11-09)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=e58e97b0a38b8ccc87a4304c9e4e2b37c9966875' (2024-11-07)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=9e628067fc54851dc9138c2882abb21f72c5a5a6' (2024-11-10)
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/3ce0cde8709cdacbfba471f8e828433b58a561e9' (2024-11-07)
  → 'github:hyprwm/hyprutils/60d3dece30f98e8ad85131829c8529950630d6bc' (2024-11-09)
• Updated input 'hyprman':
    'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=8a866a8082a8debb356b257df1af6ce3becbd1a6' (2024-10-30)
  → 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=a41acd54a3f887f4050c518de25963d5e7d6208f' (2024-11-07)
• Updated input 'lix':
    '72cce7be3f.tar.gz?narHash=sha256-UAh8hocN7Vdl%2BsXxuToL6Cm1TsMHBpcEmHy%2Bl5xFrMk%3D&rev=72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f' (2024-11-07)
  → 'd1d96cc4c8.tar.gz?narHash=sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM%3D&rev=d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771' (2024-11-10)
• Updated input 'lix-module':
    'fd186f535a.tar.gz?narHash=sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s%3D&rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d' (2024-10-01)
  → '691193879d.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/cc2ddbf2df8ef7cc933543b1b42b845ee4772318' (2024-11-03)
  → 'github:nix-community/nix-index-database/896019f04b22ce5db4c0ee4f89978694f44345c3' (2024-11-10)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
  → 'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/ddfa3b485c17ad2594c44c4785533ea45db4e32a' (2024-11-07)
  → 'github:nix-community/nixpkgs-wayland/158e6cfbd6fdabc0a03a7271c0d8e8563e1a95dc' (2024-11-10)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/d0ecc1890f77e9e170f2de279d6902d84a0cbc51' (2024-11-03)
  → 'github:nix-community/lib-aggregate/807ab623e6d01e931269a28a07c59dcfd6474173' (2024-11-10)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/2376a861a1a15f05339245fbaa4422f2d1bdf485' (2024-11-03)
  → 'github:nix-community/nixpkgs.lib/e04234d263750db01c78a412690363dc2226e68a' (2024-11-10)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/7f9159a16584ee86eed077c8a73e845690b7d513' (2024-10-31)
  → 'github:nix-community/nix-eval-jobs/96902c4573cd03ea7e533634cb49861148f49a7a' (2024-11-10)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs':
    'github:NixOS/nixpkgs/154bcb95ad51bc257c2ce4043a725de6ca700ef6' (2024-08-09)
  → 'github:NixOS/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933' (2024-11-07)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
  → 'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
2024-11-10 22:30:25 +00:00
0446dacc1a
use more flag groups 2024-11-10 16:27:31 -06:00
3cab71f282
update hwylcli 2024-11-10 16:21:45 -06:00
5 changed files with 70 additions and 142 deletions

View file

@ -240,11 +240,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1731002191, "lastModified": 1731182230,
"narHash": "sha256-KIt2bydFMFHdaeS27ArWduIeLl8V2FZfceCrspXeJ0k=", "narHash": "sha256-fFMFH0n+4r9NL/AobvFwSs+PA+F5yiOiImkfi3RJF2k=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "7517d0a86b4008fe7d1a05b675cf1f93152e8b71", "rev": "72659d48ac0e27d815fb8b0b96eb8aa2614a4dd9",
"revCount": 7909, "revCount": 7940,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@ -318,11 +318,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1730969692, "lastModified": 1731254055,
"narHash": "sha256-yHY98IWTLDz57TrseUxdh5QnpngcNCjNXTJ2XCeNhtk=", "narHash": "sha256-JJ0xZCm8NTNAtTRH0+E1UvxE6mzJXKi0beKEulV+cj0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", "rev": "9e628067fc54851dc9138c2882abb21f72c5a5a6",
"revCount": 5425, "revCount": 5437,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -413,11 +413,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730299948, "lastModified": 1731019624,
"narHash": "sha256-RGP06zJWKK7D3E9xrK0DnW4gzcmITy6U7RuePxVX0jI=", "narHash": "sha256-22viQMlEqNjwj+wHpo9FkKD/vlXmj+dzm+23VezXlME=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8a866a8082a8debb356b257df1af6ce3becbd1a6", "rev": "a41acd54a3f887f4050c518de25963d5e7d6208f",
"revCount": 16, "revCount": 18,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/hyprman.git" "url": "https://git.dayl.in/daylin/hyprman.git"
}, },
@ -438,11 +438,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730968903, "lastModified": 1731163338,
"narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", "rev": "60d3dece30f98e8ad85131829c8529950630d6bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -482,11 +482,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1730635946, "lastModified": 1731240728,
"narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=", "narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51", "rev": "807ab623e6d01e931269a28a07c59dcfd6474173",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730938523, "lastModified": 1731235488,
"narHash": "sha256-UAh8hocN7Vdl+sXxuToL6Cm1TsMHBpcEmHy+l5xFrMk=", "narHash": "sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM=",
"rev": "72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f", "rev": "d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f.tar.gz?rev=72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771.tar.gz?rev=d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727752861, "lastModified": 1731185731,
"narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
"rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -615,11 +615,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1730389079, "lastModified": 1731250407,
"narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=", "narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "7f9159a16584ee86eed077c8a73e845690b7d513", "rev": "96902c4573cd03ea7e533634cb49861148f49a7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,11 +657,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730604744, "lastModified": 1731209121,
"narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -708,11 +708,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1730595754, "lastModified": 1731200463,
"narHash": "sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY=", "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "2376a861a1a15f05339245fbaa4422f2d1bdf485", "rev": "e04234d263750db01c78a412690363dc2226e68a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1730993036, "lastModified": 1731274007,
"narHash": "sha256-GbCKT3+7FaY0tlIuK0Wdc10HqiN3FBmgHOdnvTAyJGM=", "narHash": "sha256-ux6QEqZvDAkibypjz6cgd8mGVET6SV5Xocwd/mAfxZ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "ddfa3b485c17ad2594c44c4785533ea45db4e32a", "rev": "158e6cfbd6fdabc0a03a7271c0d8e8563e1a95dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -792,11 +792,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1731139594,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -808,11 +808,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1723221148, "lastModified": 1730958623,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +824,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1731139594,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -914,30 +914,6 @@
"type": "github" "type": "github"
} }
}, },
"roc": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_5",
"nixgl": "nixgl",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1730937151,
"narHash": "sha256-wU1ZpJhIS7L7h5GybhKuDkeqm4I6KI+NLOoKaDMBp7w=",
"owner": "roc-lang",
"repo": "roc",
"rev": "1a5776653cebeeb03db57adce8f51910b7296295",
"type": "github"
},
"original": {
"owner": "roc-lang",
"repo": "roc",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"comin": "comin", "comin": "comin",
@ -1182,53 +1158,6 @@
"repo": "zig-overlay", "repo": "zig-overlay",
"type": "github" "type": "github"
} }
},
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1730981477,
"narHash": "sha256-xumPGh1MLymi4RrJmUqZQxO9DYXaqaYD60yPtpKcw4g=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "057830f53f122fefb8ebd151ce717a821eb47394",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zls": {
"inputs": {
"flake-utils": "flake-utils_7",
"gitignore": "gitignore_2",
"nixpkgs": [
"nixpkgs"
],
"zig-overlay": [
"zig-overlay"
]
},
"locked": {
"lastModified": 1731002594,
"narHash": "sha256-GMz5G0wlpTrM4U+PXQHsW4+LIw83FX04A+YLWFTaA6E=",
"owner": "zigtools",
"repo": "zls",
"rev": "6144e778307f65c18308bb12fa5a25add91afb27",
"type": "github"
},
"original": {
"owner": "zigtools",
"repo": "zls",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -8,7 +8,7 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-YCHyMyy6cvNZgsmxPgskbAMETHs4/bP2Cp6XbjfWm1k="; nimbleDepsHash = "sha256-/H/HvnJqpDJcyVJ2rbn7PDSSoJB/TMr9yiIKxtB1O+E=";
meta = { meta = {
description = "nix begat oizys"; description = "nix begat oizys";

View file

@ -3,12 +3,12 @@
"packages": { "packages": {
"hwylterm": { "hwylterm": {
"version": "0.1.0", "version": "0.1.0",
"vcsRevision": "a4e0f3fc7b34bac8e448dd35f58012d07dd4a0d0", "vcsRevision": "e8e090c5b76bc555231bda536193df6f92a54db2",
"url": "https://github.com/daylinmorgan/hwylterm", "url": "https://github.com/daylinmorgan/hwylterm",
"downloadMethod": "git", "downloadMethod": "git",
"dependencies": [], "dependencies": [],
"checksums": { "checksums": {
"sha1": "848f75dc1bc910560e5e0038bf0a9ebf8d096385" "sha1": "925aad3ce660979de7cdb2f58a31dc7ac693e34d"
} }
}, },
"jsony": { "jsony": {

View file

@ -13,5 +13,5 @@ bin = @["oizys"]
requires "nim >= 2.0.8" requires "nim >= 2.0.8"
requires "jsony" requires "jsony"
requires "zippy" requires "zippy"
requires "https://github.com/daylinmorgan/hwylterm#a4e0f3f" requires "https://github.com/daylinmorgan/hwylterm#e8e090c"

View file

@ -8,14 +8,15 @@ proc checkExes() =
fatalQuit "oizys requires nix" fatalQuit "oizys requires nix"
checkexes() checkexes()
hwylCli: hwylCli:
name "oizys" name "oizys"
globalFlags: flags:
[global]
flake "path/to/flake" flake "path/to/flake"
host: host:
T seq[string] T seq[string]
? "host(s) to build" ? "host(s) to build"
# - h conflicts with autoadded help short flag
debug: debug:
T bool T bool
? "enable debug mode" ? "enable debug mode"
@ -24,6 +25,16 @@ hwylCli:
T bool T bool
? "set cache timeout to 0" ? "set cache timeout to 0"
- r - r
[yes]
yes:
T bool
? "skip all confirmation prompts"
[minimal]
minimal:
T bool
? "set minimal"
- m
preSub: preSub:
setupLoggers(debug) setupLoggers(debug)
updateContext(host, flake, debug, resetCache) updateContext(host, flake, debug, resetCache)
@ -32,10 +43,7 @@ hwylCli:
--- build --- build
... "nix build" ... "nix build"
flags: flags:
minimal: ^[minimal]
T bool
? "set minimal"
- m
run: run:
nixBuild(minimal, args) nixBuild(minimal, args)
@ -43,15 +51,15 @@ hwylCli:
... "build and push store paths" ... "build and push store paths"
flags: flags:
name: name:
* "oizys"
? "name of binary cache" ? "name of binary cache"
* "oizys"
service: service:
? "name of cache service" ? "name of cache service"
* "attic" * "attic"
jobs: jobs:
* countProcessors()
? "jobs when pushing paths"
T int T int
? "jobs when pushing paths"
* countProcessors()
- j - j
run: run:
nixBuildWithCache(name, args, service, jobs) nixBuildWithCache(name, args, service, jobs)
@ -69,10 +77,7 @@ hwylCli:
--- dry --- dry
... "dry run build" ... "dry run build"
flags: flags:
minimal: ^[minimal]
T bool
? "set minimal"
- m
run: run:
nixBuildHostDry(minimal, args) nixBuildHostDry(minimal, args)
@ -91,19 +96,13 @@ hwylCli:
--- output --- output
... "nixos config attr" ... "nixos config attr"
flags:
yes:
T bool
? "skip all confirmation prompts"
run: run:
echo nixosConfigAttrs().join(" ") echo nixosConfigAttrs().join(" ")
--- update --- update
... "update and run nixos-rebuild" ... "update and run nixos-rebuild"
flags: flags:
yes: ^[yes]
T bool
? "skip all confirmation prompts"
preview: preview:
T bool T bool
? "show preview and exit" ? "show preview and exit"