diff --git a/configuration.nix b/configuration.nix
index 603cb1b..925289c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,12 +2,13 @@
 
 {
   imports =
-    [
+    [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
 
   nixpkgs.config.allowUnfree = true;
 
+  # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   # boot.loader.grub.efiSupport = true;
@@ -19,6 +20,17 @@
   networking.hostName = "nixos"; # Define your hostname.
   #networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  # i18n = {
+  #   consoleFont = "Lat2-Terminus16";
+  #   consoleKeyMap = "us";
+  #   defaultLocale = "en_US.UTF-8";
+  # };
+
   # Set your time zone.
   time.timeZone = "Europe/Copenhagen";
 
@@ -31,33 +43,67 @@
     thunderbird
     git
     python3
-    woof        # share files on LAN
+    rxvt_unicode_with-plugins
+
+
+    woof # share files over http on localhost
+
+    # terminal tools
+    gotop
+    cava
+    
   ];
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
+  networking.networkmanager.enable = true;
 
   # Enable sound.
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  #services.xserver.enable = true;
+  # services.xserver.layout = "us";
+  # services.xserver.xkbOptions = "eurosign:e";
 
   # Enable touchpad support.
-  services.xserver.libinput.enable = true;
+  #services.xserver.libinput.enable = true;
 
   # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome3.enable = true;
+  #services.xserver.displayManager.gdm.enable = true;
+  #services.xserver.desktopManager.gnome3.enable = true;  
+  #nixpkgs.config.firefox.enableGnomeExtensions = true;
+  #services.gnome3.chrome-gnome-shell.enable = true;
 
-  # Do some gnome configuration
-  nixpkgs.config.firefox.enableGnomeExtensions = true;
-  services.gnome3.chrome-gnome-shell.enable = true;
+  services.xserver = {
+    enable = true;
 
+    xkbOptions = "ctrl:swapcaps";
+    layout = "us";
+    xkbVariant = "intl";    
+
+    desktopManager = {
+      default = "none";
+      xterm.enable = false;
+    };  
+
+    windowManager.i3 = {
+      enable = true;
+      package = pkgs.i3-gaps;
+      extraPackages = with pkgs; [
+        dmenu
+        i3status
+        i3lock
+        dunst
+	polybar
+      ];
+    };
+  };
+
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.valberg = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
+    extraGroups = [ "wheel" "networkmanager" ];
   };
 
   # This value determines the NixOS release with which your system is to be