diff --git a/Laptop/configuration.nix b/Laptop/configuration.nix
index fd8fbf1..6449944 100644
--- a/Laptop/configuration.nix
+++ b/Laptop/configuration.nix
@@ -13,11 +13,15 @@
       ./modules/zsh.nix
     ];
 
-  nixpkgs.config.allowUnfree = true;
+    nixpkgs.config = {
+      allowUnfree = true;
+      android_sdk.accept_license = true;
+    };
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
 
   # Networking
 
@@ -34,8 +38,8 @@
       };
     };
     firewall = {
-      allowedTCPPorts = [ 1716 ];
-      allowedUDPPorts = [ 1716 ];
+      allowedTCPPorts = [ 1716 51820 24642 ];
+      allowedUDPPorts = [ 1716 51820 24642 ];
     };
   };
   
@@ -74,7 +78,7 @@
   services.xserver = {
     enable = true;
     layout = "us";
-    videoDrivers = [ "intel" "nv" ];
+    videoDrivers = [ "nvidia" ];
     libinput.enable = true;
     exportConfiguration = true;
     wacom.enable = true;
@@ -83,24 +87,24 @@
   };
 
   # Video driver
-  hardware = {
+  hardware = {/*
     bumblebee = {
       enable = true;
       driver = "nouveau";
-    };
+    };*/
     opengl = {
       enable = true;
       driSupport32Bit = true;
-    }; /*
+    };
     nvidia = {
       modesetting.enable = true;
-      optimus_prime = {
-        enable = true;
-        allowExternalGpu = true;
+      prime = {
+        offload.enable = true;
+        # allowExternalGpu = true;
         nvidiaBusId = "PCI:1:0:0";
         intelBusId = "PCI:0:2:0";
       };
-    }; */
+    };
   };
 
   programs = {
@@ -110,6 +114,8 @@
     };
   };
 
+  virtualisation.docker.enable = true;
+
   hardware.steam-hardware.enable = true;  
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -117,7 +123,7 @@
     isNormalUser = true;
     home = "/home/inex";
     description = "Inex Code";
-    extraGroups = [ "wheel" "networkmanager" "jackaudio" "audio" "video" "adbusers" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "networkmanager" "jackaudio" "audio" "video" "adbusers" "docker" ]; # Enable ‘sudo’ for the user.
   };
 
   # This value determines the NixOS release with which your system is to be
@@ -128,4 +134,3 @@
 
 
 }
-
diff --git a/Laptop/modules/gnome.nix b/Laptop/modules/gnome.nix
index 2c8b5d1..933ca28 100644
--- a/Laptop/modules/gnome.nix
+++ b/Laptop/modules/gnome.nix
@@ -6,7 +6,7 @@
     displayManager = {
       gdm = {
         enable = true;
-        wayland = true;
+        wayland = false;
       };
     };
     desktopManager = {
@@ -21,6 +21,7 @@
     gnome3.pomodoro
     gnome3.gnome-tweaks
     gnome3.networkmanager-openvpn
+    gnome3.evolution
     gnomeExtensions.gsconnect
     paper-icon-theme
   ];
diff --git a/Laptop/modules/my_vim.nix b/Laptop/modules/my_vim.nix
index d0c2acc..653e3dc 100644
--- a/Laptop/modules/my_vim.nix
+++ b/Laptop/modules/my_vim.nix
@@ -16,6 +16,7 @@ in neovim.override {
          "nerdtree"
          "vim-nix"
          "dart-vim-plugin"
+         "coc-nvim"
        ];
      }
    ];
diff --git a/Laptop/software.nix b/Laptop/software.nix
index cf5289b..4c54024 100644
--- a/Laptop/software.nix
+++ b/Laptop/software.nix
@@ -11,34 +11,49 @@ in {
     (pkgs.callPackage ./modules/my_vim.nix {})
     neofetch
     pciutils
-    openvpn
+    usbutils
+    bind
+    # openvpn
     git
     unzip
     tldr
     ffmpeg
+    wget
+    nix-bundle
+    nmap
+
+    # Wireguard
+    wireguard
+    wireguard-tools
 
     nextcloud-client
 
     # Encrypted folders
     encfs
-    gencfsm
+    #gencfsm
 
     # Browsers
     firefox
     transmission-gtk
+    youtube-dl
 
     # Messangers
     tdesktop
-    discord
-    riot-desktop
+    #discord
+    mumble
+    #riot-desktop
     qtox
+    dino
+    zoom-us
     
     # Games
     steam
     steam-run-native
     unstable.openttd
+    lutris
     vulkan-tools
-    lutris-unwrapped
+    wineWowPackages.full
+    wineWowPackages.fonts
     
     # Development
     vscode
@@ -47,8 +62,12 @@ in {
     texlive.combined.scheme-full
     gcc-unwrapped
     python3Full
+    # (import (builtins.fetchTarball "https://github.com/babariviere/nixpkgs/archive/flutter-init.tar.gz") {}).flutter
     #android-studio
     cmake
+    nodejs
+
+    ccls
 
     josm
     
@@ -59,21 +78,25 @@ in {
     # Graphics
     krita
     gmic_krita_qt
+    potrace
     
     # Audio
     audacity
-    lmms
+    # lmms
     picard
     cmus
 
     # Plugins
-    ladspaPlugins
-    lsp-plugins
+    # ladspaPlugins
+    # lsp-plugins
     
     # Documents
     anki
     libreoffice
     homebank
+    trilium
+    klavaro
+    liberation_ttf
   ];
 }