daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-09 20:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:f2f19c1b5cf419ac9413db167b731a5b747990d0
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:be860401e32e34fd8118c6d0ce239744c29fa046
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

No commits in common. "f2f19c1b5cf419ac9413db167b731a5b747990d0" and "be860401e32e34fd8118c6d0ce239744c29fa046" have entirely different histories.
f2f19c1b5c ... be860401e3

6 changed files with 52 additions and 87 deletions
Show stats Expand all files Collapse all files

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

@ -127,7 +127,6 @@ jobs:
echo "# System Diff" >> $GITHUB_STEP_SUMMARY echo "# System Diff" >> $GITHUB_STEP_SUMMARY
nix run "nixpkgs#nvd" -- --color always diff ./current ./updated >> summary.md nix run "nixpkgs#nvd" -- --color always diff ./current ./updated >> summary.md
printf '```\n%s```\n' "$(nix run "nixpkgs#nvd" -- diff ./current ./updated)" >> $GITHUB_STEP_SUMMARY printf '```\n%s```\n' "$(nix run "nixpkgs#nvd" -- diff ./current ./updated)" >> $GITHUB_STEP_SUMMARY
nix run "nixpkgs#nvd" -- --color always diff ./current ./updated | nix run "nixpkgs#charm-freeze" -- --output diff.svg
- run: df -h - run: df -h
@ -135,13 +134,3 @@ jobs:
with: with:
name: ${{ matrix.host }}-summary name: ${{ matrix.host }}-summary
path: summary.md path: summary.md
# https://github.com/actions/upload-artifact/issues/50#issuecomment-1856471599
- uses: actions/upload-artifact@v4
id: diff-upload
with:
name: ${{ matrix.host }}-diff
path: diff.svg
- name: Output artifact URL
run: echo 'Artifact URL is ${{ steps.diff-upload.outputs.artifact-url }}'

91
flake.lock
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724006173, "lastModified": 1723405438,
"narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=", "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "7f8df01d4297b9068a9592400f16044602844f86", "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1724016119, "lastModified": 1723656907,
"narHash": "sha256-ricYM9Ethzai2l2qCK6Bkgfg53FtzWuzaVIDzZ7Ve1Y=", "narHash": "sha256-11tgstIQZP3RRrBEF3ym9L6oS+vzqZJ7Mp6eB2PaN+0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "83d88fa56467a2b749fb2320e1595281107bd326", "rev": "197f8807900afc81c1c92ad17e621d1998ee268b",
"revCount": 5111, "revCount": 5088,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -485,13 +485,13 @@
"langref": { "langref": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-1I8Eut7rSqCayxqV5npFujw7l++Ul5NCBUa62hGhOlA=", "narHash": "sha256-O6p2tiKD8ZMhSX+DeA/o5hhAvcPkU2J9lFys/r11peY=",
"type": "file", "type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/eb7f318ea897d51082b70c84591242735c8a2c53/doc/langref.html.in" "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/eb7f318ea897d51082b70c84591242735c8a2c53/doc/langref.html.in" "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
} }
}, },
"lib-aggregate": { "lib-aggregate": {
@ -516,11 +516,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724021051, "lastModified": 1723577950,
"narHash": "sha256-80mohEXTDXE5aWwMw3a9U9YzQkBdhJAzVYUQBZ3SNvY=", "narHash": "sha256-kOpGI9WPmte1L4QWHviuXsr8jxmGn27zwi82jtzYObM=",
"rev": "5cbca8553581a358f9b5067bc8def24b1c7b37cc", "rev": "b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5cbca8553581a358f9b5067bc8def24b1c7b37cc.tar.gz?rev=5cbca8553581a358f9b5067bc8def24b1c7b37cc" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf.tar.gz?rev=b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -600,11 +600,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723950649, "lastModified": 1723352546,
"narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "392828aafbed62a6ea6ccab13728df2e67481805", "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -660,11 +660,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1723175592,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1723891200, "lastModified": 1723603349,
"narHash": "sha256-uljX21+D/DZgb9uEFFG2dkkQbPZN+ig4Z6+UCLWFVAk=", "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a0d6390cb3e82062a35d0288979c45756e481f60", "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -839,11 +839,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723982909, "lastModified": 1723671539,
"narHash": "sha256-7zvJtdjg3XrGvbCib/zwgrrWjMzrloxt+FVwQCvxlGM=", "narHash": "sha256-fOKiZhYGnIU2F2Yrl9k4Evkv7mwrGvvPwI1f1grWmy4=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "7c7485bb047d888958c4431511b9164bdf007052", "rev": "2423ce2272670be592d3ce0091c3ddf665358c88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -868,7 +868,6 @@
"roc": "roc", "roc": "roc",
"stable": "stable", "stable": "stable",
"tsm": "tsm", "tsm": "tsm",
"utils": "utils",
"zig-overlay": "zig-overlay", "zig-overlay": "zig-overlay",
"zls": "zls" "zls": "zls"
} }
@ -1049,11 +1048,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1723828016, "lastModified": 1710955312,
"narHash": "sha256-s47lZE4T59+ohZpa5TqS1wKyTDYJOYO6yc7lM9giDJQ=", "narHash": "sha256-7F88bRcAqU1NPo89pKhR/d6NKRn2JJ2FWcSLITjvzdU=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "tsm", "repo": "tsm",
"rev": "7fb9a2d6b4005a614cb19c7f376551252ddf1f14", "rev": "090dda23ad4ab87a68323a9e1924bc6d8ce6e0a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1063,26 +1062,6 @@
"type": "github" "type": "github"
} }
}, },
"utils": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1723841055,
"narHash": "sha256-ykjmNEXFJ4lrW1LeB4dVsNlPKlNB0VWNnOTp1sLbOqQ=",
"ref": "refs/heads/main",
"rev": "eca60579ef577ad45aa1a371f006697ddc2611d6",
"revCount": 5,
"type": "git",
"url": "https://git.dayl.in/daylin/utils.git"
},
"original": {
"type": "git",
"url": "https://git.dayl.in/daylin/utils.git"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
@ -1122,11 +1101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723940915, "lastModified": 1723681531,
"narHash": "sha256-73au9Xg3L1OD5BEvapD0M0ONdbrsS5YDTcSWytBJ8Iw=", "narHash": "sha256-e+5bmu3c03BLUza76f+Dm35rI008+fhZ9LlcfUJ79gc=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "8619199983f527e5fa15681497d2f19b7c5aec28", "rev": "ec73dc4a8b9a30b16da979e0bac67e457d5be933",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1148,11 +1127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723832292, "lastModified": 1723638628,
"narHash": "sha256-5hg/tylDkhM6zl8FMV9xsgl/BVJeySNG6GLh4PL/O6o=", "narHash": "sha256-QW4XHDWk2XsoRm/4tRP9AWvXVE8tCZHQ8pLRVMylhOs=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "71bf10b4889ac13694618d131cb8b60cb30db3f6", "rev": "599f9da8785f1cd3ac23595b910372e20c530a6d",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View file

@ -10,10 +10,8 @@
nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
lix = { lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; lix.flake = false;
flake = false;
};
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -30,7 +28,6 @@
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
tsm.url = "github:daylinmorgan/tsm?dir=nix"; tsm.url = "github:daylinmorgan/tsm?dir=nix";
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
utils.url = "git+https://git.dayl.in/daylin/utils.git";
hyprman.inputs.nixpkgs.follows = "nixpkgs"; hyprman.inputs.nixpkgs.follows = "nixpkgs";
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
@ -38,7 +35,6 @@
pixi.inputs.nixpkgs.follows = "nixpkgs"; pixi.inputs.nixpkgs.follows = "nixpkgs";
roc.inputs.nixpkgs.follows = "nixpkgs"; roc.inputs.nixpkgs.follows = "nixpkgs";
tsm.inputs.nixpkgs.follows = "nixpkgs"; tsm.inputs.nixpkgs.follows = "nixpkgs";
utils.inputs.nixpkgs.follows = "nixpkgs";
zls.inputs.nixpkgs.follows = "nixpkgs"; zls.inputs.nixpkgs.follows = "nixpkgs";
zls.inputs.zig-overlay.follows = "zig-overlay"; zls.inputs.zig-overlay.follows = "zig-overlay";
zig-overlay.inputs.nixpkgs.follows = "nixpkgs"; zig-overlay.inputs.nixpkgs.follows = "nixpkgs";

11
hosts/othalan/pkgs.nix
View file

@ -1,11 +1,12 @@
{ pkgs, flake, ... }: { pkgs, ... }:
{ {
environment.systemPackages = environment.systemPackages = with pkgs; [
[ (flake.pkg "utils") ]
++ (with pkgs; [
zk zk
quarto quarto
cachix cachix
graphviz graphviz
]); # nix-du # failing to build suddenly?
# https://github.com/symphorien/nix-du/issues/23
# maybe llvm related?
];
} }

2
modules/languages/nim.nix
View file

@ -15,7 +15,7 @@ in
nim-atlas nim-atlas
nimble nimble
nimlangserver nimlsp
]; ];
}; };
} }

8
modules/llm/default.nix
View file

@ -1,24 +1,24 @@
{ {
pkgs, pkgs,
config, config,
enabled,
mkOizysModule, mkOizysModule,
# enabled,
... ...
}: }:
let let
inherit (pkgs) python3Packages; inherit (pkgs) python3Packages;
# llm-ollama = python3Packages.callPackage ./llm-plugins/llm-ollama { }; llm-ollama = python3Packages.callPackage ./llm-plugins/llm-ollama { };
llm-claude3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { }; llm-claude3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { };
llm = ( llm = (
pkgs.llm.withPlugins [ pkgs.llm.withPlugins [
# llm-ollama llm-ollama
llm-claude3 llm-claude3
] ]
); );
in in
mkOizysModule config "llm" { mkOizysModule config "llm" {
# services.ollama = enabled; services.ollama = enabled;
environment.systemPackages = [ llm ]; environment.systemPackages = [ llm ];
} }