From ca74cba96112e662c724089ce0a5bfe19761b302 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Sun, 2 Apr 2023 19:30:46 +0200
Subject: [PATCH] Refactoring

Removed unused stuff
---
 flake.nix                   |  1 +
 hmModules/shell/default.nix | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 15b99ba..665d910 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,6 +55,7 @@
   outputs = inputs @ {flakeParts, ...}:
     flakeParts.lib.mkFlake {inherit inputs;} {
       imports = [
+        # TODO export modules as flake outputs
         # ./modules
         # ./hmModules
         ./hosts
diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix
index e858e1c..a7064a7 100644
--- a/hmModules/shell/default.nix
+++ b/hmModules/shell/default.nix
@@ -15,17 +15,11 @@
     nix-direnv.enable = true;
   };
 
-  services.lorri.enable = false; # I'm not using it
-
   programs.exa = {
     enable = true;
     enableAliases = true;
   };
 
-  programs.zoxide.enable = true;
-
-  programs.zellij.enable = true;
-
   programs.fzf.enable = true;
 
   programs.vim.enable = true;
@@ -40,7 +34,7 @@
         error_symbol = "[λ](bold red)";
       };
       nix_shell = {
-        symbol = "❄";
+        symbol = "❄ ";
       };
     };
   };
@@ -49,6 +43,9 @@
   programs.nushell = {
     enable = true;
     configFile.text = ''
+      let carapace_completer = {|spans|
+         carapace $spans.0 nushell $spans | from json
+      }
       let-env config = {
         show_banner: false
         ls: {
@@ -83,7 +80,7 @@
           external: {
             enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up my be very slow
             max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
-            completer: null # check 'carapace_completer' above as an example
+            completer: $carapace_completer # check 'carapace_completer' above as an example
           }
         }
         filesize: {
@@ -95,7 +92,7 @@
   };
 
   programs.zsh = {
-    enable = true;
+    enable = false; # Disabled in favor on nushell but still here for posterity
     enableAutosuggestions = true;
     enableCompletion = true;
     enableSyntaxHighlighting = true;
@@ -149,6 +146,7 @@
     dig.dnsutils
     zsh-completions
     nix-zsh-completions
+    carapace # used by nushell
     # nom # FIXME disable on aarch64-linux, breaks everything :(
   ];
 }