mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-23 11:00:44 -06:00
Compare commits
6 commits
6de469a365
...
c052754f93
Author | SHA1 | Date | |
---|---|---|---|
c052754f93 | |||
ea0f6262a8 | |||
a21b4b3c18 | |||
b5de96ccbf | |||
222ca60f3c | |||
cf43fc941a |
8 changed files with 34 additions and 32 deletions
3
.github/workflows/update.yml
vendored
3
.github/workflows/update.yml
vendored
|
@ -34,7 +34,8 @@ jobs:
|
|||
- name: Update nix flake
|
||||
run: |
|
||||
printf '# Flake Lock\n\n```txt\n' >> $GITHUB_STEP_SUMMARY
|
||||
nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY
|
||||
nix flake update --commit-lock-file
|
||||
git show -s --format='%B' >> $GITHUB_STEP_SUMMARY
|
||||
printf '```\n' >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
- name: Pre-build oizys
|
||||
|
|
14
flake.lock
14
flake.lock
|
@ -534,11 +534,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723140921,
|
||||
"narHash": "sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M=",
|
||||
"rev": "e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d",
|
||||
"lastModified": 1723158731,
|
||||
"narHash": "sha256-FIXisGWmQpPjPcEKy/Xa6YvnUYg9KysfLsFq0biMIug=",
|
||||
"rev": "3b902683e93ad21be3537ef77f3e5200fbbed900",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3b902683e93ad21be3537ef77f3e5200fbbed900.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -715,11 +715,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723137378,
|
||||
"narHash": "sha256-+MkYW9iZwi0D0hLeS5S1Ov3VNJ3twdTlHW7dRKeiCBY=",
|
||||
"lastModified": 1723151834,
|
||||
"narHash": "sha256-KjUcXpdLx5QzkT0x3qctGm1AM9U8g8pSFy24fE2MFeM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "b412353cee03010813974408d5ae63f7422b176d",
|
||||
"rev": "e28b410ad60004cca039fc6de2dd65f485779833",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -6,13 +6,6 @@
|
|||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
activate-snippet = ''
|
||||
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
||||
exec Hyprland
|
||||
fi
|
||||
'';
|
||||
in
|
||||
|
||||
mkOizysModule config "hyprland" {
|
||||
programs.hyprland = enabled;
|
||||
|
@ -62,20 +55,30 @@ mkOizysModule config "hyprland" {
|
|||
#
|
||||
# dunst
|
||||
]);
|
||||
|
||||
services.getty = {
|
||||
extraArgs = [ "--skip-login" ];
|
||||
loginOptions = "-p -- ${config.oizys.user}";
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"bashrc.local".text = activate-snippet;
|
||||
"zshenv.local".text = activate-snippet;
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(flake.overlay "hyprland-contrib")
|
||||
# (overlayFrom "nixpkgs-wayland")
|
||||
# (overlayFrom "hyprland")
|
||||
];
|
||||
# using the below to autostart Hyprland
|
||||
# broke my keybindings that were working before
|
||||
# services.getty = {
|
||||
# extraArgs = [ "--skip-login" ];
|
||||
# loginOptions = "-p -- ${config.oizys.user}";
|
||||
# };
|
||||
#
|
||||
# environment.etc =
|
||||
# let
|
||||
# activate-snippet = ''
|
||||
# if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
||||
# exec Hyprland
|
||||
# fi
|
||||
# '';
|
||||
# in
|
||||
# {
|
||||
# "bashrc.local".text = activate-snippet;
|
||||
# "zshenv.local".text = activate-snippet;
|
||||
# };
|
||||
#
|
||||
|
||||
}
|
||||
|
|
|
@ -12,8 +12,6 @@ in
|
|||
config = mkIfIn "nushell" cfg {
|
||||
environment.systemPackages = with pkgs; [
|
||||
nushell
|
||||
nufmt
|
||||
nushellPlugins.polars
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
let
|
||||
inherit (pkgs) python3Packages;
|
||||
llm-ollama = python3Packages.callPackage ../../pkgs/llm-plugins/llm-ollama { };
|
||||
llm-claude3 = python3Packages.callPackage ../../pkgs/llm-plugins/llm-claude-3 { };
|
||||
llm-ollama = python3Packages.callPackage ./llm-plugins/llm-ollama { };
|
||||
llm-claude3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { };
|
||||
llm = (
|
||||
pkgs.llm.withPlugins [
|
||||
llm-ollama
|
||||
|
|
|
@ -12,6 +12,7 @@ let
|
|||
mkOption
|
||||
literalExpression
|
||||
types
|
||||
optionals
|
||||
;
|
||||
cfg = config.oizys.nix-ld;
|
||||
|
||||
|
@ -103,8 +104,7 @@ in
|
|||
|
||||
config =
|
||||
let
|
||||
libs =
|
||||
defaultLibraries ++ cfg.extra-libraries ++ (if cfg.overkill.enable then overkillLibraries else [ ]);
|
||||
libs = defaultLibraries ++ cfg.extra-libraries ++ (optionals cfg.overkill.enable overkillLibraries);
|
||||
in
|
||||
mkIf cfg.enable {
|
||||
programs.nix-ld = enabled // {
|
||||
|
|
Loading…
Reference in a new issue