.github/workflows/update.yml

@@ -34,8 +34,7 @@ jobs:
       - name: Update nix flake
         run: |
           printf '# Flake Lock\n\n```txt\n' >> $GITHUB_STEP_SUMMARY
-          nix flake update --commit-lock-file
-          git show -s --format='%B' >> $GITHUB_STEP_SUMMARY
+          nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY
           printf '```\n' >> $GITHUB_STEP_SUMMARY
 
       - name: Pre-build oizys

flake.lock

@@ -534,11 +534,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1723158731,
-        "narHash": "sha256-FIXisGWmQpPjPcEKy/Xa6YvnUYg9KysfLsFq0biMIug=",
-        "rev": "3b902683e93ad21be3537ef77f3e5200fbbed900",
+        "lastModified": 1723140921,
+        "narHash": "sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M=",
+        "rev": "e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3b902683e93ad21be3537ef77f3e5200fbbed900.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -715,11 +715,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1723151834,
-        "narHash": "sha256-KjUcXpdLx5QzkT0x3qctGm1AM9U8g8pSFy24fE2MFeM=",
+        "lastModified": 1723137378,
+        "narHash": "sha256-+MkYW9iZwi0D0hLeS5S1Ov3VNJ3twdTlHW7dRKeiCBY=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "e28b410ad60004cca039fc6de2dd65f485779833",
+        "rev": "b412353cee03010813974408d5ae63f7422b176d",
         "type": "github"
       },
       "original": {

modules/desktop/window-managers/hyprland.nix

@@ -6,6 +6,13 @@
   flake,
   ...
 }:
+let
+  activate-snippet = ''
+    if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
+      exec Hyprland
+    fi
+  '';
+in
 
 mkOizysModule config "hyprland" {
   programs.hyprland = enabled;
@@ -55,30 +62,20 @@ 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;
-  #   };
-  #
-
 }

modules/languages/nushell.nix

@@ -12,6 +12,8 @@ in
   config = mkIfIn "nushell" cfg {
     environment.systemPackages = with pkgs; [
       nushell
+      nufmt
+      nushellPlugins.polars
     ];
   };
 }

modules/llm/default.nix

@@ -8,8 +8,8 @@
 
 let
   inherit (pkgs) python3Packages;
-  llm-ollama = python3Packages.callPackage ./llm-plugins/llm-ollama { };
-  llm-claude3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { };
+  llm-ollama = python3Packages.callPackage ../../pkgs/llm-plugins/llm-ollama { };
+  llm-claude3 = python3Packages.callPackage ../../pkgs/llm-plugins/llm-claude-3 { };
   llm = (
     pkgs.llm.withPlugins [
       llm-ollama

modules/nix-ld.nix

@@ -12,7 +12,6 @@ let
     mkOption
     literalExpression
     types
-    optionals
     ;
   cfg = config.oizys.nix-ld;
 
@@ -104,7 +103,8 @@ in
 
   config =
     let
-      libs = defaultLibraries ++ cfg.extra-libraries ++ (optionals cfg.overkill.enable overkillLibraries);
+      libs =
+        defaultLibraries ++ cfg.extra-libraries ++ (if cfg.overkill.enable then overkillLibraries else [ ]);
     in
     mkIf cfg.enable {
       programs.nix-ld = enabled // {