Compare commits

..

1 commit

Author SHA1 Message Date
fddb702c10 flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=407453166ce2a52433c7b0b4ee92a41e47ef8f6d' (2025-01-19)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=fda5626594c3f31bbab08e877a797a623c98c450' (2025-01-22)
• Updated input 'hyprland/aquamarine':
    'github:hyprwm/aquamarine/4846091641f3be0ad7542086d52769bb7932bde6' (2025-01-05)
  → 'github:hyprwm/aquamarine/e7719f9b9f5321c7100733773ad9f38cb6db6b6f' (2025-01-12)
• Updated input 'hyprland/hyprcursor':
    'github:hyprwm/hyprcursor/69270ba8f057d55b0e6c2dca0e165d652856e613' (2024-12-22)
  → 'github:hyprwm/hyprcursor/3219b311283803d4dbdacb3c5cc10cf9e9b7c2b5' (2025-01-20)
• Updated input 'hyprland/hyprland-qtutils':
    'github:hyprwm/hyprland-qtutils/6997fe382dcf396704227d2b98ffdd5066da6959' (2025-01-05)
  → 'github:hyprwm/hyprland-qtutils/534cd1badc46ec9bdd986ab41ad2408bf845961e' (2025-01-13)
• Added input 'hyprland/hyprland-qtutils/hyprland-qt-support':
    'github:hyprwm/hyprland-qt-support/0ecf224f213497c45b12c4dc7bdc2c2edd0e3084' (2025-01-08)
• Added input 'hyprland/hyprland-qtutils/hyprland-qt-support/nixpkgs':
    follows 'hyprland/hyprland-qtutils/nixpkgs'
• Added input 'hyprland/hyprland-qtutils/hyprland-qt-support/systems':
    follows 'hyprland/hyprland-qtutils/systems'
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/3c895da64b0eb19870142196fa48c07090b441c4' (2025-01-06)
  → 'github:hyprwm/hyprutils/72dfbf52967e4040693164319a027d8ac6315887' (2025-01-11)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/d7f18dda5e511749fa1511185db3536208fb1a63' (2024-12-22)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/7613351375de66ca0d56689e333d460e2db05454' (2025-01-09)
• Updated input 'lix':
    '4bb97b2a9b.tar.gz?narHash=sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8%3D&rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb' (2025-01-19)
  → '9b29008114.tar.gz?narHash=sha256-RVR/Wh%2BiTTmw3IYe9b52Gho3If9iGc6Xxpw%2BgmJZ50s%3D&rev=9b290081147fb2abf79d2d1e0afd72d1490145f2' (2025-01-21)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c' (2025-01-16)
  → 'github:nixos/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab' (2025-01-21)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/0deffe038aebb272bd19a514e780a09e24da8417' (2025-01-20)
  → 'github:nix-community/nixpkgs-wayland/c52a529dd1585cad4ccd5951b10ba27366aa3cee' (2025-01-21)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6' (2025-01-17)
  → 'github:Mic92/sops-nix/015d461c16678fc02a2f405eb453abb509d4e1d4' (2025-01-20)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/d1ed3b385f8130e392870cfb1dbfaff8a63a1899' (2025-01-17)
  → 'github:numtide/treefmt-nix/f2cc121df15418d028a59c9737d38e3a90fbaf8f' (2025-01-21)
2025-01-22 20:04:36 +00:00
6 changed files with 27 additions and 29 deletions

View file

@ -12,11 +12,6 @@ on:
description: "list of nix flake inputs" description: "list of nix flake inputs"
default: "" default: ""
type: "string" type: "string"
extraArgs:
description: "postional args forwared to nix"
default: ""
type: string
# schedule: # schedule:
# # At minute 00:00 on Monday, Wednesday, and Friday. # # At minute 00:00 on Monday, Wednesday, and Friday.
@ -25,7 +20,6 @@ on:
env: env:
hosts: ${{ github.event_name == 'schedule' && 'othalan,algiz' || github.event.inputs.hosts }} hosts: ${{ github.event_name == 'schedule' && 'othalan,algiz' || github.event.inputs.hosts }}
flake-inputs: ${{ github.event_name == 'schedule' && '' || github.event.inputs.flake-inputs }} flake-inputs: ${{ github.event_name == 'schedule' && '' || github.event.inputs.flake-inputs }}
extraArgs: ${{ github.event_name == 'schedule' && '' || github.event.inputs.extraArgs }}
permissions: permissions:
contents: write contents: write
@ -69,8 +63,7 @@ jobs:
--flake . --flake .
-vv -vv
-- --
${{ env.extraArgs }} --quiet
- name: Commit Updates - name: Commit Updates
uses: daylin-bot/actions/commit-and-push@main uses: daylin-bot/actions/commit-and-push@main
@ -105,7 +98,7 @@ jobs:
--flake . --flake .
-vv -vv
-- --
${{ env.extraArgs }} --quiet
- run: | - run: |
echo "# system diffs" >> $GITHUB_STEP_SUMMARY echo "# system diffs" >> $GITHUB_STEP_SUMMARY

View file

@ -432,9 +432,7 @@
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib"
"nixpkgs-lib"
]
}, },
"locked": { "locked": {
"lastModified": 1737288694, "lastModified": 1737288694,
@ -453,11 +451,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737579991, "lastModified": 1737468268,
"narHash": "sha256-5IKNJQP+3XWLd/s7SXGvL6ZzFwk8wDDm0QGBTQ6fw9M=", "narHash": "sha256-RVR/Wh+iTTmw3IYe9b52Gho3If9iGc6Xxpw+gmJZ50s=",
"rev": "1fe6064ceded2a9a81ab1725d545a670d14add28", "rev": "9b290081147fb2abf79d2d1e0afd72d1490145f2",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1fe6064ceded2a9a81ab1725d545a670d14add28.tar.gz?rev=1fe6064ceded2a9a81ab1725d545a670d14add28" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/9b290081147fb2abf79d2d1e0afd72d1490145f2.tar.gz?rev=9b290081147fb2abf79d2d1e0afd72d1490145f2"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -597,6 +595,21 @@
"type": "github" "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": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"flake-compat": [], "flake-compat": [],
@ -659,7 +672,7 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-lib": "nixpkgs-lib", "nixpkgs-lib": "nixpkgs-lib_2",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"pixi": "pixi", "pixi": "pixi",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

View file

@ -39,7 +39,7 @@
# Follows # Follows
## nixpkgs # nixpkgs
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
@ -56,7 +56,7 @@
tsm.inputs.nixpkgs.follows = "nixpkgs"; tsm.inputs.nixpkgs.follows = "nixpkgs";
utils.inputs.nixpkgs.follows = "nixpkgs"; utils.inputs.nixpkgs.follows = "nixpkgs";
## nim2nix # nim2nix
hyprman.inputs.nim2nix.follows = "nim2nix"; hyprman.inputs.nim2nix.follows = "nim2nix";
tsm.inputs.nim2nix.follows = "nim2nix"; tsm.inputs.nim2nix.follows = "nim2nix";
utils.inputs.nim2nix.follows = "nim2nix"; utils.inputs.nim2nix.follows = "nim2nix";
@ -90,9 +90,8 @@
nixpkgs-wayland.inputs.lib-aggregate.follows = "lib-aggregate"; nixpkgs-wayland.inputs.lib-aggregate.follows = "lib-aggregate";
nixpkgs-lib.url = "github:nix-community/nixpkgs.lib"; nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
lib-aggregate.inputs.nixpkgs-lib.follows = "nixpkgs-lib";
## nil inputs, I don't *ALL* your flake inputs... # nil inputs
hyprland.inputs.pre-commit-hooks.follows = ""; hyprland.inputs.pre-commit-hooks.follows = "";
nixos-wsl.inputs.flake-compat.follows = ""; nixos-wsl.inputs.flake-compat.follows = "";
nixpkgs-wayland.inputs.flake-compat.follows = ""; nixpkgs-wayland.inputs.flake-compat.follows = "";

View file

@ -1,8 +1,6 @@
{ {
config, config,
pkgs,
enabled, enabled,
... ...
}: }:
{ {
@ -29,5 +27,4 @@
}; };
}; };
environment.systemPackages = [pkgs.stable.quarto];
} }

View file

@ -6,8 +6,6 @@ firefox
zk zk
graphviz graphviz
charm-freeze charm-freeze
# build-failure: quarto
# pandoc -> texmath -> typst-symbols?
# quarto
calibre calibre
attic-client attic-client

View file

@ -7,8 +7,6 @@
let let
inherit (lib) mkIf; inherit (lib) mkIf;
in 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 { config = mkIf config.oizys.desktop.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [