diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 9d48a03..c791761 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -30,7 +30,7 @@ in {
     };
 
     packageOverrides = pkgs: with pkgs; {
-      myPython36 = python36Full.withPackages (ps: with ps; [
+      myPython = python37Full.withPackages (ps: with ps; [
         pep8 yapf flake8
         # autopep8 (broken)
         # pylint (broken)
@@ -94,14 +94,6 @@ in {
       gitRepo
       git-lfs
 
-      # TODO: move Cloud/Remote System Management to a dev environment
-      # google-cloud-sdk
-      # ansible
-      # nixops
-      # terraform
-      # awscli
-      # hcloud
-
       # Process/System Administration
       htop
       gnome3.gnome-tweak-tool
@@ -221,7 +213,7 @@ in {
       exiv2
       graphviz
       inkscape
-      ## barcode
+      # barcode
       qrencode
       zbar
       feh
@@ -231,7 +223,7 @@ in {
       # Modelling Tools
       # plantuml
       # umlet
-      staruml
+      # staruml
       # eclipses.eclipse-modeling
       # dia
       # astah-community
@@ -286,10 +278,6 @@ in {
       seafile-client
       grive2
       dropbox
-      # gocryptfs
-      # hubicfuse
-      # s3ql
-      # rclone
       rsync
 
       # Filesystem Tools
@@ -305,43 +293,12 @@ in {
       gptfdisk
       gparted
 
-      # games
-      zeroad
-
-      # Compilers & Toolchains
-      autoconf
-      automake
-      libtool
-      gcc
-      pkgconfig
-      binutils
-      valgrind
-      gdb
-      cgdb
-      man-pages
-      gnumake
-      shellcheck
-      bazel
 
       ## Android
       androidenv.androidPkgs_9_0.platform-tools
 
-      ## Java
-      # jre
-      # openjdk
-
-      ## Ruby
-      # ruby
-
       ## Python
-      myPython36
-      pypi2nix
-
-      ## Webdev
-      # TODO: move this to dev environment
-      # nodejs-8_x
-      # npm2nix
-      # emscripten
+      myPython
 
       # Code generators
       unstablepkgs.swagger-codegen
@@ -367,6 +324,7 @@ in {
       alacritty
       roxterm
       masterpkgs.wally-cli
+      man-pages
 
       # Screen recording
       # gtk-recordmydesktop # can't select the window
diff --git a/nix/home-manager/programs/neovim/vimrc b/nix/home-manager/programs/neovim/vimrc
index 7b3ed3f..21987f5 100644
--- a/nix/home-manager/programs/neovim/vimrc
+++ b/nix/home-manager/programs/neovim/vimrc
@@ -240,6 +240,7 @@ endfunction
 let g:vimtex_view_zathura_hook_callback = 'ViewerCallback'
 let g:vimtex_view_general_callback = 'ViewerCallback'
 let g:vimtex_compiler_progname = '${pkgs.neovim-remote}/bin/nvr'
+let g:tex_flavor = 'latex'
 " } latex
 
 " terminal {
diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix
index 1e5db2a..9192d01 100644
--- a/nix/os/devices/steveej-t480s-work/versions.nix
+++ b/nix/os/devices/steveej-t480s-work/versions.nix
@@ -1,7 +1,7 @@
 {
   channelsNixosStable = {
     ref = "nixos-20.03";
-    rev = "0c59c1296b23abc25a6383ff26db2eeb17ad8a81";
+    rev = "14006b724f3d1f25ecf38238ee723d38b0c2f4ce";
   };
   channelsNixosUnstable = {
     ref = "nixos-unstable";
@@ -10,7 +10,7 @@
   nixpkgsMaster = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "master";
-    rev = "a332da8588aeea4feb9359d23f58d95520899e3c";
+    rev = "a26ffb006b8d3c2d1f3c52345783a8d043b828cd";
   };
   homeManagerModule = {
     url = "https://github.com/rycee/home-manager";