daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-02-05 05:04:18 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:fddb702c105a52db6f179f278a9f61554ceae0ca
Branches Tags
daylin:main
daylin:flake-lock
daylin:lix-beta
daylin:lix-beta-with-nix
...
compare: daylin:406e613600c48ceb9382f69f178f04805b34dbc6
Branches Tags
daylin:main
daylin:flake-lock
daylin:lix-beta
daylin:lix-beta-with-nix

7 commits
fddb702c10 ... 406e613600

Author SHA1 Message Date
daylin-bot
406e613600 flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=a661203bb6d4714b211572759e2f74b1da194972' (2025-01-20)
  → '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':
    'fcc151d789.tar.gz?narHash=sha256-bAcx6Nv0a3XoCBs9TSqgjyf16nrz/ozUO93Ng52IfOI%3D&rev=fcc151d7898e466569c5f9e628217e476c1eaba8' (2025-01-20)
  → '1fe6064ced.tar.gz?narHash=sha256-5IKNJQP%2B3XWLd/s7SXGvL6ZzFwk8wDDm0QGBTQ6fw9M%3D&rev=1fe6064ceded2a9a81ab1725d545a670d14add28' (2025-01-22)
• 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/900b3dbd52e89c7dde737e50c51ee97e93ee4d9e' (2025-01-20)
  → 'github:nix-community/nixpkgs-wayland/c52a529dd1585cad4ccd5951b10ba27366aa3cee' (2025-01-21)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/d1ed3b385f8130e392870cfb1dbfaff8a63a1899' (2025-01-17)
  → 'github:numtide/treefmt-nix/f2cc121df15418d028a59c9737d38e3a90fbaf8f' (2025-01-21)
 2025-01-22 22:29:14 +00:00
Daylin Morgan
8c5e0c7023
don't install unstable quarto 2025-01-22 16:23:21 -06:00
Daylin Morgan
2ec4ecc90e
add extraArgs 2025-01-22 15:24:15 -06:00
Daylin Morgan
54f55b3cb2
drop another input 2025-01-22 00:39:24 -06:00
Daylin Morgan
646591f05a
a funny 2025-01-21 22:25:22 -06:00
Daylin Morgan
a9a4f2269b
note to self 2025-01-21 13:46:09 -06:00
daylin-bot
7e1d8829ce 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=a661203bb6d4714b211572759e2f74b1da194972' (2025-01-20)
• Updated input 'lix':
    '4bb97b2a9b.tar.gz?narHash=sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8%3D&rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb' (2025-01-19)
  → 'fcc151d789.tar.gz?narHash=sha256-bAcx6Nv0a3XoCBs9TSqgjyf16nrz/ozUO93Ng52IfOI%3D&rev=fcc151d7898e466569c5f9e628217e476c1eaba8' (2025-01-20)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/0deffe038aebb272bd19a514e780a09e24da8417' (2025-01-20)
  → 'github:nix-community/nixpkgs-wayland/900b3dbd52e89c7dde737e50c51ee97e93ee4d9e' (2025-01-20)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6' (2025-01-17)
  → 'github:Mic92/sops-nix/015d461c16678fc02a2f405eb453abb509d4e1d4' (2025-01-20)
 2025-01-20 23:22:25 +00:00
6 changed files with 88 additions and 58 deletions
Show stats Expand all files Collapse all files

11
.github/workflows/update.yml vendored
View file

@ -12,6 +12,11 @@ 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.
@ -20,6 +25,7 @@ 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
@ -63,7 +69,8 @@ jobs:
--flake . --flake .
-vv -vv
-- --
--quiet ${{ env.extraArgs }}
- name: Commit Updates - name: Commit Updates
uses: daylin-bot/actions/commit-and-push@main uses: daylin-bot/actions/commit-and-push@main
@ -98,7 +105,7 @@ jobs:
--flake . --flake .
-vv -vv
-- --
--quiet ${{ env.extraArgs }}
- run: | - run: |
echo "# system diffs" >> $GITHUB_STEP_SUMMARY echo "# system diffs" >> $GITHUB_STEP_SUMMARY

119
flake.lock
View file

@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736102453, "lastModified": 1736702516,
"narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "narHash": "sha256-NbJiiPFnmciji3JHpqF/L0SdMQXKXn+q3Q/D8RjF/ak=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "4846091641f3be0ad7542086d52769bb7932bde6", "rev": "e7719f9b9f5321c7100733773ad9f38cb6db6b6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -123,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906540, "lastModified": 1737391116,
"narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "narHash": "sha256-wOlplOftCnD2J1VwkRiAzASiXi80LypWqhVJcBYuLG8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "rev": "3219b311283803d4dbdacb3c5cc10cf9e9b7c2b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1737310896, "lastModified": 1737556066,
"narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=", "narHash": "sha256-nlQUBaEs15L0n8q5FPyHmXNCdIm8Q6912Vhqg+pAaAI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d", "rev": "fda5626594c3f31bbab08e877a797a623c98c450",
"revCount": 5690, "revCount": 5699,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -243,8 +243,36 @@
"type": "github" "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": { "hyprland-qtutils": {
"inputs": { "inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprutils": [ "hyprutils": [
"hyprland", "hyprland",
"hyprutils" "hyprutils"
@ -259,11 +287,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736114838, "lastModified": 1736774415,
"narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", "narHash": "sha256-pb8v7axHdVKFGhQHEAxIuZP/9REsmlyuDW5eLGIplLc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "6997fe382dcf396704227d2b98ffdd5066da6959", "rev": "534cd1badc46ec9bdd986ab41ad2408bf845961e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +364,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736164519, "lastModified": 1736613432,
"narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "narHash": "sha256-x7nMS1dFtlzgG13QoguKMZ6SKwSIQw82OANA5ZKF0d0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3c895da64b0eb19870142196fa48c07090b441c4", "rev": "72dfbf52967e4040693164319a027d8ac6315887",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -404,7 +432,9 @@
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": [
"nixpkgs-lib"
]
}, },
"locked": { "locked": {
"lastModified": 1737288694, "lastModified": 1737288694,
@ -423,11 +453,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737301226, "lastModified": 1737579991,
"narHash": "sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8=", "narHash": "sha256-5IKNJQP+3XWLd/s7SXGvL6ZzFwk8wDDm0QGBTQ6fw9M=",
"rev": "4bb97b2a9b4e96b825e621810900ce077fdf7efb", "rev": "1fe6064ceded2a9a81ab1725d545a670d14add28",
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@ -538,11 +568,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737062831, "lastModified": 1737469691,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,21 +597,6 @@
"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": [],
@ -594,11 +609,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737341314, "lastModified": 1737481114,
"narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=", "narHash": "sha256-SrpaK5R4nMqq6ZDNm/G2Bj53xHEsouz9w7ZiMDqb0Bc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "0deffe038aebb272bd19a514e780a09e24da8417", "rev": "c52a529dd1585cad4ccd5951b10ba27366aa3cee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -644,7 +659,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_2", "nixpkgs-lib": "nixpkgs-lib",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"pixi": "pixi", "pixi": "pixi",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -682,11 +697,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737107480, "lastModified": 1737411508,
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -748,11 +763,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737103437, "lastModified": 1737483750,
"narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -837,11 +852,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734907020, "lastModified": 1736421203,
"narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "narHash": "sha256-BNe2xnHsSsTZiHp8OWl9UUf697w0gVtzh67AYe+pP+g=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "rev": "7613351375de66ca0d56689e333d460e2db05454",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.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,8 +90,9 @@
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 ## nil inputs, I don't *ALL* your flake 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 = "";

3
hosts/othalan/default.nix
View file

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

4
hosts/othalan/settings/pkgs
View file

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

2
modules/editors/vscode.nix
View file

@ -7,6 +7,8 @@
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; [