Compare commits

...

6 commits

Author SHA1 Message Date
c052754f93 flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    'e03cd8b3a6.tar.gz?narHash=sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M%3D' (2024-08-08)
  → '3b902683e9.tar.gz?narHash=sha256-FIXisGWmQpPjPcEKy/Xa6YvnUYg9KysfLsFq0biMIug%3D' (2024-08-08)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/b412353cee03010813974408d5ae63f7422b176d' (2024-08-08)
  → 'github:nix-community/nixpkgs-wayland/e28b410ad60004cca039fc6de2dd65f485779833' (2024-08-08)
2024-08-09 00:35:15 +00:00
ea0f6262a8
log message instead of noisy command ouptut 2024-08-08 15:08:11 -05:00
a21b4b3c18
these packages weren't being used 2024-08-08 15:06:10 -05:00
b5de96ccbf
don't autostart hyprland 2024-08-08 15:06:10 -05:00
222ca60f3c
move derivations to module 2024-08-08 15:06:10 -05:00
cf43fc941a
use optionals 2024-08-08 15:06:10 -05:00
8 changed files with 34 additions and 32 deletions

View file

@ -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

View file

@ -534,11 +534,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723140921, "lastModified": 1723158731,
"narHash": "sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M=", "narHash": "sha256-FIXisGWmQpPjPcEKy/Xa6YvnUYg9KysfLsFq0biMIug=",
"rev": "e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d", "rev": "3b902683e93ad21be3537ef77f3e5200fbbed900",
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@ -715,11 +715,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723137378, "lastModified": 1723151834,
"narHash": "sha256-+MkYW9iZwi0D0hLeS5S1Ov3VNJ3twdTlHW7dRKeiCBY=", "narHash": "sha256-KjUcXpdLx5QzkT0x3qctGm1AM9U8g8pSFy24fE2MFeM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "b412353cee03010813974408d5ae63f7422b176d", "rev": "e28b410ad60004cca039fc6de2dd65f485779833",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -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;
# };
#
} }

View file

@ -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
]; ];
}; };
} }

View file

@ -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

View file

@ -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 // {