zsh fixes

Author: mbund

.gitattributes

@@ -1,2 +1,2 @@
 *.age filter=age diff=age
-/users/mbund/cli/p10k.zsh linguist-vendored
+/users/mbund/cli/p10k-config/p10k.zsh linguist-vendored

core/default.nix

@@ -4,7 +4,6 @@
     ./nix.nix
     ./networking.nix
     ./openssh.nix
-    ./zsh.nix
   ];
 
   boot.kernelParams = [ "log_buf_len=10M" ];

core/zsh.nix

@@ -28,14 +28,14 @@
         };
       }
       {
-        file = "powerlevel10k.zsh-theme";
         name = "powerlevel10k";
-        src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
+        src = pkgs.zsh-powerlevel10k;
+        file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
       }
       {
-        file = "p10k.zsh";
         name = "powerlevel10k-config";
-        src = ./p10k.zsh;
+        src = ./p10k-config;
+        file = "p10k.zsh";
       }
     ];
 

users/mbund/cli/p10k.zsh users/mbund/cli/p10k-config/p10k.zsh

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, self, impermanence, ... }:
+{ config, lib, self, impermanence, ... }:
 with lib;
 let
   theme = "catppuccin";
@@ -36,7 +36,6 @@ in
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2kbXZV9yOofK3s37lz5DDogOIp9EKuUxaOhVdczKDr"
     ];
-    shell = mkIf config.programs.zsh.enable pkgs.zsh;
     uid = 1000;
 
     passwordFile = config.age.secrets.mbundPassword.path;

users/mbund/cli/zsh.nix

@@ -7,6 +7,8 @@ in
   programs.alacritty = {
     enable = true;
     settings = {
+      shell.program = "zsh";
+
       window = {
         decorations = "none";
         dynamic_padding = true;
@@ -59,6 +61,8 @@ in
     font.name = font;
     font.size = 11;
     settings = {
+      shell = "zsh";
+
       dynamic_background_opacity = "yes";
       hide_window_decorations = "yes";