diff --git a/config/nix/hm/common.nix b/config/nix/hm/common.nix
index e49e937..274152a 100644
--- a/config/nix/hm/common.nix
+++ b/config/nix/hm/common.nix
@@ -1,7 +1,4 @@
 { pkgs, config, ... }:
-let
-  gnupghome = "${config.xdg.dataHome}/gnupg";
-in
 {
   home.stateVersion = "23.05";
 
@@ -22,7 +19,7 @@ in
     };
     gpg = {
       enable = true;
-      homedir = gnupghome;
+      homedir = "${config.xdg.dataHome}/gnupg";
       settings = {
         # Remove fluff
         no-greeting = true;
diff --git a/config/nix/hm/desktop.nix b/config/nix/hm/desktop.nix
index 4165f1a..b7ed837 100644
--- a/config/nix/hm/desktop.nix
+++ b/config/nix/hm/desktop.nix
@@ -1,6 +1,19 @@
 { pkgs, ... }:
 {
-  xsession.windowManager.i3.enable = true;
+  xsession.windowManager.i3 = {
+    enable = true;
+    config = {
+      terminal = "alacritty";
+    };
+  };
+
+  programs = {
+    # Browser
+    qutebrowser.enable = true;
+
+    # Terminal
+    alacritty.enable = true;
+  };
 
   home.packages = with pkgs; [
     # remote
@@ -24,7 +37,6 @@
 
     # browsers
     firefox
-    qutebrowser
 
     # fonts
     dejavu_fonts
@@ -61,10 +73,10 @@
     xorg.xinit
     xorg.xbacklight
 
-    alacritty
 
     # organisation
     rofi-pass # TODO Try autopass.cr
     thunderbird
   ];
+
 }
diff --git a/config/nix/hm/loader.nix b/config/nix/hm/loader.nix
index f6f3089..717f6c9 100644
--- a/config/nix/hm/loader.nix
+++ b/config/nix/hm/loader.nix
@@ -2,8 +2,9 @@
 {
   imports = [
     ./common.nix
+    ./desktop.nix
     ./dev.nix
     ./extra.nix
-    ./desktop.nix
+    ./style.nix
   ];
 }
diff --git a/config/nix/hm/style.nix b/config/nix/hm/style.nix
new file mode 100644
index 0000000..c9a855c
--- /dev/null
+++ b/config/nix/hm/style.nix
@@ -0,0 +1,22 @@
+{ pkgs, config, ... }:
+let
+  stylix = builtins.fetchGit {
+    url = "https://github.com/danth/stylix.git";
+    ref = "release-23.05";
+  };
+in
+{
+  imports = [ (import stylix).homeManagerModules.stylix ];
+
+  stylix = {
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/solarized-dark.yaml";
+    image = builtins.fetchurl {
+      url = "https://get.wallhere.com/photo/sunlight-abstract-minimalism-green-simple-circle-light-leaf-wave-material-line-wing-computer-wallpaper-font-close-up-macro-photography-124350.png";
+      sha256 = "sha256:1zfq3f3v34i45mi72pkfqphm8kbhczsg260xjfl6dbydy91d7y93";
+    };
+    # FIXME This doesn't work
+  };
+
+  # Fix https://nix-community.github.io/home-manager/index.html#_why_do_i_get_an_error_message_about_literal_ca_desrt_dconf_literal_or_literal_dconf_service_literal
+  home.packages = [ pkgs.dconf ];
+}
diff --git a/config/nix/os/common.nix b/config/nix/os/common.nix
index 2b8a311..eb435b0 100644
--- a/config/nix/os/common.nix
+++ b/config/nix/os/common.nix
@@ -43,7 +43,6 @@
   services = {
     # Enable the OpenSSH daemon
     openssh.enable = true;
-    getty.autologinUser = "geoffrey"; # DEBUG
 
     # Time sychronisation
     chrony = {
diff --git a/config/nix/os/desktop.nix b/config/nix/os/desktop.nix
index e88abd3..e7379ce 100644
--- a/config/nix/os/desktop.nix
+++ b/config/nix/os/desktop.nix
@@ -4,6 +4,11 @@
   services.xserver.enable = true;
 
   services.xserver = {
+    windowManager.i3.enable = true;
+    desktopManager.gnome.enable = true;
+    displayManager.defaultSession = "none+i3";
+
+    # Keyboard layout
     extraLayouts.qwerty-fr = {
       description = "QWERTY-fr";
       languages = [ "fr" ];
@@ -30,7 +35,4 @@
   sound.enable = true;
   hardware.pulseaudio.enable = true;
   environment.systemPackages = with pkgs; [ pavucontrol ];
-
-  services.xserver.displayManager.startx.enable = true;
-
 }
diff --git a/config/nix/os/geoffrey.nix b/config/nix/os/geoffrey.nix
index b2ff975..d944d19 100644
--- a/config/nix/os/geoffrey.nix
+++ b/config/nix/os/geoffrey.nix
@@ -9,7 +9,6 @@
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
     shell = pkgs.zsh;
 
-    initialPassword = "cartable"; # DEBUG
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE41gxrO8oZ5n3saapSwZDViOQphm6RzqgsBUyA88pU geoffrey@frogeye.fr"
     ];
@@ -30,4 +29,7 @@
     # Adds consistency
     useGlobalPkgs = true;
   };
+
+  # FIXME Make sure I'm the only user & everything is encrypted
+  services.xserver.displayManager.autoLogin.user = "geoffrey";
 }