diff --git a/configuration.nix b/configuration.nix
index 9440909..8c7cb79 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -33,8 +33,6 @@
   time.timeZone = "America/Los_Angeles";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  services.xserver.enable = true;
-
   # Framework Laptop 13 AMD AI 300 Series specific configurations
   # Enable AMD GPU support and power management
   hardware.graphics = {
@@ -78,6 +76,7 @@
 
   services.displayManager.gdm.enable = true;
   services.desktopManager.gnome.enable = true;
+  services.gnome.sushi.enable = true;
 
   # Remove default GNOME apps (keeping loupe and file-roller)
   environment.gnome.excludePackages = with pkgs; [
@@ -104,10 +103,6 @@
     nautilus # Using Nemo
   ];
 
-  services.xserver.xkb = {
-    layout = "us";
-  };
-
   services.printing.enable = true;
 
   services.pulseaudio.enable = false;
@@ -191,7 +186,7 @@
     };
   };
 
-# Disable power-profiles-daemon (conflicts with auto-cpufreq)
+  # Disable power-profiles-daemon (conflicts with auto-cpufreq)
   services.power-profiles-daemon.enable = false;
 
   # Enable power management (governor managed dynamically by auto-cpufreq)
@@ -206,7 +201,7 @@
 
   # RAM optimizations for 96GB system
   boot.kernel.sysctl = {
-"vm.vfs_cache_pressure" = 50; # Keep more filesystem cache in RAM
+    "vm.vfs_cache_pressure" = 50; # Keep more filesystem cache in RAM
     "vm.dirty_ratio" = 15; # Write to disk when 15% of RAM is dirty
     "vm.dirty_background_ratio" = 5; # Start writing when 5% dirty
   };
@@ -224,7 +219,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    git
     wget
     nh
   ];
diff --git a/flake.nix b/flake.nix
index 301f9d1..12257cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,51 +24,53 @@
     };
   };
 
-  outputs = inputs@{
-    self,
-    nixpkgs,
-    home-manager,
-    nixos-hardware,
-    ...
-  }: {
-    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
-    nixosConfigurations = {
-      framework = nixpkgs.lib.nixosSystem {
-        modules = [
-          { nixpkgs.hostPlatform = "x86_64-linux"; }
-          ./configuration.nix
-          nixos-hardware.nixosModules.framework-amd-ai-300-series
-          home-manager.nixosModules.home-manager
-          inputs.nix-index-database.nixosModules.default
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.backupFileExtension = "backup";
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users.jet = import ./home.nix;
-          }
-          {
-            nixpkgs.overlays = [
-              inputs.nur.overlays.default
-              inputs.claude-code-overlay.overlays.default
-            ];
-          }
-        ];
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      home-manager,
+      nixos-hardware,
+      ...
+    }:
+    {
+      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
+      nixosConfigurations = {
+        framework = nixpkgs.lib.nixosSystem {
+          modules = [
+            { nixpkgs.hostPlatform = "x86_64-linux"; }
+            ./configuration.nix
+            nixos-hardware.nixosModules.framework-amd-ai-300-series
+            home-manager.nixosModules.home-manager
+            inputs.nix-index-database.nixosModules.default
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.backupFileExtension = "backup";
+              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.users.jet = import ./home.nix;
+            }
+            {
+              nixpkgs.overlays = [
+                inputs.nur.overlays.default
+                inputs.claude-code-overlay.overlays.default
+              ];
+            }
+          ];
+        };
       };
-    };
 
-    devShells.x86_64-linux.default =
-      let
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        nhs = pkgs.writeShellScriptBin "nhs" ''
-          nh os switch --hostname framework --impure path:. "$@"
-        '';
-      in
-      pkgs.mkShell {
-        packages = [
-          pkgs.nh
-          nhs
-        ];
-      };
-  };
+      devShells.x86_64-linux.default =
+        let
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          nhs = pkgs.writeShellScriptBin "nhs" ''
+            nh os switch --hostname framework --impure path:. "$@"
+          '';
+        in
+        pkgs.mkShell {
+          packages = [
+            pkgs.nh
+            nhs
+          ];
+        };
+    };
 }
diff --git a/home.nix b/home.nix
index d382a7d..720b4f7 100644
--- a/home.nix
+++ b/home.nix
@@ -116,6 +116,17 @@
     TERMINAL = "kitty";
   };
 
+  programs.git = {
+    enable = true;
+    userName = "Jet Pham";
+    userEmail = "jet@extremist.software";
+    signing = {
+      key = "~/.ssh/id_ed25519.pub";
+      signByDefault = true;
+      format = "ssh";
+    };
+  };
+
   programs.helix = {
     enable = true;
     defaultEditor = true;