diff --git a/modules/darwin/alacritty.nix b/modules/darwin/alacritty.nix
index cd20ad3..2a783c4 100644
--- a/modules/darwin/alacritty.nix
+++ b/modules/darwin/alacritty.nix
@@ -1,10 +1,23 @@
-{ config, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  home-manager.users.${config.user}.programs.alacritty.settings.key_bindings =
-    [{
-      key = "F";
-      mods = "Super";
-      action = "ToggleSimpleFullscreen";
-    }];
+  # MacOS-specific settings for Alacritty
+  home-manager.users.${config.user} = {
+    programs.alacritty.settings = {
+      font.size = lib.mkForce 18.0;
+      shell.program = "${pkgs.fish}/bin/fish";
+      key_bindings = [
+        {
+          key = "F";
+          mods = "Super";
+          action = "ToggleSimpleFullscreen";
+        }
+        {
+          key = "L";
+          mods = "Super";
+          chars = "\\x1F";
+        }
+      ];
+    };
+  };
 
 }
diff --git a/modules/darwin/utilities.nix b/modules/darwin/utilities.nix
index 0020840..8d95bd4 100644
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@@ -17,25 +17,6 @@
       (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; })
     ];
 
-    programs.alacritty.settings = {
-      shell.program = "${pkgs.fish}/bin/fish";
-      keybindings = [
-        {
-          key = "F";
-          mods = "Super";
-          action = "ToggleSimpleFullscreen";
-        }
-        {
-          key = "L";
-          mods = "Super";
-          chars = "\\x1F";
-        }
-      ];
-    };
-
   };
 
-  #fonts.fonts = with pkgs;
-  #  [ (nerdfonts.override { fonts = [ "Victor Mono" ]; }) ];
-
 }
diff --git a/modules/editor/neovim/telescope.lua b/modules/editor/neovim/telescope.lua
index 69afb5f..c81d568 100644
--- a/modules/editor/neovim/telescope.lua
+++ b/modules/editor/neovim/telescope.lua
@@ -4,6 +4,7 @@
 
 use({
     "nvim-telescope/telescope.nvim",
+    branch = "master",
     requires = { "nvim-lua/plenary.nvim" },
     config = function()
         -- Telescope: quit instantly with escape
diff --git a/modules/shell/fish/default.nix b/modules/shell/fish/default.nix
index 6ee7150..c81d49f 100644
--- a/modules/shell/fish/default.nix
+++ b/modules/shell/fish/default.nix
@@ -57,6 +57,7 @@
         };
       };
       interactiveShellInit = ''
+        fish_vi_key_bindings
         bind yy fish_clipboard_copy
         bind Y fish_clipboard_copy
         bind -M visual y fish_clipboard_copy