diff --git a/base.nix b/base.nix
index 8600c7b..eb38d1d 100644
--- a/base.nix
+++ b/base.nix
@@ -2,7 +2,6 @@
 {
   ######################################## Packages ###############################################
   environment.systemPackages = with pkgs; [
-    alacritty
     tmux
     git
     nvi
diff --git a/desktop.nix b/desktop.nix
index 6ddc483..e686681 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -24,6 +24,7 @@ in
   imports = [ ./program-config-files/firefox.nix ];
 
   environment.systemPackages = with pkgs; [
+    alacritty
     i3status
     rofi
     arandr
@@ -42,7 +43,6 @@ in
     networkmanagerapplet
     flameshot
     speedcrunch
-    #    brave
 
     zotero
     kile
diff --git a/program-config-files/alacritty.nix b/program-config-files/alacritty.nix
new file mode 100644
index 0000000..22a026e
--- /dev/null
+++ b/program-config-files/alacritty.nix
@@ -0,0 +1 @@
+{ config, pkgs, ... }: pkgs.writeText "alacritty-conf" ''''
diff --git a/program-config-files/i3.nix b/program-config-files/i3.nix
index 6b38aff..8f32321 100644
--- a/program-config-files/i3.nix
+++ b/program-config-files/i3.nix
@@ -1,5 +1,11 @@
 { config, pkgs, ... }:
 let
+  alacritty-conf = "${
+    (import ./alacritty.nix {
+      inherit config;
+      inherit pkgs;
+    })
+  }";
   i3status-conf = "${pkgs.writeText "i3status-conf" ''
     # It is important that this file is edited as UTF-8.
     # The following line should contain a sharp s:
@@ -81,7 +87,8 @@ pkgs.writeText "i3-conf" ''
   bindcode 232 exec --no-startup-id brightnessctl set 5%-
   bindcode 233 exec --no-startup-id brightnessctl set 5%+
 
-  bindsym $mod+Return exec alacritty
+  bindsym $mod+Return exec "alacritty --config-file ${alacritty-conf}"
+  bindsym $mod+Shift+Return exec "alacritty --config-file ${alacritty-conf} --working-directory $PWD"
   bindsym $mod+d exec --no-startup-id "rofi -theme 'Arc-Dark' -show combi -combi-modes 'run' -modes combi"
 
   bindsym $mod+Shift+p mode "$mode_system"