mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-09 20:33:15 -06:00
Compare commits
3 commits
ea0f6262a8
...
98dc2b807b
Author | SHA1 | Date | |
---|---|---|---|
98dc2b807b | |||
433eeba01d | |||
fc0f011be5 |
5 changed files with 25 additions and 22 deletions
|
@ -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;
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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