diff --git a/.gitignore b/.gitignore
index 577b0a0..0e4b717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hardware-configuration.nix
+device.nix
diff --git a/configuration.nix b/configuration.nix
index 16e9b24..45cb7f9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,13 +2,13 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ./device.nix
+  ];
 
   # Bootloader.
   boot.loader.efi.canTouchEfiVariables = true;
@@ -22,9 +22,6 @@
   # Use latest kernel.
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  networking.hostName = "Esme"; # 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";
@@ -130,7 +127,6 @@
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
       kdePackages.kate
-    #  thunderbird
     ];
   };
 
@@ -145,7 +141,6 @@
   environment.systemPackages = with pkgs; [
     anthy
     cachix
-    code
     discord
     ffmpeg-full
     file
@@ -162,6 +157,7 @@
     hunspellDicts.en-us
     iw
     jq
+    koka
     nix-index
     ntfs3g
     p7zip
@@ -172,18 +168,29 @@
     vim
     vlc
     wget
+
+    (vscode-with-extensions.override {
+      vscodeExtensions = with pkgs.vscode-extensions; [
+        golang.go
+        bbenoist.nix
+
+        (pkgs.vscode-utils.extensionFromVscodeMarketplace {
+          name = "silver-rainbow";
+          publisher = "zephyrtronium";
+          version = "0.7.1";
+          sha256 = "sha256-CIqWgh2lw1jr4FrGzpZk9KV4K/nrVFC0JBKDd/fAhGY=";
+        })
+        (pkgs.vscode-utils.extensionFromVscodeMarketplace {
+          name = "language-koka";
+          publisher = "koka";
+          version = "3.2.2";
+          sha256 = "sha256-N2gQPi5clua8xBxWigJcTKzqseg3cfcFBVupWDvhxkM=";
+        })
+      ];
+    })
   ];
 
   programs = {
-    vscode = {
-      enable = true;
-      extensions = with pkgs.vscode-extensions; [
-        golang.go
-        bbenoist.nix
-        #koka.language-koka
-        #zephyrtronium.silver-rainbow
-      ];
-    };
     tmux.enable = true;
     steam.enable = true;
   };