mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-24 07:50:43 -06:00
Compare commits
6 commits
98dc2b807b
...
ea0f6262a8
Author | SHA1 | Date | |
---|---|---|---|
ea0f6262a8 | |||
a21b4b3c18 | |||
b5de96ccbf | |||
222ca60f3c | |||
cf43fc941a | |||
6de469a365 |
8 changed files with 47 additions and 45 deletions
3
.github/workflows/update.yml
vendored
3
.github/workflows/update.yml
vendored
|
@ -34,7 +34,8 @@ jobs:
|
||||||
- name: Update nix flake
|
- name: Update nix flake
|
||||||
run: |
|
run: |
|
||||||
printf '# Flake Lock\n\n```txt\n' >> $GITHUB_STEP_SUMMARY
|
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
|
printf '```\n' >> $GITHUB_STEP_SUMMARY
|
||||||
|
|
||||||
- name: Pre-build oizys
|
- name: Pre-build oizys
|
||||||
|
|
40
flake.lock
40
flake.lock
|
@ -341,11 +341,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723043089,
|
"lastModified": 1723143710,
|
||||||
"narHash": "sha256-b01LQD32/xakBOFxabj8Mtz37ekvFwrM74VKNssUnko=",
|
"narHash": "sha256-qbjodK+UgnQ2YdtKmuI1XEG84SZlid39rQo6Ap9NTqI=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "ea728315410e220d73a993f17c83ae9dc9be9015",
|
"rev": "4b4971c06fb02df00a2bd20b6b47b5d0e7d799a7",
|
||||||
"revCount": 5067,
|
"revCount": 5071,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland/"
|
"url": "https://github.com/hyprwm/Hyprland/"
|
||||||
|
@ -534,11 +534,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723036070,
|
"lastModified": 1723140921,
|
||||||
"narHash": "sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ=",
|
"narHash": "sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M=",
|
||||||
"rev": "ec7552ff7411592305d28ec4bfcb4ea55866ab36",
|
"rev": "e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ec7552ff7411592305d28ec4bfcb4ea55866ab36.tar.gz"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -663,11 +663,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722253092,
|
"lastModified": 1723124175,
|
||||||
"narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
|
"narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
|
"rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -715,11 +715,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723043911,
|
"lastModified": 1723137378,
|
||||||
"narHash": "sha256-JAYd5Tq1AmrGK9MBup+WK6dq3rIvkpUHFAgBJ3d8irY=",
|
"narHash": "sha256-+MkYW9iZwi0D0hLeS5S1Ov3VNJ3twdTlHW7dRKeiCBY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "5acf5ce79d80e23a2426b8a553a4d4b5996fef46",
|
"rev": "b412353cee03010813974408d5ae63f7422b176d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -762,11 +762,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722957468,
|
"lastModified": 1723019560,
|
||||||
"narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=",
|
"narHash": "sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2a13929e1f191b3690dd2f2db13098b04adb9043",
|
"rev": "f5129fb42b9c262318130a97b47516946da3e7d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1156,11 +1156,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722993798,
|
"lastModified": 1723080195,
|
||||||
"narHash": "sha256-cXzpRh+nUTBqo4mU+jzG4otZcpTfo29DC0apTmH2gtU=",
|
"narHash": "sha256-0g2ljOHZZtEZZG9GKusKiNx1+VKm+MEKzCOL2KdkLRg=",
|
||||||
"owner": "Cloudef",
|
"owner": "Cloudef",
|
||||||
"repo": "zig2nix",
|
"repo": "zig2nix",
|
||||||
"rev": "5a0307b91ad2cd6c60fd5817b6a88108e254730a",
|
"rev": "7320da37a4d45afb0aa94d22861a0fe07152c038",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -6,13 +6,6 @@
|
||||||
flake,
|
flake,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
|
||||||
activate-snippet = ''
|
|
||||||
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
|
||||||
exec Hyprland
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
|
|
||||||
mkOizysModule config "hyprland" {
|
mkOizysModule config "hyprland" {
|
||||||
programs.hyprland = enabled;
|
programs.hyprland = enabled;
|
||||||
|
@ -62,20 +55,30 @@ mkOizysModule config "hyprland" {
|
||||||
#
|
#
|
||||||
# dunst
|
# 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 = [
|
nixpkgs.overlays = [
|
||||||
(flake.overlay "hyprland-contrib")
|
(flake.overlay "hyprland-contrib")
|
||||||
# (overlayFrom "nixpkgs-wayland")
|
# (overlayFrom "nixpkgs-wayland")
|
||||||
# (overlayFrom "hyprland")
|
# (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 {
|
config = mkIfIn "nushell" cfg {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
nushell
|
nushell
|
||||||
nufmt
|
|
||||||
nushellPlugins.polars
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) python3Packages;
|
inherit (pkgs) python3Packages;
|
||||||
llm-ollama = python3Packages.callPackage ../../pkgs/llm-plugins/llm-ollama { };
|
llm-ollama = python3Packages.callPackage ./llm-plugins/llm-ollama { };
|
||||||
llm-claude3 = python3Packages.callPackage ../../pkgs/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
|
||||||
|
|
|
@ -12,6 +12,7 @@ let
|
||||||
mkOption
|
mkOption
|
||||||
literalExpression
|
literalExpression
|
||||||
types
|
types
|
||||||
|
optionals
|
||||||
;
|
;
|
||||||
cfg = config.oizys.nix-ld;
|
cfg = config.oizys.nix-ld;
|
||||||
|
|
||||||
|
@ -103,8 +104,7 @@ in
|
||||||
|
|
||||||
config =
|
config =
|
||||||
let
|
let
|
||||||
libs =
|
libs = defaultLibraries ++ cfg.extra-libraries ++ (optionals cfg.overkill.enable overkillLibraries);
|
||||||
defaultLibraries ++ cfg.extra-libraries ++ (if cfg.overkill.enable then overkillLibraries else [ ]);
|
|
||||||
in
|
in
|
||||||
mkIf cfg.enable {
|
mkIf cfg.enable {
|
||||||
programs.nix-ld = enabled // {
|
programs.nix-ld = enabled // {
|
||||||
|
|
Loading…
Reference in a new issue