diff --git a/workstation/configuration.nix b/workstation/configuration.nix
index b12f358..df0d95d 100644
--- a/workstation/configuration.nix
+++ b/workstation/configuration.nix
@@ -1,5 +1,14 @@
 { config, pkgs, ... }:
 
+let
+  my-python-packages = python-packages: with python-packages; [
+    pip
+    pipx
+    #tldextract
+    #setuptools
+  ];
+  python-with-my-packages = pkgs.python310Full.withPackages my-python-packages;
+in
 {
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -23,7 +32,7 @@
   i18n.defaultLocale = "en_US.utf8";
 
   # Splash screen
-  boot.plymouth.enable = false;
+  boot.plymouth.enable = true;
   boot.plymouth.theme = "breeze";
 
   security.polkit.enable = true;
@@ -36,23 +45,8 @@
     noPass = true;
   }];
 
-  # Enable the X11 windowing system.
-  #services.xserver.enable = false;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.displayManager.gdm.wayland = true;
-  #services.xserver.desktopManager.gnome.enable = false;
-
-  # Configure keymap in X11
-  #services.xserver = {
-    #layout = "us";
-    #xkbVariant = "";
-  #};
-
   services.avahi.enable = true;
   services.avahi.nssmdns = true;
-  # Enable CUPS to print documents.
   services.printing.enable = true;
   services.udisks2.enable = true;
   services.nscd.enableNsncd = true;
@@ -66,34 +60,16 @@
     extraBackends = [ pkgs.sane-airscan ];
   };
   security.rtkit.enable = true;
-#  services.kmscon = {
-#    enable = false;
-#    extraOptions = "--term xterm-256color";
-#    fonts = [ { name = "Source Code Pro"; package = pkgs.source-code-pro; } ];
-#    extraConfig = ''
-#      font-size=10
-#    '';
-#  };
   services.pipewire = {
     enable = true;
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
   };
 
   xdg.portal.enable = true; # only needed if you are not doing Gnome
   services.flatpak.enable = true;
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.don = {
     isNormalUser = true;
     description = "Don Harper";
@@ -106,9 +82,8 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
+    python-with-my-packages
     citrix_workspace
     firefox
     git-crypt
@@ -118,19 +93,15 @@
     keyutils
     mosh
     pulseaudio
-    python310
-    python310Packages.tldextract
-    python310Packages.pipx
-    python310Packages.setuptools
+    python3
     qutebrowser
     syncthing
     tailscale
     tmux
     tmuxp
-    topgrade
     toot
+    topgrade
     tut
-    #vim
     wget
     zoom-us
   ];