mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-05 09:14:17 -06:00
Compare commits
7 commits
fddb702c10
...
406e613600
| Author | SHA1 | Date | |
|---|---|---|---|
| 406e613600 | |||
8c5e0c7023
|
|||
|
2ec4ecc90e
|
|||
|
54f55b3cb2
|
|||
|
646591f05a
|
|||
|
a9a4f2269b
|
|||
| 7e1d8829ce |
6 changed files with 29 additions and 27 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
|
||||
|
|
|
|||
29
flake.lock
29
flake.lock
|
|
@ -432,7 +432,9 @@
|
|||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs-lib"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737288694,
|
||||
|
|
@ -451,11 +453,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1737468268,
|
||||
"narHash": "sha256-RVR/Wh+iTTmw3IYe9b52Gho3If9iGc6Xxpw+gmJZ50s=",
|
||||
"rev": "9b290081147fb2abf79d2d1e0afd72d1490145f2",
|
||||
"lastModified": 1737579991,
|
||||
"narHash": "sha256-5IKNJQP+3XWLd/s7SXGvL6ZzFwk8wDDm0QGBTQ6fw9M=",
|
||||
"rev": "1fe6064ceded2a9a81ab1725d545a670d14add28",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/9b290081147fb2abf79d2d1e0afd72d1490145f2.tar.gz?rev=9b290081147fb2abf79d2d1e0afd72d1490145f2"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1fe6064ceded2a9a81ab1725d545a670d14add28.tar.gz?rev=1fe6064ceded2a9a81ab1725d545a670d14add28"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -595,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": [],
|
||||
|
|
@ -672,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",
|
||||
|
|
|
|||
|
|
@ -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