diff --git a/flake.nix b/flake.nix
index 31d3b07..46d0712 100755
--- a/flake.nix
+++ b/flake.nix
@@ -90,13 +90,13 @@
               modules = [
                 nix-homebrew.darwinModules.nix-homebrew
                 (import-tree ./modules/system/darwin)
-                
+
                 (import-tree ./hosts/common)
                 (import-tree ./hosts/darwin/system)
               ]
               ++ [
                 home-manager.darwinModules.home-manager
-                
+
                 (import-tree ./hosts/common)
                 (import-tree ./hosts/darwin/home)
               ];
diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index 504a5ea..1596521 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -3,7 +3,6 @@
   home-manager.users.alistreaza = {
     imports = [
       (import-tree ../../../modules/home/common)
-      (import-tree ../../../modules/home/darwin)
     ];
 
     home = {
diff --git a/hosts/darwin/system/os.nix b/hosts/darwin/system/os.nix
index 7340212..1fb0688 100644
--- a/hosts/darwin/system/os.nix
+++ b/hosts/darwin/system/os.nix
@@ -11,7 +11,4 @@
   os.homebrew.obsidian.enable = true;
   os.homebrew.microsoft.enable = true;
   os.homebrew.keka.enable = true;
-
-  # System version
-  system.stateVersion = "25.11";
 }
diff --git a/modules/home/common/devenv.nix b/modules/home/common/devenv.nix
index e8ba206..9e5c7b0 100644
--- a/modules/home/common/devenv.nix
+++ b/modules/home/common/devenv.nix
@@ -14,7 +14,7 @@ in
   };
   config = mkIf cfg.enable {
 
-    environment.systemPackages = with pkgs; [
+    home.packages = with pkgs; [
       devenv
     ];
 
diff --git a/modules/home/common/git.nix b/modules/home/common/git.nix
index 5ef5c65..98fe1d7 100644
--- a/modules/home/common/git.nix
+++ b/modules/home/common/git.nix
@@ -14,7 +14,6 @@ in
   config = mkIf cfg.enable {
 
     programs.git = {
-      config.init.defaultBranch = "main";
       settings = {
         user = {
           name = "Laurent Gueret";