mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-09 08:13:14 -06:00
Compare commits
4 commits
3191780ea7
...
0af0462bd6
Author | SHA1 | Date | |
---|---|---|---|
0af0462bd6 | |||
86b1d94995 | |||
7cf34d6df8 | |||
1fcd741bfa |
3 changed files with 19 additions and 15 deletions
20
flake.lock
20
flake.lock
|
@ -323,11 +323,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725563063,
|
||||
"narHash": "sha256-tnBDplJLVDCfQyU8QV/WMlKXWqdburHmC3tp2XZmhtA=",
|
||||
"lastModified": 1725580992,
|
||||
"narHash": "sha256-0g6lzfyIcRaHlDuiWTVy9ZGWtIhIpdqHUTTGtAVR+4Q=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "727f1b54cd1ba48774092a5d54acc0e55f3ffe0f",
|
||||
"revCount": 5188,
|
||||
"rev": "b0fca6eaf00a2c5061f499c76ec8d60772b6a719",
|
||||
"revCount": 5191,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
@ -744,11 +744,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725541051,
|
||||
"narHash": "sha256-ke/qx3H6K789rijVpnDPD6M/BWqqueWMtXD+nGvqZ1k=",
|
||||
"lastModified": 1725578788,
|
||||
"narHash": "sha256-026yfXvGxjLepPGOLzk+Vr4R4kxdAlxXeozKsuCMNi4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "5502df5dcd4157b8195fdf61da29bb560f4bceab",
|
||||
"rev": "1ac87697588396d1d5cbdcffa075ca7f1a73cdc9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1184,11 +1184,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725538257,
|
||||
"narHash": "sha256-J8UYDbHm8zSU+MruQ0VGEFL7eOJUkYsi7O4rCc0EcCk=",
|
||||
"lastModified": 1725582447,
|
||||
"narHash": "sha256-h/CNQeQNw6dy5Vg5Nq23GqWpGWmEZIskTHBcdzgQlig=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "5848c57bc396697ae4ed69f5e1295fe655c3ffae",
|
||||
"rev": "9e2cc0e99621be1b765dc95a8ec80740a685b660",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -15,6 +15,7 @@ mkOizysModule config "hyprland" {
|
|||
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
wl-mirror
|
||||
wlr-randr
|
||||
kanshi
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import std/[
|
||||
algorithm, json,
|
||||
enumerate, os, osproc, sequtils, strformat,
|
||||
enumerate, os, sequtils, strformat,
|
||||
strutils, sugar, logging, tables
|
||||
]
|
||||
import bbansi, jsony
|
||||
|
@ -110,8 +110,11 @@ proc toBuildNixosConfiguration(): seq[string] =
|
|||
var cmd = nixCommand("build")
|
||||
cmd.addArg "--dry-run"
|
||||
cmd.addArgs nixosConfigAttrs()
|
||||
# let (_, err) = runCmdCaptWithSpinner(cmd, "running dry run build for: " & getHosts().join(" "))
|
||||
let (_, err, _) = runCmdCapt(cmd, {CaptStderr})
|
||||
let (_, err) = runCmdCaptWithSpinner(
|
||||
cmd,
|
||||
"running dry run build for: " & getHosts().join(" "),
|
||||
capture ={CaptStderr}
|
||||
)
|
||||
let output = parseDryRunOutput err
|
||||
return output.toBuild.mapIt(it.storePath)
|
||||
|
||||
|
@ -120,12 +123,12 @@ type
|
|||
inputDrvs: Table[string, JsonNode]
|
||||
name: string
|
||||
|
||||
proc evaluateDerivations(drvs: seq[string]): Table[string,NixDerivation] =
|
||||
proc evaluateDerivations(drvs: seq[string]): Table[string, NixDerivation] =
|
||||
var cmd = "nix derivation show -r"
|
||||
cmd.addArgs drvs
|
||||
let (output, _) =
|
||||
runCmdCaptWithSpinner(cmd, "evaluating derivations")
|
||||
output.fromJson(Table[string,NixDerivation])
|
||||
fromJson(output, Table[string,NixDerivation])
|
||||
|
||||
|
||||
# TODO: replace asserts in this proc
|
||||
|
|
Loading…
Reference in a new issue