diff --git a/home/common-linux.nix b/home/common-linux.nix
index 2e19faf..7543a9d 100644
--- a/home/common-linux.nix
+++ b/home/common-linux.nix
@@ -9,6 +9,11 @@ with lib; {
     };
     services.gpg-agent.enable = true;
     services.gpg-agent.pinentryFlavor = "gnome3";
+
+    # Git "safe-directory"
+    programs.git.extraConfig.safe.directory = [
+      "${config.home.homeDirectory}/.config/nixpkgs"
+    ];
   });
 }
 
diff --git a/home/modules/linux/graphical/alacritty.nix b/home/modules/linux/graphical/alacritty.nix
index f150e5e..a562730 100644
--- a/home/modules/linux/graphical/alacritty.nix
+++ b/home/modules/linux/graphical/alacritty.nix
@@ -1,13 +1,27 @@
 { pkgs, config, lib, ... }:
 
 with lib;
+let
+  cfg = config.linux.graphical.alacritty;
+in
 {
-  programs.alacritty = mkIf (config.linux.graphical.type != null) {
+  options.linux.graphical.alacritty = {
+    enable = mkOption {
+      type = types.bool;
+      default = true;
+    };
+    package = mkOption {
+      type = types.package;
+      default = pkgs.alacritty;
+    };
+  };
+  config.programs.alacritty = mkIf (config.linux.graphical.type != null && cfg.enable) {
     enable = true;
-    package = pkgs.unstable.alacritty;
+    package = cfg.package;
 
     settings = {
-      window.opacity = 0.8;
+      window.opacity = mkIf (strings.hasPrefix "0.10" cfg.package.version) 0.9;
+      background_opacity = mkIf (strings.hasPrefix "0.9" cfg.package.version) 0.9;
       font = {
         size = 14.0;
         normal.family = "Fantasque Sans Mono Nerd Font";