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

Compare commits

base: daylin:0af0462bd6795b443b30bd52595f46d84afdbfed
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:3191780ea79cbe7d08b0d079bf7ae473fd4af7dd
Branches Tags
daylin:flake-lock
daylin:main

1 commit
0af0462bd6 ... 3191780ea7

Author SHA1 Message Date
daylin-bot
3191780ea7 flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=9b54342baa27d8de0460e1103ec4c3cc65592ed8' (2024-09-03)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=727f1b54cd1ba48774092a5d54acc0e55f3ffe0f' (2024-09-05)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/ae618eafa81b596db034c5df1d75d4eddf785824' (2024-09-02)
  → 'github:hyprwm/contrib/1e531dc49ad36c88b45bf836081a7a2c8927e072' (2024-09-05)
• Updated input 'lix':
    '02eb07cfd5.tar.gz?narHash=sha256-QBXwqyPuHUKBiuyzHBxqH/MpjPY9DQiY2M81P2t6b/0%3D&rev=02eb07cfd539c34c080cb1baf042e5e780c1fcc2' (2024-09-01)
  → '72589e7032.tar.gz?narHash=sha256-UtHpRNYPabG0zW3XB8Dldb68O7n1JLSUczTwg37dcsA%3D&rev=72589e703258e5cb4de091390291ff84c3a22bf2' (2024-09-03)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31)
  → 'github:nixos/nixpkgs/ad416d066ca1222956472ab7d0555a6946746a80' (2024-09-04)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/52b72b12c456a5c0c87c40941ef79335e8d61104' (2024-09-02)
  → 'github:nix-community/nixpkgs-wayland/5502df5dcd4157b8195fdf61da29bb560f4bceab' (2024-09-05)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2' (2024-08-28)
  → 'github:nixos/nixpkgs/ad416d066ca1222956472ab7d0555a6946746a80' (2024-09-04)
• Updated input 'pixi':
    'github:daylinmorgan/pixi-flake/e18817720f229f350e4d25eecda3ed24d99b2d53' (2024-08-29)
  → 'github:daylinmorgan/pixi-flake/820ce16a1a39c469628d8ccea077827779496bda' (2024-09-04)
• Updated input 'roc':
    'github:roc-lang/roc/c80eede300f1d48a307c4e5ace4fe13cbfc98c60' (2024-09-03)
  → 'github:roc-lang/roc/640bd15ca1dcf82bebe6a357e1a384b3ffdd4658' (2024-09-05)
• Updated input 'tsm':
    'github:daylinmorgan/tsm/7fb9a2d6b4005a614cb19c7f376551252ddf1f14?dir=nix' (2024-08-16)
  → 'github:daylinmorgan/tsm/15e5cf6933a319503697f53d287e817fcafe7949?dir=nix' (2024-09-05)
• Added input 'tsm/nim2nix':
    'github:daylinmorgan/nim2nix/42af12ca45025c7146bc24e27f5d8b65b003d663' (2024-09-04)
• Added input 'tsm/nim2nix/nixpkgs':
    'github:nixos/nixpkgs/d0e1602ddde669d5beb01aec49d71a51937ed7be' (2024-08-24)
• Updated input 'utils':
    'git+https://git.dayl.in/daylin/utils.git?ref=refs/heads/main&rev=03069333f260e50940eb4007cf15862bf23ab98e' (2024-09-03)
  → 'git+https://git.dayl.in/daylin/utils.git?ref=refs/heads/main&rev=1032b97146ff7ef74df06e5e3babdde244c08280' (2024-09-05)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/fb3b6628ebf2e0c8e4e346d5ed1de5fce60ece07' (2024-09-03)
  → 'github:mitchellh/zig-overlay/5848c57bc396697ae4ed69f5e1295fe655c3ffae' (2024-09-05)
 2024-09-05 19:10:43 +00:00
3 changed files with 15 additions and 19 deletions
Show stats Expand all files Collapse all files

20
flake.lock
View file

@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1725580992, "lastModified": 1725563063,
"narHash": "sha256-0g6lzfyIcRaHlDuiWTVy9ZGWtIhIpdqHUTTGtAVR+4Q=", "narHash": "sha256-tnBDplJLVDCfQyU8QV/WMlKXWqdburHmC3tp2XZmhtA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b0fca6eaf00a2c5061f499c76ec8d60772b6a719", "rev": "727f1b54cd1ba48774092a5d54acc0e55f3ffe0f",
"revCount": 5191, "revCount": 5188,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -744,11 +744,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1725578788, "lastModified": 1725541051,
"narHash": "sha256-026yfXvGxjLepPGOLzk+Vr4R4kxdAlxXeozKsuCMNi4=", "narHash": "sha256-ke/qx3H6K789rijVpnDPD6M/BWqqueWMtXD+nGvqZ1k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "1ac87697588396d1d5cbdcffa075ca7f1a73cdc9", "rev": "5502df5dcd4157b8195fdf61da29bb560f4bceab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1184,11 +1184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725582447, "lastModified": 1725538257,
"narHash": "sha256-h/CNQeQNw6dy5Vg5Nq23GqWpGWmEZIskTHBcdzgQlig=", "narHash": "sha256-J8UYDbHm8zSU+MruQ0VGEFL7eOJUkYsi7O4rCc0EcCk=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "9e2cc0e99621be1b765dc95a8ec80740a685b660", "rev": "5848c57bc396697ae4ed69f5e1295fe655c3ffae",
"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

13
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)
@ -123,12 +120,12 @@ type
inputDrvs: Table[string, JsonNode] inputDrvs: Table[string, JsonNode]
name: string name: string
proc evaluateDerivations(drvs: seq[string]): Table[string, NixDerivation] = proc evaluateDerivations(drvs: seq[string]): Table[string,NixDerivation] =
var cmd = "nix derivation show -r" var cmd = "nix derivation show -r"
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