mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-05 09:14:17 -06:00
Compare commits
5 commits
155661be6c
...
2ec4ecc90e
Author | SHA1 | Date | |
---|---|---|---|
2ec4ecc90e | |||
54f55b3cb2 | |||
646591f05a | |||
a9a4f2269b | |||
7e1d8829ce |
4 changed files with 33 additions and 36 deletions
11
.github/workflows/update.yml
vendored
11
.github/workflows/update.yml
vendored
|
@ -12,6 +12,11 @@ on:
|
|||
description: "list of nix flake inputs"
|
||||
default: ""
|
||||
type: "string"
|
||||
extraArgs:
|
||||
description: "postional args forwared to nix"
|
||||
default: ""
|
||||
type: string
|
||||
|
||||
|
||||
# schedule:
|
||||
# # At minute 00:00 on Monday, Wednesday, and Friday.
|
||||
|
@ -20,6 +25,7 @@ on:
|
|||
env:
|
||||
hosts: ${{ github.event_name == 'schedule' && 'othalan,algiz' || github.event.inputs.hosts }}
|
||||
flake-inputs: ${{ github.event_name == 'schedule' && '' || github.event.inputs.flake-inputs }}
|
||||
extraArgs: ${{ github.event_name == 'schedule' && '' || github.event.inputs.extraArgs }}
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
@ -63,7 +69,8 @@ jobs:
|
|||
--flake .
|
||||
-vv
|
||||
--
|
||||
--quiet
|
||||
${{ env.extraArgs }}
|
||||
|
||||
|
||||
- name: Commit Updates
|
||||
uses: daylin-bot/actions/commit-and-push@main
|
||||
|
@ -98,7 +105,7 @@ jobs:
|
|||
--flake .
|
||||
-vv
|
||||
--
|
||||
--quiet
|
||||
${{ env.extraArgs }}
|
||||
|
||||
- run: |
|
||||
echo "# system diffs" >> $GITHUB_STEP_SUMMARY
|
||||
|
|
49
flake.lock
49
flake.lock
|
@ -183,11 +183,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737310896,
|
||||
"narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
|
||||
"lastModified": 1737398451,
|
||||
"narHash": "sha256-9X6dQbYGi9az9+8wk3fnPppD2SOOe6U68vdZCl+MxkE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
|
||||
"revCount": 5690,
|
||||
"rev": "a661203bb6d4714b211572759e2f74b1da194972",
|
||||
"revCount": 5693,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
@ -404,7 +404,9 @@
|
|||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs-lib"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737288694,
|
||||
|
@ -423,11 +425,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1737301226,
|
||||
"narHash": "sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8=",
|
||||
"rev": "4bb97b2a9b4e96b825e621810900ce077fdf7efb",
|
||||
"lastModified": 1737403222,
|
||||
"narHash": "sha256-bAcx6Nv0a3XoCBs9TSqgjyf16nrz/ozUO93Ng52IfOI=",
|
||||
"rev": "fcc151d7898e466569c5f9e628217e476c1eaba8",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4bb97b2a9b4e96b825e621810900ce077fdf7efb.tar.gz?rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fcc151d7898e466569c5f9e628217e476c1eaba8.tar.gz?rev=fcc151d7898e466569c5f9e628217e476c1eaba8"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -567,21 +569,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1737248590,
|
||||
"narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "977f49fd8cf854416f82987696784717acd6e817",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-wayland": {
|
||||
"inputs": {
|
||||
"flake-compat": [],
|
||||
|
@ -594,11 +581,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737341314,
|
||||
"narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
|
||||
"lastModified": 1737390929,
|
||||
"narHash": "sha256-0G3+H+LH18eQXDnElM/Y/8BkUPoO9qc2jLh7aoI6tXA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "0deffe038aebb272bd19a514e780a09e24da8417",
|
||||
"rev": "900b3dbd52e89c7dde737e50c51ee97e93ee4d9e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -644,7 +631,7 @@
|
|||
"nix-index-database": "nix-index-database",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-lib": "nixpkgs-lib_2",
|
||||
"nixpkgs-lib": "nixpkgs-lib",
|
||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||
"pixi": "pixi",
|
||||
"sops-nix": "sops-nix",
|
||||
|
@ -682,11 +669,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737107480,
|
||||
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
|
||||
"lastModified": 1737411508,
|
||||
"narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
|
||||
"rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
# Follows
|
||||
|
||||
# nixpkgs
|
||||
## nixpkgs
|
||||
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hyprland.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -56,7 +56,7 @@
|
|||
tsm.inputs.nixpkgs.follows = "nixpkgs";
|
||||
utils.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# nim2nix
|
||||
## nim2nix
|
||||
hyprman.inputs.nim2nix.follows = "nim2nix";
|
||||
tsm.inputs.nim2nix.follows = "nim2nix";
|
||||
utils.inputs.nim2nix.follows = "nim2nix";
|
||||
|
@ -90,8 +90,9 @@
|
|||
nixpkgs-wayland.inputs.lib-aggregate.follows = "lib-aggregate";
|
||||
|
||||
nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
|
||||
lib-aggregate.inputs.nixpkgs-lib.follows = "nixpkgs-lib";
|
||||
|
||||
# nil inputs
|
||||
## nil inputs, I don't *ALL* your flake inputs...
|
||||
hyprland.inputs.pre-commit-hooks.follows = "";
|
||||
nixos-wsl.inputs.flake-compat.follows = "";
|
||||
nixpkgs-wayland.inputs.flake-compat.follows = "";
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
let
|
||||
inherit (lib) mkIf;
|
||||
in
|
||||
# TODO: explore the ability to expand this so that some of the worthwile extensions are also included.
|
||||
# I don't think it will be simple to integrate vscode-fhs and vscode-with-extensions
|
||||
{
|
||||
config = mkIf config.oizys.desktop.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
Loading…
Reference in a new issue