chore: some minor changes and refactoring

6 files changed, 49 insertions, 7 deletions

diff --git a/modules/communication/neomutt/.neomuttrc b/modules/communication/neomutt/.neomuttrc
index 8309936..6d3a5c0 100644
--- a/modules/communication/neomutt/.neomuttrc
+++ b/modules/communication/neomutt/.neomuttrc
@@ -15,9 +15,9 @@ set mailcap_path = "~/.config/neomutt/mailcap"
 auto_view text/plain
 alternative_order text/html image/png image/jpeg image/gif application/pdf
 
-set flag_chars = "󰓹󰀼󰆴󰁟󰇰󰇮󰍩󰍨󰇱󰗚"
-set to_chars = " "
-set crypt_chars = " "
+set flag_chars = "✔★✗⊘↩○●◇◆ "
+set to_chars   = " →⇉·↗≡↺"
+set crypt_chars = "SPsK "
 set attach_format   = "%u%D%I  %t%4n %T%.40d %> [%m/%M, %e%?C?, %C?, %s] "
 
 set index_format = " %5C │ %Z │  %{%d/%m/%y %H:%M} │  %-25.25a │  %s%* "
diff --git a/modules/development/pi-coding-agent/assertions.nix b/modules/development/pi-coding-agent/assertions.nix
new file mode 100644
index 0000000..aa2e5ba
--- /dev/null
+++ b/modules/development/pi-coding-agent/assertions.nix
@@ -0,0 +1,17 @@
+# Validates pi-coding-agent dependencies
+{ config, ... }:
+let
+  cfg = config.development.pi-coding-agent;
+in
+{
+  assertions = [
+    {
+      assertion = !cfg.enable || config.terminal.kitty.enable;
+      message = ''
+        development.pi-coding-agent.enable creates a desktop entry using kitty,
+        but terminal.kitty.enable is not set.
+        Enable terminal.kitty or disable the desktop entry.
+      '';
+    }
+  ];
+}
diff --git a/modules/development/pi-coding-agent/default.nix b/modules/development/pi-coding-agent/default.nix
index e560a98..d3b01fd 100644
--- a/modules/development/pi-coding-agent/default.nix
+++ b/modules/development/pi-coding-agent/default.nix
@@ -9,6 +9,8 @@ let
   configDir = "${config.xdg.configHome}/pi";
 in
 {
+  imports = [ ./assertions.nix ];
+
   options.development.pi-coding-agent = {
     enable = lib.mkEnableOption "Pi Coding Agent";
 
@@ -22,9 +24,15 @@ in
 
   config = lib.mkIf cfg.enable {
     home.file = {
-      "${configDir}/skills".source = ./skills;
-      "${configDir}/prompts".source = ./prompts;
-      "${configDir}/config/pi-subagent".source = ./roles;
+      "${configDir}/skills" = {
+        source = ./skills;
+      };
+      "${configDir}/prompts" = {
+        source = ./prompts;
+      };
+      "${configDir}/config/pi-subagent" = {
+        source = ./roles;
+      };
     };
 
     programs.pi-coding-agent = {
diff --git a/modules/terminal/kitty/assertions.nix b/modules/terminal/kitty/assertions.nix
new file mode 100644
index 0000000..97f1ba0
--- /dev/null
+++ b/modules/terminal/kitty/assertions.nix
@@ -0,0 +1,17 @@
+# Validates kitty shell option requires zsh to be enabled if explicitly configured
+{ config, ... }:
+let
+  cfg = config.terminal.kitty;
+in
+{
+  assertions = [
+    {
+      assertion =
+        !(cfg.enable && config.terminal.kitty.settings.shell != null && !config.terminal.zsh.enable);
+      message = ''
+        terminal.kitty.enable has shell explicitly set to zsh but terminal.zsh.enable is not set.
+        Enable terminal.zsh or configure a different shell for kitty.
+      '';
+    }
+  ];
+}
diff --git a/modules/terminal/kitty/default.nix b/modules/terminal/kitty/default.nix
index 7e4c701..d36fd08 100644
--- a/modules/terminal/kitty/default.nix
+++ b/modules/terminal/kitty/default.nix
@@ -12,6 +12,7 @@ in
   imports = [
     ./colors.nix
     ./keybindings.nix
+    ./assertions.nix
   ];
 
   options.terminal.kitty = {
diff --git a/users/arpit/default.nix b/users/arpit/default.nix
index 18c9e7c..75cfcbc 100644
--- a/users/arpit/default.nix
+++ b/users/arpit/default.nix
@@ -33,7 +33,6 @@
 
   # Development
   development.bruno.enable = true;
-  development.delta.enable = true;
   development.direnv.enable = true;
   development.git.enable = true;
   development.git.signing.sign-by-default = true;