diff --git a/dotfiles/config/alacritty/alacritty.toml b/dotfiles/config/alacritty/alacritty.toml
deleted file mode 100644
index daa69fc..0000000
--- a/dotfiles/config/alacritty/alacritty.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[window]
-opacity = 0.90
-
-[env]
-XTERM = "xterm-256color"
-
-[font]
-size = 12
diff --git a/home.nix b/home.nix
index 257dd7a..dbf0dfc 100644
--- a/home.nix
+++ b/home.nix
@@ -6,24 +6,27 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/17 18:15:39 by tomoron          ###   ########.fr        #
+#    Updated: 2024/10/17 18:41:29 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 { config, lib, pkgs, username,homeDir, ... }:
 
 {
+  imports = [
+	modules/git.nix
+	modules/picom.nix
+	modules/alacritty.nix
+  ];
+  
   home.username = "${username}";
   home.homeDirectory = "${homeDir}";
 
   home.stateVersion = "24.05";
 
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
   home.packages = with pkgs;[
     polybarFull
     sxhkd
-    alacritty
     nitrogen
     nerdfonts
     rofi
@@ -35,12 +38,10 @@
   ];
   
   home.file = {
-    # ".screenrc".source = dotfiles/screenrc;
     ".config/bspwm/bspwmrc".source = lib.mkDefault dotfiles/config/bspwm/bspwmrc;
     ".config/sxhkd".source = lib.mkDefault dotfiles/config/sxhkd;
     ".config/polybar".source = dotfiles/config/polybar;
     ".config/nitrogen".source = lib.mkDefault dotfiles/config/nitrogen;
-    ".config/alacritty".source = lib.mkDefault dotfiles/config/alacritty;
     ".config/nvim/init.vim".source = dotfiles/config/nvim/init.vim;
     ".config/nvim/plugin/stdheader.vim".source = dotfiles/config/nvim/plugin/stdheader.vim;
     ".local/share/nvim/site/autoload/plug.vim".source = dotfiles/local/share/nvim/site/autoload/plug.vim;
@@ -53,50 +54,7 @@
 		rev = "c8239a45edced3502894e1716a8b661fdea8f1c9";
 		ref = "master";
     }}/themes";
-
-
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-  
-  programs.git = {
-    enable = true;
-    userEmail = "tomoron@student.42angouleme.fr";
-    userName = "tomoron";
-	extraConfig.init.defaultBranch="master";
-    aliases = {
-	  fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
-	  back = "reset HEAD~";
-    };
   };
 
-  services.picom = {
-    enable = true;
-	package = pkgs.picom-pijulius;
-    backend = lib.mkDefault "glx";
-    vSync = true;
-    settings = {
-      blur = {
-        method = lib.mkDefault "gaussian";
-		size = lib.mkDefault 20;
-		deviation = lib.mkDefault 5.0;
-      };
-	  corner-radius=20;
-      rounded-corners-exclude = [
-        "window_type = 'dock'"
-	"class_g = 'Dunst'"
-      ];
-      blur-background-exclude = [
-        "class_g = 'activate-linux'"
-      ];
-    };
-  };
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
-  # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }
diff --git a/homes/laptop/laptop.nix b/homes/laptop/laptop.nix
index 40e4f26..4782b1a 100644
--- a/homes/laptop/laptop.nix
+++ b/homes/laptop/laptop.nix
@@ -2,7 +2,6 @@
 
 {
 	imports = [ ../modules/game.nix ];
-	home.file = {
-    	".config/alacritty".source = dotfiles/config/alacritty;
-	};
+
+    programs.alacritty.settings.font.size = 8;
 }
diff --git a/modules/alacritty.nix b/modules/alacritty.nix
new file mode 100644
index 0000000..f03372e
--- /dev/null
+++ b/modules/alacritty.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, username,homeDir, ... }:
+
+{
+  programs.alacritty = {
+    enable = true;
+	settings = {
+      window.opacity = 0.9;
+	  env.XTERM = "xterm-256color";
+	  font.size = lib.mkDefault 12;
+	};
+  };
+}
diff --git a/modules/git.nix b/modules/git.nix
new file mode 100644
index 0000000..4d75de6
--- /dev/null
+++ b/modules/git.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, username,homeDir, ... }:
+
+{
+  programs.git = {
+    enable = true;
+    userEmail = "tomoron@student.42angouleme.fr";
+    userName = "tomoron";
+	extraConfig.init.defaultBranch="master";
+    aliases = {
+	  fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
+	  back = "reset HEAD~";
+    };
+  };
+}
diff --git a/modules/picom.nix b/modules/picom.nix
new file mode 100644
index 0000000..4e8d023
--- /dev/null
+++ b/modules/picom.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, username,homeDir, ... }:
+
+{
+  services.picom = {
+    enable = true;
+	package = pkgs.picom-pijulius;
+    backend = lib.mkDefault "glx";
+    vSync = true;
+    settings = {
+      blur = {
+        method = lib.mkDefault "gaussian";
+		size = lib.mkDefault 20;
+		deviation = lib.mkDefault 5.0;
+      };
+	  corner-radius=20;
+      rounded-corners-exclude = [
+        "window_type = 'dock'"
+	"class_g = 'Dunst'"
+      ];
+      blur-background-exclude = [
+        "class_g = 'activate-linux'"
+      ];
+    };
+  };
+}