daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-09 20:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:fd3175d3a5cf01e3a46c89d765d87c60923478ee
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:130f1a14ca3764a696febdd72bed2b0bac57e2c7
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

1 commit
fd3175d3a5 ... 130f1a14ca

Author SHA1 Message Date
daylin-bot
130f1a14ca flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=92a0dd164e9cc74060b63abae67b0204b6b6074c' (2024-08-29)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=604eb21a7e55d85ec7f6cb8cba39fc4c20a07a9d' (2024-08-29)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/a6292e34000dc93d43bccf78338770c1c5ec8a99' (2024-08-27)
  → 'github:nixos/nixpkgs/4f9cb71da3ec4f76fd406a0d87a1db491eda6870' (2024-08-28)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/9ec93a8a2911b6fafafb8dfd600440124d098528' (2024-08-29)
  → 'github:nix-community/nixpkgs-wayland/e72651a552115c95f06a28fa435717a185c8f37c' (2024-08-29)
• Updated input 'pixi':
    'github:daylinmorgan/pixi-flake/23bc49150a80d3cc5334388488f27c321e3cee2a' (2024-08-26)
  → 'github:daylinmorgan/pixi-flake/e18817720f229f350e4d25eecda3ed24d99b2d53' (2024-08-29)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/004106b4749886ae47894555a904a9a6cba12ead' (2024-08-29)
  → 'github:mitchellh/zig-overlay/e6337aad8505b6991feac3ee3950a0760f98ed0d' (2024-08-30)
 2024-08-30 00:35:34 +00:00
14 changed files with 152 additions and 247 deletions
Show stats Expand all files Collapse all files

7
.github/actions/clean-disk/action.yml vendored
View file

@ -41,19 +41,18 @@ runs:
$(non_manifest_packages) # > /dev/null $(non_manifest_packages) # > /dev/null
fi fi
GLOBIGNORE="/usr/share/git-core/**/*"
sudo rm -rf \ sudo rm -rf \
/var/lib/docker/ \ /var/lib/docker/ \
"$AGENT_TOOLSDIRECTORY" \ "$AGENT_TOOLSDIRECTORY" \
/opt \ /opt \
/usr/local/** & /usr/{local,share} &
# nix flake update wants to find git-core templates
# /usr/share/git-core/templates
# /usr/share/**
{ {
sudo swapoff -a sudo swapoff -a
sudo rm -f /mnt/swapfile sudo rm -f /mnt/swapfile
} & } &
wait wait
echo "... done" echo "... done"

9
.github/workflows/build.yml vendored
View file

@ -6,7 +6,7 @@ on:
hosts: hosts:
description: 'list of hosts to build' description: 'list of hosts to build'
required: true required: true
default: ',othalan,algiz' default: 'othalan algiz'
type: string type: string
lockFile: lockFile:
description: 'flake.lock file' description: 'flake.lock file'
@ -16,7 +16,7 @@ on:
inputs: inputs:
hosts: hosts:
description: 'list of hosts to build' description: 'list of hosts to build'
default: ',othalan,algiz' default: 'othalan algiz'
type: string type: string
# concurrency: # concurrency:
@ -36,7 +36,6 @@ jobs:
with: with:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: | extra-conf: |
experimental-features = pipe-operator
accept-flake-config = true accept-flake-config = true
- uses: DeterminateSystems/magic-nix-cache-action@v7 - uses: DeterminateSystems/magic-nix-cache-action@v7
@ -53,14 +52,14 @@ jobs:
git diff git diff
- name: Pre-build Oizys - name: Pre-build Oizys
run: nix build . --print-build-logs run: nix build .
- name: Build - name: Build
run: | run: |
nix run . \ nix run . \
-- \ -- \
build --minimal \ build --minimal \
--host,="${{ inputs.hosts }}" \ --host "${{ inputs.hosts }}" \
--flake . \ --flake . \
--debug \ --debug \
-- \ -- \

240
flake.lock
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725199881, "lastModified": 1724850097,
"narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", "narHash": "sha256-3BHxvFb3NJzch1X8puRMkVZujOoarQ1llu3ZcwuvsKU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", "rev": "23c7925dd31e79e8c06086ace3edb129a070ac01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725155313, "lastModified": 1724591541,
"narHash": "sha256-Oc9KLFLVU+bNGPh2MHqt0EXwqVgIDN/Ndb89dK+E/z8=", "narHash": "sha256-IYH1Jin/fG98DA39Axdmq+6bR4cxE8V7K8M8gLom40c=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "f1multiviewer-flake", "repo": "f1multiviewer-flake",
"rev": "3cca24a07f71b2c13a079ac60ac9cedfbc0981e7", "rev": "1224c5d814ad2a7c275e860e3d9cf24ca11f7448",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1725465540, "lastModified": 1724967012,
"narHash": "sha256-9OhDjPMwomJbGuIv5mFAvu/AV6ETTVHz08wVP1goNkY=", "narHash": "sha256-Zn5Eq6Elq0SRInPrEYGGoo972JzVxd5zExF7FSuTKlo=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "027140b7315efe3cd2e7b78fa608bd36da839894", "rev": "604eb21a7e55d85ec7f6cb8cba39fc4c20a07a9d",
"revCount": 5184, "revCount": 5157,
"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": 1722636442,
"narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", "narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", "rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +399,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725188252, "lastModified": 1724174162,
"narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "c12ab785ce1982f82594aff03b3104c598186ddd", "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,11 +444,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724966483, "lastModified": 1724863980,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "narHash": "sha256-7Ke9wFRYPUIXwm5ZndGHkWBKj6BsFTkSEXUNXQRHE54=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "rev": "aadf9a27dddd2272ca354ba5a22a0c2d1f919039",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +488,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1725192674, "lastModified": 1724587851,
"narHash": "sha256-xEAVzgkjtdi9b4nl1yHWtiaPqYuvB7pwU9OurXv9Lls=", "narHash": "sha256-+tnTRvR9TzXQDl5OynS+tKBZyPB6viT99zs4fXI0lfk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "3f10d853f98081feec35b736e38da91202a87c3a", "rev": "eda1cdaddc64064f53e65ae614e061010e5fb92f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725389327, "lastModified": 1724864109,
"narHash": "sha256-UtHpRNYPabG0zW3XB8Dldb68O7n1JLSUczTwg37dcsA=", "narHash": "sha256-IjSu5PnS+LFqHfJgueDXrqSBd9/j9GxAbrFK8F1/Z5Y=",
"rev": "72589e703258e5cb4de091390291ff84c3a22bf2", "rev": "a510d1748416ff29b1ed3cab92ac0ad943b6e590",
"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/a510d1748416ff29b1ed3cab92ac0ad943b6e590.tar.gz?rev=a510d1748416ff29b1ed3cab92ac0ad943b6e590"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -540,37 +540,14 @@
}, },
"nim2nix": { "nim2nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_3"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1725469705, "lastModified": 1724878933,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=", "narHash": "sha256-VP0+Lal3jJJqDH1EzQX73rP9Ue8ZTIyAErJvDz6PQSg=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "nim2nix", "repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663", "rev": "5153c772e4c6a4f5645efa85ce536fe1c5063ebb",
"type": "github"
},
"original": {
"owner": "daylinmorgan",
"repo": "nim2nix",
"type": "github"
}
},
"nim2nix_2": {
"inputs": {
"nixpkgs": [
"utils",
"nixpkgs"
]
},
"locked": {
"lastModified": 1725469705,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
"owner": "daylinmorgan",
"repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -583,7 +560,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_6",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@ -629,11 +606,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725161148, "lastModified": 1724576102,
"narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "32058e9138248874773630c846563b1a78ee7a5b", "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,14 +648,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1725358307, "lastModified": 1724664098,
"narHash": "sha256-su/Nzp2X8JlaD9wPYQGXeTilaVa5H06X7A3kqCLJNuo=", "narHash": "sha256-4SgV4jCoN5RffR1Mtn3HI1cjgHmARh+rZrpVlBclj9U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "8a89995f745b1a9029d654c391a0f62ca03f7fe7", "rev": "345dfa06658a37873ca18aa205f409e4aaf1caa6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -689,11 +666,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1724819573,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -705,11 +682,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1725152544, "lastModified": 1724547350,
"narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -723,14 +700,14 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs", "nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1725541051, "lastModified": 1724945629,
"narHash": "sha256-ke/qx3H6K789rijVpnDPD6M/BWqqueWMtXD+nGvqZ1k=", "narHash": "sha256-QE1xfL0VOTOFxMK1PIa17mWzeZL9TrLCkZMt8mt7YnU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "5502df5dcd4157b8195fdf61da29bb560f4bceab", "rev": "e72651a552115c95f06a28fa435717a185c8f37c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -757,27 +734,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725001927, "lastModified": 1724479785,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1725432240,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80", "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,7 +748,39 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": { "nixpkgs_5": {
"locked": {
"lastModified": 1724840184,
"narHash": "sha256-RXftd9nVNpCKHEaiMhAWiZo3U/SEdRPF0zD7s7u50Oc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4f9cb71da3ec4f76fd406a0d87a1db491eda6870",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1723221148, "lastModified": 1723221148,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
@ -803,29 +796,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": {
"locked": {
"lastModified": 1725432240,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1724819573,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -842,11 +819,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": {
@ -866,11 +843,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1725518286, "lastModified": 1724859070,
"narHash": "sha256-Ki6GmGryNQB8u/DpqdorJ1xysKsdC0u7HKImZ9b+oQk=", "narHash": "sha256-/jeh/OJm5+gmg+dQxpWetL9jgjk+zGe7uCRLvbNvukA=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "6cec54487278f9b271ae4b65260d735a331e5685", "rev": "479feca39618a58770db68b44072be1f29df8d84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -890,7 +867,7 @@
"nim2nix": "nim2nix", "nim2nix": "nim2nix",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"pixi": "pixi", "pixi": "pixi",
"roc": "roc", "roc": "roc",
@ -1093,15 +1070,16 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"nim2nix": "nim2nix_2", "nixpkgs": [
"nixpkgs": "nixpkgs_7" "nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1725474427, "lastModified": 1724782685,
"narHash": "sha256-xxsSqw22akPxbUyakThoBwZI0DuO/OkvigAX6zZFEeg=", "narHash": "sha256-/gzaaWVqXbnj78pNC7cOW/MDZidO127v9QRpAyBgczU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b04a01afc3e79758a2ca337decd23bf51ad101a2", "rev": "5289c14095ec7fe0676a0dd3c3084ead095da1a5",
"revCount": 10, "revCount": 6,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/utils.git" "url": "https://git.dayl.in/daylin/utils.git"
}, },
@ -1127,11 +1105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725203932, "lastModified": 1724073926,
"narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1149,11 +1127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725538257, "lastModified": 1724977621,
"narHash": "sha256-J8UYDbHm8zSU+MruQ0VGEFL7eOJUkYsi7O4rCc0EcCk=", "narHash": "sha256-DJwuCaUjctq2mAN+MOJWWGUP49Q1TLny8rQJbD9nCtM=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "5848c57bc396697ae4ed69f5e1295fe655c3ffae", "rev": "e6337aad8505b6991feac3ee3950a0760f98ed0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1174,11 +1152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725202623, "lastModified": 1724341248,
"narHash": "sha256-+UdfnVQIMYEBNN5lVK/Pn6fs2YMohP+f/4XAU7qTTHo=", "narHash": "sha256-4f2BhcZxhBpTRCNa16n1DsLvsmOynRwqqJxp1YdGoGM=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "ace6f6da90a4420cd6632363b30762e577e2b922", "rev": "b481aaeac81ffccffb0ce5cf2f05310f3661c6b2",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -4,7 +4,7 @@
outputs = inputs: (import ./lib inputs).oizysFlake; outputs = inputs: (import ./lib inputs).oizysFlake;
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
stable.url = "github:nixos/nixpkgs/nixos-23.11"; stable.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
@ -33,13 +33,13 @@
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
utils.url = "git+https://git.dayl.in/daylin/utils.git"; utils.url = "git+https://git.dayl.in/daylin/utils.git";
nim2nix.inputs.nixpkgs.follows = "nixpkgs";
hyprman.inputs.nixpkgs.follows = "nixpkgs"; hyprman.inputs.nixpkgs.follows = "nixpkgs";
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
pixi.inputs.nixpkgs.follows = "nixpkgs"; pixi.inputs.nixpkgs.follows = "nixpkgs";
roc.inputs.nixpkgs.follows = "nixpkgs"; roc.inputs.nixpkgs.follows = "nixpkgs";
tsm.inputs.nixpkgs.follows = "nixpkgs"; tsm.inputs.nixpkgs.follows = "nixpkgs";
utils.inputs.nixpkgs.follows = "nixpkgs";
zls.inputs.nixpkgs.follows = "nixpkgs"; zls.inputs.nixpkgs.follows = "nixpkgs";
zls.inputs.zig-overlay.follows = "zig-overlay"; zls.inputs.zig-overlay.follows = "zig-overlay";
zig-overlay.inputs.nixpkgs.follows = "nixpkgs"; zig-overlay.inputs.nixpkgs.follows = "nixpkgs";

1
hosts/othalan/pkgs.nix
View file

@ -8,6 +8,5 @@
cachix cachix
graphviz graphviz
typst typst
charm-freeze
]); ]);
} }

20
lib/default.nix
View file

@ -9,20 +9,10 @@ let
inherit (import ./generators.nix { inherit lib self inputs; }) mkIso mkSystem; inherit (import ./generators.nix { inherit lib self inputs; }) mkIso mkSystem;
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
supportedSystems = [ "x86_64-linux" ]; supportedSystems = [ "x86_64-linux" ];
forAllSystems = forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs {
f:
genAttrs supportedSystems (
system:
f (
import nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [inputs.nim2nix.overlays.default];
inputs.nim2nix.overlays.default }));
(import ../overlays/nimble { inherit inputs; })
];
}
)
);
inheritFlakePkgs = inheritFlakePkgs =
pkgs: flakes: pkgs: flakes:
@ -39,9 +29,9 @@ let
packages = forAllSystems ( packages = forAllSystems (
pkgs: pkgs:
rec { rec {
default = oizys-nim; default = oizys-cli;
oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { }; oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { };
oizys-go = pkgs.callPackage ../pkgs/oizys { }; oizys-cli = pkgs.callPackage ../pkgs/oizys { };
iso = mkIso.config.system.build.isoImage; iso = mkIso.config.system.build.isoImage;
roc = (pkgsFromSystem pkgs.system "roc").full; roc = (pkgsFromSystem pkgs.system "roc").full;
} }

2
lib/generators.nix
View file

@ -49,8 +49,8 @@ let
nixosSystem { nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
../overlays
../modules/oizys.nix ../modules/oizys.nix
../overlays
inputs.lix-module.nixosModules.default inputs.lix-module.nixosModules.default
inputs.hyprland.nixosModules.default inputs.hyprland.nixosModules.default
] ++ (hostFiles hostName); ] ++ (hostFiles hostName);

2
pkgs/oizys-nim/default.nix
View file

@ -8,5 +8,5 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-KErXGNNU5VVBHcvBmBhbagxZabHzajY5dF2OLHPmWf8="; nimbleDepsHash = "sha256-Eheeve4MbB3v1oVj0mB36Mv2Q3vJGLEbbShds1af23g=";
} }

17
pkgs/oizys-nim/src/oizys.nim
View file

@ -33,16 +33,16 @@ overlay:
echo nixosConfigAttrs().join(" ") echo nixosConfigAttrs().join(" ")
proc update(yes: bool = false) = proc update(yes: bool = false) =
## *TBI* update and run nixos-rebuild ## *TBD* update and run nixos-rebuild
fatal "not implemented" fatal "not implemented"
proc build(minimal: bool = false) = proc build(minimal: bool = false) =
## nix build ## nix build
nixBuild(minimal, rest) nixBuild(minimal, rest)
proc cache(minimal: bool = false, name: string = "daylin") = proc cache(name: string = "daylin") =
## build and push to cachix ## *TBD* build and push to cachix
nixBuildWithCache(minimal, name, rest) fatal "not implemented"
proc osCmd() = proc osCmd() =
## nixos-rebuild ## nixos-rebuild
@ -52,11 +52,12 @@ overlay:
error ( error (
&"unknown nixos-rebuild subcmd: {subcmd}\nexpected one of: \n" & &"unknown nixos-rebuild subcmd: {subcmd}\nexpected one of: \n" &
nixosSubcmds.mapIt(" " & it).join("\n") nixosSubcmds.mapIt(" " & it).join("\n")
); quit QuitFailure )
quit QuitFailure
nixosRebuild(subcmd, rest[1..^1]) nixosRebuild(subcmd, rest[1..^1])
proc ci(`ref`: string = "main") = proc ci(`ref`: string = "main") =
## trigger GHA update flow ## *TBD* trigger GHA update flow
if rest.len == 0: if rest.len == 0:
fatal "expected workflow file name"; quit QuitFailure fatal "expected workflow file name"; quit QuitFailure
createDispatch(rest[0], `ref`) createDispatch(rest[0], `ref`)
@ -66,7 +67,7 @@ proc checkExes() =
quit("oizys requires nix", QuitFailure) quit("oizys requires nix", QuitFailure)
proc `//`(t1: Table[string, string], t2: Table[string, string]): Table[string, string] = proc `//`(t1: Table[string, string], t2: Table[string, string]): Table[string, string] =
# nix style shallow table merge # nix style table merge
for k, v in t1.pairs(): result[k] = v for k, v in t1.pairs(): result[k] = v
for k, v in t2.pairs(): result[k] = v for k, v in t2.pairs(): result[k] = v
@ -85,7 +86,7 @@ proc setupCligen() =
clCfg.helpAttrOff = {"cmd": "\e[m", "clDescrip": "\e[m", "clDflVal": "\e[m", clCfg.helpAttrOff = {"cmd": "\e[m", "clDescrip": "\e[m", "clDflVal": "\e[m",
"clOptKeys": "\e[m", "clValType": "\e[m", "args": "\e[m"}.toTable() "clOptKeys": "\e[m", "clValType": "\e[m", "args": "\e[m"}.toTable()
# clCfg.use does nothing? # clCfg.use does nothing?
clCfg.useHdr = "\e[1musage\e[m:\n " clCfg.useHdr = "\e[1mUsage\e[m:\n "
when isMainModule: when isMainModule:
checkExes() checkExes()

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

@ -6,7 +6,7 @@ import std/[
import ./spin import ./spin
func addArgs*(cmd: var string, args: openArray[string]) = func addArgs*(cmd: var string, args: seq[string]) =
cmd &= " " & args.join(" ") cmd &= " " & args.join(" ")
func addArg*(cmd: var string, arg: string) = func addArg*(cmd: var string, arg: string) =
@ -18,38 +18,13 @@ proc runCmd*(cmd: string): int =
proc runCmdCapt*(cmd: string): tuple[stdout, stderr: string, exitCode: int] = proc runCmdCapt*(cmd: string): tuple[stdout, stderr: string, exitCode: int] =
let args = cmd.splitWhitespace() let args = cmd.splitWhitespace()
let p = startProcess( let p = startProcess(args[0], args = args[1..^1], options = {poUsePath})
args[0], result = (
args = args[1..^1], readAll p.outputStream,
options = {poUsePath} readAll p.errorStream,
waitForExit p
) )
let outstrm = outputStream p
let errstrm = errorStream p
# result.exitCode = -1
# var line: string
# var cnt: int
# while true:
# echo cnt
# if outstrm.readLine(line):
# result.stdout.add line & '\n'
# if errstrm.readLine(line):
# result.stderr.add line & '\n'
# result.exitCode = peekExitCode(p)
# if result.exitCode != -1: break
# inc cnt
echo "process should have started?"
echo p.running, "<--running?"
p.resume
# result = (
# readAll outstrm,
# readAll errstrm,
# -1,
# )
echo "is this not reached?"
echo result
close p close p
# result.exitCode = waitForExit p
# close p
proc runCmdCaptWithSpinner*(cmd: string, msg: string = ""): tuple[output, err: string] = proc runCmdCaptWithSpinner*(cmd: string, msg: string = ""): tuple[output, err: string] =
debug fmt"running command: {cmd}" debug fmt"running command: {cmd}"

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

@ -19,11 +19,9 @@ proc postGhApi(url: string, body: JsonNode) =
"Authorization" : fmt"Bearer {ghToken}", "Authorization" : fmt"Bearer {ghToken}",
"X-GitHub-Api-Version": "2022-11-28", "X-GitHub-Api-Version": "2022-11-28",
}) })
echo $body
let response = client.post(url, body = $body) let response = client.post(url, body = $body)
try: info fmt"Status: {response.status}"
info fmt"Status: {response.code}"
except:
error "failed to get response code"
proc createDispatch*(workflowFileName: string, `ref`: string) = proc createDispatch*(workflowFileName: string, `ref`: string) =
## https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event ## https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event

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

@ -38,7 +38,7 @@ const defaultFlushThreshold = lvlAll
proc genFmtStr( proc genFmtStr(
fmtPrefix, fmtSep, fmtSuffix, levelBb: string, fmtPrefix, fmtSep, fmtSuffix, levelBb: string,
level: Level level: Level
): string = ): string =
var parts: seq[string] var parts: seq[string]
if fmtPrefix != "": parts.add fmtPrefix if fmtPrefix != "": parts.add fmtPrefix
parts.add $LevelNames[level].bb(levelBb) parts.add $LevelNames[level].bb(levelBb)
@ -58,8 +58,8 @@ proc newFancyConsoleLogger*(
warnBb: string = "bold yellow", warnBb: string = "bold yellow",
errorBb: string = "bold red", errorBb: string = "bold red",
fatalBb: string = "bold red" fatalBb: string = "bold red"
): FancyConsoleLogger = ): FancyConsoleLogger =
## Creates a new `FancyConsoleLogger<#ConsoleLogger>`_. ## Creates a new `ColoredConsoleLogger<#ConsoleLogger>`_.
new result new result
let fmtStrs: array[Level, string] = [ let fmtStrs: array[Level, string] = [
genFmtStr(fmtPrefix,fmtSep, fmtSuffix, "", lvlAll), genFmtStr(fmtPrefix,fmtSep, fmtSuffix, "", lvlAll),

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

@ -53,7 +53,6 @@ proc cmpDrv(x, y: Derivation): int =
cmp(x.name, y.name) cmp(x.name, y.name)
proc parseDryRunOutput(err: string): DryRunOutput = proc parseDryRunOutput(err: string): DryRunOutput =
debug "parsing result of dry run"
let lines = err.strip().splitLines() let lines = err.strip().splitLines()
let theseLines = collect: let theseLines = collect:
for i, line in enumerate(lines): for i, line in enumerate(lines):
@ -67,11 +66,11 @@ proc parseDryRunOutput(err: string): DryRunOutput =
of 1: of 1:
let idx = theseLines[0] let idx = theseLines[0]
let line = lines[idx] let line = lines[idx]
let drvs = lines[idx + 1 .. ^1].toDerivations() let drvs = lines[idx .. ^1].toDerivations()
if line.contains("built:"): if line.contains("built:"):
result.toBuild = drvs result.toBuild = drvs
elif line.contains("will be fetched"): elif line.contains("will be fetched"):
result.toFetch = drvs result.toFetch =drvs
else: else:
fatal "expected on of the lines to contain built or fetched check the output below" fatal "expected on of the lines to contain built or fetched check the output below"
stderr.writeLine err stderr.writeLine err
@ -110,8 +109,7 @@ 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(cmd, "running dry run build for: " & getHosts().join(" ")) let (_, err) = runCmdCaptWithSpinner(cmd, "running dry run build for: " & getHosts().join(" "))
let (_, err, _) = runCmdCapt(cmd)
let output = parseDryRunOutput err let output = parseDryRunOutput err
return output.toBuild.mapIt(it.storePath) return output.toBuild.mapIt(it.storePath)
@ -205,12 +203,10 @@ proc nixBuildHostDry*(minimal: bool, rest: seq[string]) =
quit "exiting...", QuitSuccess quit "exiting...", QuitSuccess
cmd.addArgs drvs cmd.addArgs drvs
cmd.addArg "--no-link" cmd.addArg "--no-link"
if isCi(): if isCi():
writeDervationsToStepSummary drvs writeDervationsToStepSummary drvs
else: else:
cmd.addArgs nixosConfigAttrs() cmd.addArgs nixosConfigAttrs()
cmd.addArg "--dry-run" cmd.addArg "--dry-run"
cmd.addArgs rest cmd.addArgs rest
let (_, err) = let (_, err) =
@ -218,33 +214,4 @@ proc nixBuildHostDry*(minimal: bool, rest: seq[string]) =
let output = parseDryRunOutput err let output = parseDryRunOutput err
display output display output
# TODO: Add to bbansi
template `bbfmt`(pattern: static string): untyped =
bb(fmt(pattern))
proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) =
if findExe("cachix") == "":
fatal "is cachix installed?"; quit QuitFailure
info bbfmt"building and pushing to cache: [b]{name}"
var cmd = "cachix"
cmd.addArgs ["watch-exec","--"]
cmd.addArg "nix build"
if minimal:
debug "populating args with derivations not built/cached"
let drvs = systemPathDrvsToBuild()
if drvs.len == 0:
info "nothing to build"
quit "exiting...", QuitSuccess
cmd.addArgs drvs
cmd.addArg "--no-link"
else:
cmd.addArgs nixosConfigAttrs()
cmd.addArgs rest
let err = runCmd(cmd)
quit err

3
todo.md
View file

@ -3,11 +3,9 @@
## oizys ## oizys
- [ ] write a flake template that includes the systems boilerplate - [ ] write a flake template that includes the systems boilerplate
- [ ] include all of the defined overlays from `./overlays` in the `forAllSystems` nixpkgs
## software ## software
- [ ] check if there are multiple version of mako?
- [ ] lid closed does not engage hyprlock? - [ ] lid closed does not engage hyprlock?
> check the logind conf in Nixos > check the logind conf in Nixos
- [ ] include langservers for enabled languages? - [ ] include langservers for enabled languages?
@ -16,6 +14,7 @@
[tracking issue](https://github.com/wez/wezterm/issues/5990) [tracking issue](https://github.com/wez/wezterm/issues/5990)
## hardware ## hardware
- [ ] monitor the presence of these kernel messages on `othalan`, - [ ] monitor the presence of these kernel messages on `othalan`,