diff --git a/home-manager/modules/nushell/config.nu b/home-manager/modules/nushell/config.nu
index 18d31ef..d3226e7 100644
--- a/home-manager/modules/nushell/config.nu
+++ b/home-manager/modules/nushell/config.nu
@@ -86,10 +86,9 @@ let dark_theme = {
 }
 
 # External completer example
-# let carapace_completer = {|spans|
-#     carapace $spans.0 nushell $spans | from json
-# }
-
+let carapace_completer = {|spans| 
+    carapace $spans.0 nushell $spans | from json
+}
 
 # The default config record. This is where much of your global configuration is setup.
 let-env config = {
@@ -182,8 +181,8 @@ let-env config = {
     algorithm: "fuzzy"  # prefix or fuzzy
     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 # $carapace_completer # check 'carapace_completer' above as an example
+      # max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
+      completer: $carapace_completer # check 'carapace_completer' above as an example
     }
   }
   filesize: {
diff --git a/home-manager/modules/nushell/default.nix b/home-manager/modules/nushell/default.nix
index b8c6676..63ce788 100644
--- a/home-manager/modules/nushell/default.nix
+++ b/home-manager/modules/nushell/default.nix
@@ -26,6 +26,8 @@ in
       extraConfig = ''
         alias vim = nvim
         alias tree = ${pkgs.exa}/bin/exa -Fb --git --tree
+
+        let-env LS_COLORS = (${pkgs.vivid}/bin/vivid generate dracula | str trim)
       '';
     };
 
diff --git a/home-manager/modules/rofi/default.nix b/home-manager/modules/rofi/default.nix
index cc80037..5c66402 100644
--- a/home-manager/modules/rofi/default.nix
+++ b/home-manager/modules/rofi/default.nix
@@ -14,6 +14,10 @@ in
       type = types.package;
       default = pkgs.rofi;
     };
+    terminal = mkOption {
+      description = "Path to the terminal program rofi will use to execute console applications";
+      type = types.path;
+    };
   };
 
   config = mkIf cfg.enable {
@@ -21,7 +25,7 @@ in
       enable = true;
       package = pkgs.rofi-wayland;
       theme = ./launch.rasi;
-      terminal = "${pkgs.alacritty}/bin/alacritty";
+      terminal = cfg.terminal;
       extraConfig = {
         modi = "drun";
         font = "Overpass Nerd Font 10";
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 679f210..30bc38d 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -26,7 +26,8 @@ in
 
         eboskma = {
           programs = {
-            alacritty.enable = true;
+            alacritty.enable = false;
+            atuin.enable = true;
             bat.enable = true;
             cargo = {
               enable = true;
@@ -105,6 +106,7 @@ in
             rofi = {
               enable = true;
               package = pkgs.rofi-wayland;
+              terminal = config.home-manager.users.erwin.wayland.windowManager.sway.config.terminal;
             };
             vscode.enable = true;
             solvespace.enable = true;
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index 2ef948e..7264f18 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -23,6 +23,7 @@ in
         var.workSystem = true;
         programs = {
           alacritty.enable = true;
+          atuin.enable = true;
           bat.enable = true;
           cargo = {
             enable = true;
@@ -74,7 +75,10 @@ in
               }
             ];
           };
-          rofi.enable = true;
+          rofi = {
+            enable = true;
+            terminal = config.home-manager.users.erwin.xsession.windowManager.i3.config.terminal;
+          };
           ssh.enable = true;
           starship.enable = true;
           zellij = {