Update flake.lock (#2)

* finish styx rename

* flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/791e1b96b3cd12d56648b3ce7ffb0832eba2b37d' (2024-01-23)
  → 'github:hyprwm/Hyprland/08e35197478d4abbd009333301e77f7da2ff53a3' (2024-01-26)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/72a67d0f58d0ed44a20341fddb2bdfa33c2a2558' (2024-01-19)
  → 'github:hyprwm/contrib/16884001b26e6955ff4b88b4dfe4c8986e20f153' (2024-01-25)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5f5210aa20e343b7e35f40c033000db0ef80d7b9' (2024-01-22)
  → 'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/9c6eb413aa7c92f4e87b10d82a95b2734d009ac5' (2024-01-23)
  → 'github:nix-community/nixpkgs-wayland/ea71e5e42093796a183e582557cbb2da42fb728a' (2024-01-26)
• Updated input 'wezterm':
    'github:wez/wezterm/02bdd7ed56e02543b2a0435a1b703eaed7065862?dir=nix' (2024-01-23)
  → 'github:wez/wezterm/178f35a496d5367b8c00bc5d5bb69b0425d2bf8d?dir=nix' (2024-01-26)

---------

Co-authored-by: Daylin Morgan <daylinmorgan@gmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
github-actions[bot] 2024-01-28 11:57:32 -06:00 committed by GitHub
parent 779df63927
commit 2880a7a9e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 30 deletions

View file

@ -1,3 +1,3 @@
# daylin's nixcfg # oizys
[![](https://github.com/daylinmorgan/nixcfg/actions/workflows/build.yml/badge.svg)](https://github.com/daylinmorgan/nixcfg/actions/workflows/build.yml) [![](https://github.com/daylinmorgan/oizys/actions/workflows/build.yml/badge.svg)](https://github.com/daylinmorgan/oizys/actions/workflows/build.yml)

View file

@ -117,11 +117,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1705973554, "lastModified": 1706289840,
"narHash": "sha256-ZvzkhQA0iaUEkyCxBItps5qcSX509vpxpku1NVaiLRQ=", "narHash": "sha256-Vy6ck6HCx7s/ztAc2lYWTqFXCIHerLiwWZxQOQKGTxA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "791e1b96b3cd12d56648b3ce7ffb0832eba2b37d", "rev": "08e35197478d4abbd009333301e77f7da2ff53a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,11 +138,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705671586, "lastModified": 1706198673,
"narHash": "sha256-JOwVlSgwo2nqQRcArelrx/lK9OUoUxaXUQThQw1q8oA=", "narHash": "sha256-bHlxFd+3QHy6eXtTzzhwVNcyxBSOxTvBuJGNUzI4C4M=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "72a67d0f58d0ed44a20341fddb2bdfa33c2a2558", "rev": "16884001b26e6955ff4b88b4dfe4c8986e20f153",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705883077, "lastModified": 1706173671,
"narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=", "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9", "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +321,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706034020, "lastModified": 1706282146,
"narHash": "sha256-AGTuplNLl8i8aWQly4bSDeBY+Pl0dGpbiCJN6IWk5SI=", "narHash": "sha256-dIj3gfKLea32ylvmvPb0ucPW6ETz3ekICc48oREcBW4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "9c6eb413aa7c92f4e87b10d82a95b2734d009ac5", "rev": "ea71e5e42093796a183e582557cbb2da42fb728a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +449,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1706030986, "lastModified": 1706297213,
"narHash": "sha256-KBpdYBWLvb5xDmnqbalvibPWWjGDcsn6QBHTBva5Q30=", "narHash": "sha256-Zb3GGlr8dHLZianUB1KxSVBt7HQxW4qbwzMvcG3oCz0=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "02bdd7ed56e02543b2a0435a1b703eaed7065862", "rev": "178f35a496d5367b8c00bc5d5bb69b0425d2bf8d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,33 +7,33 @@ addHandler(logger)
let summaryFile = getEnv("GITHUB_STEP_SUMMARY") let summaryFile = getEnv("GITHUB_STEP_SUMMARY")
type type
StyxContext = object OizysContext = object
flake, host: string flake, host: string
cache = "daylin" cache = "daylin"
nom: bool = true nom: bool = true
proc newCtx(): StyxContext = proc newCtx(): OizysContext =
result = StyxContext() result = OizysContext()
result.flake = getEnv("FLAKE_PATH", getEnv("HOME") / "nixcfg") result.flake = getEnv("FLAKE_PATH", getEnv("HOME") / "oizys")
result.host = getHostname() result.host = getHostname()
proc systemFlakePath(c: StyxContext): string = proc systemFlakePath(c: OizysContext): string =
c.flake & "#nixosConfigurations." & c.host & ".config.system.build.toplevel" c.flake & "#nixosConfigurations." & c.host & ".config.system.build.toplevel"
proc execQuit(cmd: string) = proc execQuit(cmd: string) =
quit (execCmd cmd) quit (execCmd cmd)
proc build(c: StyxContext) = proc build(c: OizysContext) =
## build nixos ## build nixos
let let
cmd = if c.nom: "nom" else: "nix" cmd = if c.nom: "nom" else: "nix"
execQuit cmd & " build " & c.systemFlakePath execQuit cmd & " build " & c.systemFlakePath
proc dry(c: StyxContext) = proc dry(c: OizysContext) =
## poor man's nix flake check ## poor man's nix flake check
execQuit "nix build " & c.systemFlakePath & " --dry-run" execQuit "nix build " & c.systemFlakePath & " --dry-run"
proc cache(c: StyxContext) = proc cache(c: OizysContext) =
# Simple benchmarking # Simple benchmarking
let start = cpuTime() let start = cpuTime()
let code = execCmd """ let code = execCmd """
@ -55,14 +55,14 @@ proc cache(c: StyxContext) =
info "Built host: " & c.host & " in " & $duration & " seconds" info "Built host: " & c.host & " in " & $duration & " seconds"
proc nixosRebuild(c: StyxContext, cmd: string) = proc nixosRebuild(c: OizysContext, cmd: string) =
execQuit "sudo nixos-rebuild " & cmd & " " & " --flake " & c.flake execQuit "sudo nixos-rebuild " & cmd & " " & " --flake " & c.flake
proc boot(c: StyxContext) = proc boot(c: OizysContext) =
## nixos rebuild boot ## nixos rebuild boot
nixosRebuild c, "build" nixosRebuild c, "build"
proc switch(c: StyxContext) = proc switch(c: OizysContext) =
## nixos rebuild switch ## nixos rebuild switch
nixosRebuild c, "switch" nixosRebuild c, "switch"
@ -82,7 +82,7 @@ oizys <cmd> [opts]
-c|--cache > name of cachix binary cache (daylin) -c|--cache > name of cachix binary cache (daylin)
""" """
proc runCmd(c: StyxContext, cmd: string) = proc runCmd(c: OizysContext, cmd: string) =
case cmd: case cmd:
of "dry": dry c of "dry": dry c
of "switch": switch c of "switch": switch c
@ -95,7 +95,7 @@ proc runCmd(c: StyxContext, cmd: string) =
quit 1 quit 1
proc parseFlag(c: var StyxContext, key, val: string) = proc parseFlag(c: var OizysContext, key, val: string) =
case key: case key:
of "help": of "help":
echo usage; quit 0 echo usage; quit 0