Compare commits

..

No commits in common. "2ec4ecc90e8f5cf15b74659ff79a4ae0f333d232" and "155661be6cccab09d812433c842afda56051e49f" have entirely different histories.

4 changed files with 36 additions and 33 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

@ -183,11 +183,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1737398451, "lastModified": 1737310896,
"narHash": "sha256-9X6dQbYGi9az9+8wk3fnPppD2SOOe6U68vdZCl+MxkE=", "narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a661203bb6d4714b211572759e2f74b1da194972", "rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
"revCount": 5693, "revCount": 5690,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -404,9 +404,7 @@
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib"
"nixpkgs-lib"
]
}, },
"locked": { "locked": {
"lastModified": 1737288694, "lastModified": 1737288694,
@ -425,11 +423,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737403222, "lastModified": 1737301226,
"narHash": "sha256-bAcx6Nv0a3XoCBs9TSqgjyf16nrz/ozUO93Ng52IfOI=", "narHash": "sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8=",
"rev": "fcc151d7898e466569c5f9e628217e476c1eaba8", "rev": "4bb97b2a9b4e96b825e621810900ce077fdf7efb",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fcc151d7898e466569c5f9e628217e476c1eaba8.tar.gz?rev=fcc151d7898e466569c5f9e628217e476c1eaba8" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4bb97b2a9b4e96b825e621810900ce077fdf7efb.tar.gz?rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -569,6 +567,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": [],
@ -581,11 +594,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737390929, "lastModified": 1737341314,
"narHash": "sha256-0G3+H+LH18eQXDnElM/Y/8BkUPoO9qc2jLh7aoI6tXA=", "narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "900b3dbd52e89c7dde737e50c51ee97e93ee4d9e", "rev": "0deffe038aebb272bd19a514e780a09e24da8417",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,7 +644,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",
@ -669,11 +682,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737411508, "lastModified": 1737107480,
"narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -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; [