diff --git a/configuration.nix b/configuration.nix
index d74dc8c..0ec3e9b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -95,24 +95,14 @@
   };
 
 
-  # Enable the X11 windowing system.
-  #services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  #services.xserver.desktopManager.gnome.enable = true;
-
   # Configure console keymap
   console.keyMap = "de-latin1-nodeadkeys";
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
   # Enable scanning
   hardware.sane.enable = true;
 
   # bluetooth
   hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
 
   # Enable sound with pipewire.
   sound.enable = true;
@@ -134,8 +124,6 @@
   };
 
   nixpkgs.config.allowUnfree = true;
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
     ack
     avrdude
@@ -223,33 +211,6 @@
     yt-dlp
   ];
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-  };
-  services.passSecretService.enable = true;
-  services.tailscale.enable = true;
-  services.gvfs.enable = true;
-
-  services.syncthing = {
-    enable = true;
-    user = "rothe";
-    group = "users";
-    dataDir = "/home/rothe";
-    overrideFolders = false;
-    overrideDevices = false;
-  };
-
-  # xdg-desktop-portal works by exposing a series of D-Bus interfaces
-  # known as portals under a well-known name
-  # (org.freedesktop.portal.Desktop) and object path
-  # (/org/freedesktop/portal/desktop).
-  # The portal interfaces include APIs for file access, opening URIs,
-  # printing and others.
-  services.dbus.enable = true;
   xdg.portal = {
     enable = true;
     wlr.enable = true;
@@ -262,10 +223,8 @@
     enable = true;
     wrapperFeatures.gtk = true;
   };
-
   programs.light.enable = true;
   programs.fish.enable = true;
-  services.pcscd.enable = true;
   programs.gnupg.agent = {
     enable = true;
     pinentryFlavor = "gtk2";
@@ -273,26 +232,45 @@
   };
 
   # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-  services.flatpak.enable = true;  
+  services.resolved = {
+    enable = true;
+  };
+  services.pcscd.enable = true;
+  # xdg-desktop-portal works by exposing a series of D-Bus interfaces
+  # known as portals under a well-known name
+  # (org.freedesktop.portal.Desktop) and object path
+  # (/org/freedesktop/portal/desktop).
+  # The portal interfaces include APIs for file access, opening URIs,
+  # printing and others.
+  services.dbus.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    pulse.enable = true;
+  };
+  services.passSecretService.enable = true;
+  services.tailscale.enable = true;
+  services.gvfs.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+  services.blueman.enable = true;
+  services.syncthing = {
+    enable = true;
+    user = "rothe";
+    group = "users";
+    dataDir = "/home/rothe";
+    overrideFolders = false;
+    overrideDevices = false;
+  };
 
   fonts.packages = with pkgs; [
     roboto-mono
   ];
 
-services.resolved = {
-  enable = true;
-};
-
-  # Open ports in the firewall.
   networking.firewall = {
-    enable = false;
-    allowedTCPPorts = [ 
-      57621 # Spotify
-      8554 # RTSP Camera
-    ];
+    enable = true;
+    allowedTCPPorts = [ ];
   };
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -302,14 +280,10 @@ services.resolved = {
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.05"; # Did you read the comment?
 
-  virtualisation.docker.enable = true;
   virtualisation = {
     podman = {
       enable = true;
 
-      # Create a `docker` alias for podman, to use it as a drop-in replacement
-      # dockerCompat = true;
-
       # Required for containers under podman-compose to be able to talk to each other.
       #defaultNetwork.settings.dns_enabled = true;
     };