diff --git a/common/linux.nix b/common/linux.nix
index 7542951..14b86b6 100644
--- a/common/linux.nix
+++ b/common/linux.nix
@@ -2,9 +2,13 @@
   boot.kernelPackages = pkgs.linuxPackages;
   boot.supportedFilesystems = ["ntfs"];
 
-  system.stateVersion = "unstable";
+  system.stateVersion = "23.05";
+
   system.autoUpgrade.enable = true;
 
+  # See: https://github.com/NixOS/nixpkgs/issues/180175
+  systemd.services.NetworkManager-wait-online.enable = false;
+
   nix.extraOptions = "experimental-features = nix-command flakes";
   nix.package = pkgs.nixUnstable;
 
@@ -45,9 +49,17 @@
   };
 
   virtualisation.docker.enable = true;
-  virtualisation.podman.enable = true;
   virtualisation.libvirtd.enable = true;
 
+  virtualisation = {
+    podman = {
+      enable = true;
+
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.dnsname.enable = true;
+    };
+  };
+
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
diff --git a/flake.lock b/flake.lock
index 43b4c40..f3aac49 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1671335968,
-        "narHash": "sha256-V7mjlh7brp70elokmml6XzHinpTilkQJjiYIGjEmSGs=",
+        "lastModified": 1671578428,
+        "narHash": "sha256-YmbpBcPaGz9KE2bC4xPvSdgCSMk0BmS/L3ePvy9TR/M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "37713c6b04b963d41664e03576f73a18c9b0d224",
+        "rev": "0f8bf4f92efa3c6168705b49a6788abb3612033a",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1671358227,
-        "narHash": "sha256-KmnT8YfU/KI4VxBlFMUltlAVLNvF7fTEQEsp41ZUHlA=",
+        "lastModified": 1671467851,
+        "narHash": "sha256-0aXxARYr6EDMW+fOOPUxB0IIItP1bxVljSc100RRAeo=",
         "owner": "Mic92",
         "repo": "nix-ld",
-        "rev": "baefaa2c91c9628bea3708cf3b9a9d6fcf326696",
+        "rev": "3210f71f0171b491b88bbb099effc5d3c7ef99e9",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1671228065,
-        "narHash": "sha256-Az/ig9LVL5xdqtyl4/CVKJIH1G7sP/9Ott2XnNyie0E=",
+        "lastModified": 1671631481,
+        "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e462a4baf75eeac639b4942481759de08a3bc94e",
+        "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671321897,
-        "narHash": "sha256-8AIsfqiPFnQCVPhoPExwPQiJDF6ftyZLVPQeN4F86Ag=",
+        "lastModified": 1671467162,
+        "narHash": "sha256-1MRYdkLH7vyz9A/69KeDE+4RaEI6D83GfuJLMOGjN/8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "06db865023568be36737d2dd09bfbdd68c7f6c1c",
+        "rev": "9bf4ec690947311dd0b080bb8d86a3019d5f4f24",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1671271357,
-        "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
+        "lastModified": 1671359686,
+        "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd",
+        "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
         "type": "github"
       },
       "original": {
diff --git a/home/default.nix b/home/default.nix
index 439cd5f..89157a9 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -15,7 +15,7 @@
   };
   inherit (pkgs) stdenv;
 in {
-  home.stateVersion = "22.11";
+  home.stateVersion = "23.05";
 
   services = {
     gpg-agent = {
@@ -24,6 +24,10 @@ in {
       defaultCacheTtlSsh = 3600;
       enableSshSupport = true;
     };
+
+    spotifyd = {
+      enable = true;
+    };
   };
 
   fonts.fontconfig.enable = true;
@@ -171,7 +175,6 @@ in {
       shellAliases = {
         ".." = "cd ..";
         c = "code";
-        docker = "podman";
         g = "git";
         gr = "cd $(git rev-parse --show-toplevel)";
         gho = "gh repo view --web >/dev/null";
diff --git a/packages/common.nix b/packages/common.nix
index b71f890..b015dc5 100644
--- a/packages/common.nix
+++ b/packages/common.nix
@@ -133,9 +133,7 @@ in {
       python310Packages.black
       python310Packages.ipython
       python310Packages.pip
-      /*
-      python310Packages.poetry
-      */
+      # python310Packages.poetry
       python310Packages.setuptools
       python310Packages.virtualenv
 
@@ -144,6 +142,9 @@ in {
 
       # news
       srv
+
+      # music
+      spotify-tui
     ];
   in
     common;