diff --git a/home-manager/home.nix b/home-manager/home.nix
index 99439f9..3fd6764 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -89,6 +89,17 @@
       nils = {
         id = 0;
         name = "nils";
+
+        bookmarks = [
+          {
+            name = "NixOS options";
+            url = "https://search.nixos.org/options";
+          }
+          {
+            name = "home-manager options";
+            url = "https://rycee.gitlab.io/home-manager/options.html";
+          }
+        ];
       };
     };
   };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 657d256..81c7615 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -72,20 +72,21 @@
   boot.loader.grub.useOSProber = true;
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
   services.xserver = {
+    enable = true;
+
+    # Enable the GNOME Desktop Environment.
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+
+    # Configure keymap in X11
     layout = "ch";
     xkbVariant = "";
+
+    # ndivia drivers
+    videoDrivers = [ "nvidia" ];
   };
 
-  # ndivia drivers
-  services.xserver.videoDrivers = [ "nvidia" ];
   hardware.opengl.enable = true;
 
   # TODO: Create a fancontrol config