mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-05 05:04:18 -06:00
Compare commits
7 commits
fddb702c10
...
406e613600
Author | SHA1 | Date | |
---|---|---|---|
406e613600 | |||
8c5e0c7023 | |||
2ec4ecc90e | |||
54f55b3cb2 | |||
646591f05a | |||
a9a4f2269b | |||
7e1d8829ce |
6 changed files with 88 additions and 58 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
|
||||
|
|
119
flake.lock
119
flake.lock
|
@ -41,11 +41,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736102453,
|
||||
"narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=",
|
||||
"lastModified": 1736702516,
|
||||
"narHash": "sha256-NbJiiPFnmciji3JHpqF/L0SdMQXKXn+q3Q/D8RjF/ak=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "4846091641f3be0ad7542086d52769bb7932bde6",
|
||||
"rev": "e7719f9b9f5321c7100733773ad9f38cb6db6b6f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -123,11 +123,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734906540,
|
||||
"narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=",
|
||||
"lastModified": 1737391116,
|
||||
"narHash": "sha256-wOlplOftCnD2J1VwkRiAzASiXi80LypWqhVJcBYuLG8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "69270ba8f057d55b0e6c2dca0e165d652856e613",
|
||||
"rev": "3219b311283803d4dbdacb3c5cc10cf9e9b7c2b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -183,11 +183,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737310896,
|
||||
"narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
|
||||
"lastModified": 1737556066,
|
||||
"narHash": "sha256-nlQUBaEs15L0n8q5FPyHmXNCdIm8Q6912Vhqg+pAaAI=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
|
||||
"revCount": 5690,
|
||||
"rev": "fda5626594c3f31bbab08e877a797a623c98c450",
|
||||
"revCount": 5699,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
@ -243,8 +243,36 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland-qt-support": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"hyprland-qtutils",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"hyprland-qtutils",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736376766,
|
||||
"narHash": "sha256-tZG+mkJJzqoi/gH8nN6P/yY1/PEYtom9+2WdYKKv5YM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-qt-support",
|
||||
"rev": "0ecf224f213497c45b12c4dc7bdc2c2edd0e3084",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-qt-support",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland-qtutils": {
|
||||
"inputs": {
|
||||
"hyprland-qt-support": "hyprland-qt-support",
|
||||
"hyprutils": [
|
||||
"hyprland",
|
||||
"hyprutils"
|
||||
|
@ -259,11 +287,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736114838,
|
||||
"narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=",
|
||||
"lastModified": 1736774415,
|
||||
"narHash": "sha256-pb8v7axHdVKFGhQHEAxIuZP/9REsmlyuDW5eLGIplLc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-qtutils",
|
||||
"rev": "6997fe382dcf396704227d2b98ffdd5066da6959",
|
||||
"rev": "534cd1badc46ec9bdd986ab41ad2408bf845961e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -336,11 +364,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736164519,
|
||||
"narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
|
||||
"lastModified": 1736613432,
|
||||
"narHash": "sha256-x7nMS1dFtlzgG13QoguKMZ6SKwSIQw82OANA5ZKF0d0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "3c895da64b0eb19870142196fa48c07090b441c4",
|
||||
"rev": "72dfbf52967e4040693164319a027d8ac6315887",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -404,7 +432,9 @@
|
|||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs-lib"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737288694,
|
||||
|
@ -423,11 +453,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1737301226,
|
||||
"narHash": "sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8=",
|
||||
"rev": "4bb97b2a9b4e96b825e621810900ce077fdf7efb",
|
||||
"lastModified": 1737579991,
|
||||
"narHash": "sha256-5IKNJQP+3XWLd/s7SXGvL6ZzFwk8wDDm0QGBTQ6fw9M=",
|
||||
"rev": "1fe6064ceded2a9a81ab1725d545a670d14add28",
|
||||
"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/1fe6064ceded2a9a81ab1725d545a670d14add28.tar.gz?rev=1fe6064ceded2a9a81ab1725d545a670d14add28"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -538,11 +568,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1737062831,
|
||||
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
||||
"lastModified": 1737469691,
|
||||
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
|
||||
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -567,21 +597,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 +609,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737341314,
|
||||
"narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
|
||||
"lastModified": 1737481114,
|
||||
"narHash": "sha256-SrpaK5R4nMqq6ZDNm/G2Bj53xHEsouz9w7ZiMDqb0Bc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "0deffe038aebb272bd19a514e780a09e24da8417",
|
||||
"rev": "c52a529dd1585cad4ccd5951b10ba27366aa3cee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -644,7 +659,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 +697,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": {
|
||||
|
@ -748,11 +763,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737103437,
|
||||
"narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
|
||||
"lastModified": 1737483750,
|
||||
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
|
||||
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -837,11 +852,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734907020,
|
||||
"narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=",
|
||||
"lastModified": 1736421203,
|
||||
"narHash": "sha256-BNe2xnHsSsTZiHp8OWl9UUf697w0gVtzh67AYe+pP+g=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "d7f18dda5e511749fa1511185db3536208fb1a63",
|
||||
"rev": "7613351375de66ca0d56689e333d460e2db05454",
|
||||
"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 = "";
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
enabled,
|
||||
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
@ -27,4 +29,5 @@
|
|||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [pkgs.stable.quarto];
|
||||
}
|
||||
|
|
|
@ -6,6 +6,8 @@ firefox
|
|||
zk
|
||||
graphviz
|
||||
charm-freeze
|
||||
quarto
|
||||
# build-failure:
|
||||
# pandoc -> texmath -> typst-symbols?
|
||||
# quarto
|
||||
calibre
|
||||
attic-client
|
||||
|
|
|
@ -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