daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-24 07:50:43 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:86b1d94995ffc10443b823ae2c7dc0e3473bdb72
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:cd105ae69a7470af3ee5406e3573541963c58be3
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "86b1d94995ffc10443b823ae2c7dc0e3473bdb72" and "cd105ae69a7470af3ee5406e3573541963c58be3" have entirely different histories.
86b1d94995 ... cd105ae69a

5 changed files with 46 additions and 93 deletions
Show stats Expand all files Collapse all files

111
flake.lock
View file

@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1725563063, "lastModified": 1725367654,
"narHash": "sha256-tnBDplJLVDCfQyU8QV/WMlKXWqdburHmC3tp2XZmhtA=", "narHash": "sha256-1hiNRCEdSZLfyH2y06S+gqUbiSwbwdktStPSJuPesaM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "727f1b54cd1ba48774092a5d54acc0e55f3ffe0f", "rev": "9b54342baa27d8de0460e1103ec4c3cc65592ed8",
"revCount": 5188, "revCount": 5182,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -343,11 +343,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1725551787, "lastModified": 1725276753,
"narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", "narHash": "sha256-kcV2M7xIoQvLRIrMndysM4E0d2zGSwIDejamT4LKnDg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", "rev": "ae618eafa81b596db034c5df1d75d4eddf785824",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725389327, "lastModified": 1725228396,
"narHash": "sha256-UtHpRNYPabG0zW3XB8Dldb68O7n1JLSUczTwg37dcsA=", "narHash": "sha256-QBXwqyPuHUKBiuyzHBxqH/MpjPY9DQiY2M81P2t6b/0=",
"rev": "72589e703258e5cb4de091390291ff84c3a22bf2", "rev": "02eb07cfd539c34c080cb1baf042e5e780c1fcc2",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/72589e703258e5cb4de091390291ff84c3a22bf2.tar.gz?rev=72589e703258e5cb4de091390291ff84c3a22bf2" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/02eb07cfd539c34c080cb1baf042e5e780c1fcc2.tar.gz?rev=02eb07cfd539c34c080cb1baf042e5e780c1fcc2"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -559,24 +559,6 @@
} }
}, },
"nim2nix_2": { "nim2nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1725469705,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
"owner": "daylinmorgan",
"repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
"type": "github"
},
"original": {
"owner": "daylinmorgan",
"repo": "nim2nix",
"type": "github"
}
},
"nim2nix_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"utils", "utils",
@ -744,11 +726,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1725541051, "lastModified": 1725292436,
"narHash": "sha256-ke/qx3H6K789rijVpnDPD6M/BWqqueWMtXD+nGvqZ1k=", "narHash": "sha256-AeRcvPq2SLjpLP1cXe5SjFUmwuO5BY4bskRcrxRZtJU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "5502df5dcd4157b8195fdf61da29bb560f4bceab", "rev": "52b72b12c456a5c0c87c40941ef79335e8d61104",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +773,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1725432240, "lastModified": 1725103162,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80", "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +805,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1725432240, "lastModified": 1724819573,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80", "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,22 +820,6 @@
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": {
"lastModified": 1724479785,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
@ -876,11 +842,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725471169, "lastModified": 1724941407,
"narHash": "sha256-PF5uVWJ9SDviht5rugMp2I8U8D0KTtPVO5TIC+XxWc0=", "narHash": "sha256-LUwXnxjTEf4wkcqsgLlIlZo5CE7RBY/fLGHiZsxAl7s=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "pixi-flake", "repo": "pixi-flake",
"rev": "820ce16a1a39c469628d8ccea077827779496bda", "rev": "e18817720f229f350e4d25eecda3ed24d99b2d53",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +866,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1725557788, "lastModified": 1725368588,
"narHash": "sha256-mPw63Fk1veQx18OVQijlvKbxxXF1uzI8N+0pF/tDnqE=", "narHash": "sha256-NVHYkh9rzIz9fc33gDFN7iQnHxG4m1v8NuLXZWUBVK8=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "640bd15ca1dcf82bebe6a357e1a384b3ffdd4658", "rev": "c80eede300f1d48a307c4e5ace4fe13cbfc98c60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1105,18 +1071,17 @@
}, },
"tsm": { "tsm": {
"inputs": { "inputs": {
"nim2nix": "nim2nix_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1725560270, "lastModified": 1723828016,
"narHash": "sha256-daF97eJRmjyGMr/sz+Bdd5ZbPvoLKS2p4edoh35jzto=", "narHash": "sha256-s47lZE4T59+ohZpa5TqS1wKyTDYJOYO6yc7lM9giDJQ=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "tsm", "repo": "tsm",
"rev": "15e5cf6933a319503697f53d287e817fcafe7949", "rev": "7fb9a2d6b4005a614cb19c7f376551252ddf1f14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1128,15 +1093,15 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"nim2nix": "nim2nix_3", "nim2nix": "nim2nix_2",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1725558444, "lastModified": 1725378965,
"narHash": "sha256-ahxree7yZD9YuOUG0Z3R0qQjkGL+ZrgiKVcXa8kSNBo=", "narHash": "sha256-jr/X/wHOeEgqxTNjZ8naZB9JI4sEDXdj4SRekBYFCNg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "1032b97146ff7ef74df06e5e3babdde244c08280", "rev": "03069333f260e50940eb4007cf15862bf23ab98e",
"revCount": 11, "revCount": 9,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/utils.git" "url": "https://git.dayl.in/daylin/utils.git"
}, },
@ -1184,11 +1149,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725538257, "lastModified": 1725365439,
"narHash": "sha256-J8UYDbHm8zSU+MruQ0VGEFL7eOJUkYsi7O4rCc0EcCk=", "narHash": "sha256-PlGdaX3A9kndMxrwHW2QRd8SyE6mxheIgd81tqLV8HQ=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "5848c57bc396697ae4ed69f5e1295fe655c3ffae", "rev": "fb3b6628ebf2e0c8e4e346d5ed1de5fce60ece07",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
modules/desktop/window-managers/hyprland.nix
View file

@ -15,7 +15,6 @@ mkOizysModule config "hyprland" {
environment.systemPackages = environment.systemPackages =
(with pkgs; [ (with pkgs; [
wl-mirror
wlr-randr wlr-randr
kanshi kanshi

6
pkgs/oizys-nim/src/oizys/exec.nim
View file

@ -53,11 +53,7 @@ proc runCmdCapt*(
# close p # close p
close p close p
proc runCmdCaptWithSpinner*( proc runCmdCaptWithSpinner*(cmd: string, msg: string = "", capture: set[CaptureGrp] = {CaptStdout}): tuple[output, err: string] =
cmd: string,
msg: string = "",
capture: set[CaptureGrp] = {CaptStdout}
): tuple[output, err: string] =
withSpinner(msg): withSpinner(msg):
let (output, err, code) = runCmdCapt(cmd, capture) let (output, err, code) = runCmdCapt(cmd, capture)
if code != 0: if code != 0:

11
pkgs/oizys-nim/src/oizys/nix.nim
View file

@ -1,6 +1,6 @@
import std/[ import std/[
algorithm, json, algorithm, json,
enumerate, os, sequtils, strformat, enumerate, os, osproc, sequtils, strformat,
strutils, sugar, logging, tables strutils, sugar, logging, tables
] ]
import bbansi, jsony import bbansi, jsony
@ -110,11 +110,8 @@ proc toBuildNixosConfiguration(): seq[string] =
var cmd = nixCommand("build") var cmd = nixCommand("build")
cmd.addArg "--dry-run" cmd.addArg "--dry-run"
cmd.addArgs nixosConfigAttrs() cmd.addArgs nixosConfigAttrs()
let (_, err) = runCmdCaptWithSpinner( # let (_, err) = runCmdCaptWithSpinner(cmd, "running dry run build for: " & getHosts().join(" "))
cmd, let (_, err, _) = runCmdCapt(cmd, {CaptStderr})
"running dry run build for: " & getHosts().join(" "),
capture ={CaptStderr}
)
let output = parseDryRunOutput err let output = parseDryRunOutput err
return output.toBuild.mapIt(it.storePath) return output.toBuild.mapIt(it.storePath)
@ -128,7 +125,7 @@ proc evaluateDerivations(drvs: seq[string]): Table[string, NixDerivation] =
cmd.addArgs drvs cmd.addArgs drvs
let (output, _) = let (output, _) =
runCmdCaptWithSpinner(cmd, "evaluating derivations") runCmdCaptWithSpinner(cmd, "evaluating derivations")
fromJson(output, Table[string,NixDerivation]) output.fromJson(Table[string,NixDerivation])
# TODO: replace asserts in this proc # TODO: replace asserts in this proc

4
pkgs/oizys-nim/src/oizys/spin.nim
View file

@ -179,12 +179,8 @@ proc error*(spinny: Spinny, msg: string) =
template withSpinner*(msg: string = "", body: untyped): untyped = template withSpinner*(msg: string = "", body: untyped): untyped =
var spinner {.inject.} = newSpinny(msg, Dots) var spinner {.inject.} = newSpinny(msg, Dots)
spinner.setSymbolColor(fgBlue) spinner.setSymbolColor(fgBlue)
if isatty(stdout): # don't spin if it's not a tty
start spinner start spinner
body body
if isatty(stdout):
stop spinner stop spinner
template withSpinner*(body: untyped): untyped = template withSpinner*(body: untyped): untyped =