diff --git a/flake.lock b/flake.lock
index ae1a3d97..784cc44b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -198,16 +198,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1716729631,
+        "narHash": "sha256-IerjU5GUeKc0eW9FPOdlPveSGJ2ZrO+lIfuHPUmUF2I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "fc4492181833eaaa7a26a8081c0615d95792d825",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -285,21 +285,20 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-docs": "nixpkgs-docs",
         "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
         "nmd": "nmd_2"
       },
       "locked": {
-        "lastModified": 1709879753,
-        "narHash": "sha256-zEpy3eweBus/cW/oRMBINps6Bnlazpa7TadonwWibHA=",
+        "lastModified": 1688144254,
+        "narHash": "sha256-8KL1l/7eP2Zm1aJjdVaSOk0W5kTnJo9kcgW03gqWuiI=",
         "owner": "nix-community",
         "repo": "nix-on-droid",
-        "rev": "7b3cc6e3f9919b2d23003cfafb60c146c3f45793",
+        "rev": "2301e01d48c90b60751005317de7a84a51a87eb6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-23.05",
         "repo": "nix-on-droid",
         "type": "github"
       }
@@ -329,49 +328,33 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727129439,
-        "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=",
+        "lastModified": 1704290814,
+        "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a",
+        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-docs": {
-      "locked": {
-        "lastModified": 1705957679,
-        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-23.05",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-for-bootstrap": {
       "locked": {
-        "lastModified": 1708105575,
-        "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=",
+        "lastModified": 1686921029,
+        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
+        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
+        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
         "type": "github"
       }
     },
@@ -408,25 +391,19 @@
       }
     },
     "nmd_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-on-droid",
-          "nixpkgs-docs"
-        ],
-        "scss-reset": "scss-reset"
-      },
+      "flake": false,
       "locked": {
-        "lastModified": 1705050560,
-        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
-        "owner": "~rycee",
+        "lastModified": 1680213367,
+        "narHash": "sha256-NbSXxpFAK5IMcsQTK0vSGy099HExx3SEagqW4Lpc+X8=",
+        "owner": "rycee",
         "repo": "nmd",
-        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
-        "type": "sourcehut"
+        "rev": "abb15317ebd17e5a0a7dd105e2ce52f2700185a8",
+        "type": "gitlab"
       },
       "original": {
-        "owner": "~rycee",
+        "owner": "rycee",
         "repo": "nmd",
-        "type": "sourcehut"
+        "type": "gitlab"
       }
     },
     "nmt": {
@@ -504,22 +481,6 @@
         "systems": "systems"
       }
     },
-    "scss-reset": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1631450058,
-        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
-        "owner": "andreymatin",
-        "repo": "scss-reset",
-        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
-        "type": "github"
-      },
-      "original": {
-        "owner": "andreymatin",
-        "repo": "scss-reset",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index a24d2821..1019602c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "NixOS & Home-Manager Configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";
 
@@ -13,7 +13,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -23,7 +23,7 @@
     };
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.11";
+      url = "github:nix-community/nix-on-droid/release-23.05";
       inputs.home-manager.follows = "home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix
index d0d34a59..688e33e1 100644
--- a/home/programs/firefox/default.nix
+++ b/home/programs/firefox/default.nix
@@ -35,113 +35,113 @@ in
     programs.firefox = {
       inherit (cfg) enable;
 
-      policies = {
-        PasswordManagerEnabled = false;
-        DisableFirefoxAccounts = false;
-        DisableFirefoxStudies = true;
-        DisablePocket = true;
-        DisableTelemetry = true;
-        EnableTrackingProtection = {
-          Value = true;
-          Locked = true;
-          Cryptomining = true;
-          Fingerprinting = true;
-          EmailTracking = true;
-        };
-        FirefoxHome = {
-          Search = true;
-          TopSites = true;
-          SponsoredTopSites = false;
-          Highlights = false;
-          Locked = true;
-        };
-        HomePage = {
-          URL = cfg.homepage;
-          StartPage = "homepage-locked";
-          Locked = true;
-        };
-        HttpsOnlyMode = "force_enabled";
-        OfferToSaveLogins = false;
-        Preferences = {
-          "browser.newtabpage.pinned" = [
-            {
-              label = "Blog";
-              url = "https://blog.harke.ch";
-            }
-            {
-              label = "Cloud";
-              url = "https://cloud.harke.ch";
-            }
-            {
-              label = "Code";
-              url = "https://code.harke.ch";
-            }
-            {
-              label = "News";
-              url = "https://news.harke.ch";
-            }
-            {
-              label = "ProtonMail";
-              url = "https://mail.proton.me";
-            }
-          ];
-          "browser.search.suggest.enabled" = false;
-          "browser.search.region" = "CH";
-          "cookiebanners.service.mode" = 1;
-          "cookiebanners.service.mode.privateBrowsing" = 1;
-        };
-      };
+      #policies = {
+      #  PasswordManagerEnabled = false;
+      #  DisableFirefoxAccounts = false;
+      #  DisableFirefoxStudies = true;
+      #  DisablePocket = true;
+      #  DisableTelemetry = true;
+      #  EnableTrackingProtection = {
+      #    Value = true;
+      #    Locked = true;
+      #    Cryptomining = true;
+      #    Fingerprinting = true;
+      #    EmailTracking = true;
+      #  };
+      #  FirefoxHome = {
+      #    Search = true;
+      #    TopSites = true;
+      #    SponsoredTopSites = false;
+      #    Highlights = false;
+      #    Locked = true;
+      #  };
+      #  HomePage = {
+      #    URL = cfg.homepage;
+      #    StartPage = "homepage-locked";
+      #    Locked = true;
+      #  };
+      #  HttpsOnlyMode = "force_enabled";
+      #  OfferToSaveLogins = false;
+      #  Preferences = {
+      #    "browser.newtabpage.pinned" = [
+      #      {
+      #        label = "Blog";
+      #        url = "https://blog.harke.ch";
+      #      }
+      #      {
+      #        label = "Cloud";
+      #        url = "https://cloud.harke.ch";
+      #      }
+      #      {
+      #        label = "Code";
+      #        url = "https://code.harke.ch";
+      #      }
+      #      {
+      #        label = "News";
+      #        url = "https://news.harke.ch";
+      #      }
+      #      {
+      #        label = "ProtonMail";
+      #        url = "https://mail.proton.me";
+      #      }
+      #    ];
+      #    "browser.search.suggest.enabled" = false;
+      #    "browser.search.region" = "CH";
+      #    "cookiebanners.service.mode" = 1;
+      #    "cookiebanners.service.mode.privateBrowsing" = 1;
+      #  };
+      #};
 
       profiles."ztbvdcs8.default" = {
         inherit (cfg) extensions;
 
         isDefault = true;
 
-        containers = {
-          personal = {
-            color = "turquoise";
-            icon = "fingerprint";
-            id = 1;
-            name = "Personal";
-          };
-          personal_admin = {
-            color = "pink";
-            icon = "fingerprint";
-            id = 2;
-            name = "Personal Admin";
-          };
-          work = {
-            color = "orange";
-            icon = "briefcase";
-            id = 3;
-            name = "Work";
-          };
-          shopping = {
-            color = "blue";
-            icon = "cart";
-            id = 4;
-            name = "Shopping";
-          };
-          banking = {
-            color = "green";
-            icon = "dollar";
-            id = 5;
-            name = "Banking";
-          };
-          danger = {
-            color = "red";
-            icon = "fruit";
-            id = 6;
-            name = "Danger Zone";
-          };
-          Facebook = {
-            color = "toolbar";
-            icon = "fence";
-            id = 7;
-            name = "Facebook";
-          };
-        };
-        containersForce = true;
+        #containers = {
+        #  personal = {
+        #    color = "turquoise";
+        #    icon = "fingerprint";
+        #    id = 1;
+        #    name = "Personal";
+        #  };
+        #  personal_admin = {
+        #    color = "pink";
+        #    icon = "fingerprint";
+        #    id = 2;
+        #    name = "Personal Admin";
+        #  };
+        #  work = {
+        #    color = "orange";
+        #    icon = "briefcase";
+        #    id = 3;
+        #    name = "Work";
+        #  };
+        #  shopping = {
+        #    color = "blue";
+        #    icon = "cart";
+        #    id = 4;
+        #    name = "Shopping";
+        #  };
+        #  banking = {
+        #    color = "green";
+        #    icon = "dollar";
+        #    id = 5;
+        #    name = "Banking";
+        #  };
+        #  danger = {
+        #    color = "red";
+        #    icon = "fruit";
+        #    id = 6;
+        #    name = "Danger Zone";
+        #  };
+        #  Facebook = {
+        #    color = "toolbar";
+        #    icon = "fence";
+        #    id = 7;
+        #    name = "Facebook";
+        #  };
+        #};
+        #containersForce = true;
 
         search =
           let
diff --git a/home/programs/ssh/default.nix b/home/programs/ssh/default.nix
index 4ccc4e16..51f974f6 100644
--- a/home/programs/ssh/default.nix
+++ b/home/programs/ssh/default.nix
@@ -32,6 +32,6 @@ in
 
     homeage.file = listToAttrs (map mkHomeageFile cfg.identities);
 
-    services.ssh-agent.enable = true;
+    #services.ssh-agent.enable = true;
   };
 }
diff --git a/home/roles/web/default.nix b/home/roles/web/default.nix
index c0be3992..86aedc25 100644
--- a/home/roles/web/default.nix
+++ b/home/roles/web/default.nix
@@ -47,7 +47,7 @@ in
       _1password
       _1password-gui
       bind
-      protonmail-desktop
+      unstable.protonmail-desktop
       wget
     ];
 
diff --git a/home/users/christian/default.nix b/home/users/christian/default.nix
index 1f46b723..afb7c949 100644
--- a/home/users/christian/default.nix
+++ b/home/users/christian/default.nix
@@ -30,7 +30,6 @@ in
         office.cli.enable = config.custom.roles.office.cli.enable;
         shell.enable = true;
         ssh.enable = true;
-        steam.enable = config.custom.roles.gaming.enable;
         vim.enable = true;
       };
     };
diff --git a/home/users/christian/gpg/default.nix b/home/users/christian/gpg/default.nix
index 300c0548..83546071 100644
--- a/home/users/christian/gpg/default.nix
+++ b/home/users/christian/gpg/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
@@ -6,7 +6,7 @@ let
 
   cfg = config.custom.users.christian.gpg;
 
-  pinentryPkg = if pkgs.stdenv.isDarwin then pkgs.pinentry_mac else pkgs.pinentry-gnome3;
+  #pinentryPkg = if pkgs.stdenv.isDarwin then pkgs.pinentry_mac else pkgs.pinentry-gnome3;
 
 in
 
@@ -20,6 +20,6 @@ in
   config = mkIf cfg.enable {
     programs.gpg.enable = true;
 
-    services.gpg-agent.pinentryPackage = pinentryPkg;
+    #services.gpg-agent.pinentryPackage = pinentryPkg;
   };
 }
diff --git a/home/users/christian/shell/default.nix b/home/users/christian/shell/default.nix
index 855f261a..8d4a5304 100644
--- a/home/users/christian/shell/default.nix
+++ b/home/users/christian/shell/default.nix
@@ -74,7 +74,7 @@ in
 
     programs = {
       bat.enable = true;
-      eza.enable = true;
+      #eza.enable = true;
       fzf.enable = true;
       jq.enable = true;
       starship.enable = true;
diff --git a/home/users/christian/shell/zsh/default.nix b/home/users/christian/shell/zsh/default.nix
index 62f0ab72..f7c2c439 100644
--- a/home/users/christian/shell/zsh/default.nix
+++ b/home/users/christian/shell/zsh/default.nix
@@ -18,7 +18,7 @@ in
   config = mkIf cfg.enable {
     programs.zsh = {
       enable = true;
-      autosuggestion.enable = true;
+      #autosuggestion.enable = true;
       enableCompletion = true;
       autocd = true;
       dotDir = ".config/zsh";
@@ -67,7 +67,7 @@ in
         G = "| grep";
         UUID = "$(uuidgen | tr -d \\n)";
       };
-      syntaxHighlighting.enable = true;
+      #syntaxHighlighting.enable = true;
     };
   };
 }
diff --git a/home/users/christian/steam/data/autoexec.cfg b/home/users/christian/steam/data/autoexec.cfg
deleted file mode 100644
index f396dc54..00000000
--- a/home/users/christian/steam/data/autoexec.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-alias "+jumpthrow" "+jump; -attack"
-alias "-jumpthrow" "-jump"
-exec myconf
diff --git a/home/users/christian/steam/data/binds.cfg b/home/users/christian/steam/data/binds.cfg
deleted file mode 100644
index b254a954..00000000
--- a/home/users/christian/steam/data/binds.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-alias "+use_radar" "+use; cl_radar_always_centered 1; cl_radar_scale 0.8; gameinstructor_enable 1"
-alias "-use_radar" "-use; cl_radar_always_centered 0; cl_radar_scale 0.4; gameinstructor_enable 0"
-bind "SECTION_SIGN" "toggleconsole"
-bind "ALT" "+voicerecord"
-bind "DOWNARROW" "buy vest"
-bind "LEFTARROW" "buy taser 34"
-bind "RIGHTARROW" "buy defuser"
-bind "UPARROW" "buy vesthelm"
-bind "DEL" "toggle voice_enable"
-bind "END" "give weapon_smokegrenade"
-bind "HOME" "give weapon_flashbang"
-bind "PGUP" "noclip"
-bind "KP_0" "buy molotov; buy incgrenade"
-bind "KP_1" "buy flashbang"
-bind "KP_2" "buy smokegrenade"
-bind "KP_3" "buy hegrenade"
-bind "KP_4" "buy galilar; buy famas"
-bind "KP_5" "buy ak47; buy m4a1"
-bind "KP_6" "buy sg556; buy aug"
-bind "KP_7" "buy p250"
-bind "KP_8" "buy tec9; buy fiveseven"
-bind "KP_9" "buy deagle"
-bind "KP_DEL" "buy decoy"
-bind "KP_ENTER" "buy ssg08"
-bind "KP_PLUS" "buy awp"
-bind "KP_MINUS" "buy p90"
-bind "KP_MULTIPLY" "buy sawedoff; buy mag7"
-bind "KP_DIVIDE" "buy nova"
-bind "MOUSE3" "player_ping"
-# slot1 = Primary
-# slot2 = Secondary
-# slot3 = Knife
-# slot4 = Grenade Cycle
-# slot5 = Bomb
-# slot6 = HE Grenade
-# slot7 = Flashbang
-# slot8 = Smoke
-# slot9 = Decoy
-# slot10 = Molotov / Incendiary
-bind "MOUSE4" "slot8; slot7; slot9"
-bind "MOUSE5" "slot6; slot10"
-bind "b" "buymenu"
-bind "c" "radio3"
-bind "e" "+use_radar"
-bind "g" "drop"
-bind "h" "commandmenu"
-bind "i" "showbriefing"
-bind "j" "cheer"
-bind "m" "chooseteam"
-bind "n" "nightvision"
-bind "o" "buyequip"
-bind "t" "use weapon_c4; drop;"
-bind "u" "messagemode2"
-bind "x" "radio2"
-bind "y" "radio1"
-bind "z" "+radialradio2"
diff --git a/home/users/christian/steam/data/crosshair.cfg b/home/users/christian/steam/data/crosshair.cfg
deleted file mode 100644
index 17700d89..00000000
--- a/home/users/christian/steam/data/crosshair.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-cl_crosshair_drawoutline "1"
-cl_crosshair_dynamic_maxdist_splitratio "0.35"
-cl_crosshair_dynamic_splitalpha_innermod "1"
-cl_crosshair_dynamic_splitalpha_outermod "0.5"
-cl_crosshair_dynamic_splitdist "7"
-cl_crosshair_outlinethickness "0.500000"
-cl_crosshair_sniper_width "1"
-cl_crosshairalpha "255"
-cl_crosshaircolor "1"
-cl_crosshaircolor_b "50"
-cl_crosshaircolor_g "250"
-cl_crosshaircolor_r "50"
-cl_crosshairdot "0"
-cl_crosshairgap "-1.5"
-cl_crosshairgap_useweaponvalue "0"
-cl_crosshairsize "2.500000"
-cl_crosshairstyle "4"
-cl_crosshairthickness "0.500000"
-cl_crosshairusealpha "1"
diff --git a/home/users/christian/steam/data/hud.cfg b/home/users/christian/steam/data/hud.cfg
deleted file mode 100644
index 55aee1a7..00000000
--- a/home/users/christian/steam/data/hud.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-cl_radar_scale "0.350000"
-cl_show_clan_in_death_notice "0"
-gameinstructor_enable "0"
diff --git a/home/users/christian/steam/data/input.cfg b/home/users/christian/steam/data/input.cfg
deleted file mode 100644
index 4a710c38..00000000
--- a/home/users/christian/steam/data/input.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-cl_use_opens_buy_menu "0"
-sensitivity "1.000000"
diff --git a/home/users/christian/steam/data/myconf.cfg b/home/users/christian/steam/data/myconf.cfg
deleted file mode 100644
index 298eda10..00000000
--- a/home/users/christian/steam/data/myconf.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-exec binds
-exec crosshair
-exec hud
-exec input
-exec net
diff --git a/home/users/christian/steam/data/net.cfg b/home/users/christian/steam/data/net.cfg
deleted file mode 100644
index 8bc88c49..00000000
--- a/home/users/christian/steam/data/net.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mm_dedicated_search_maxping 50
diff --git a/home/users/christian/steam/default.nix b/home/users/christian/steam/default.nix
deleted file mode 100644
index 2d4991a0..00000000
--- a/home/users/christian/steam/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-
-  cfg = config.custom.users.christian.steam;
-
-  mkCfgs = filename:
-    let
-      csgoCfgPath = "Steam/steamapps/common/Counter-Strike Global Offensive/game/csgo/cfg";
-    in
-    nameValuePair "${csgoCfgPath}/${filename}.cfg" {
-      source = ./data/${filename}.cfg;
-    };
-
-in
-
-{
-  options = {
-    custom.users.christian.steam = {
-      enable = mkEnableOption "Steam config";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    xdg.dataFile = listToAttrs (map mkCfgs [
-      "autoexec"
-      "binds"
-      "crosshair"
-      "hud"
-      "input"
-      "myconf"
-      "net"
-    ]
-    );
-  };
-}
diff --git a/hosts/macos/state-version.nix b/hosts/macos/state-version.nix
index 8ddf345c..861e8611 100644
--- a/hosts/macos/state-version.nix
+++ b/hosts/macos/state-version.nix
@@ -1 +1 @@
-"24.05"
+"23.05"
diff --git a/hosts/nix-on-droid/state-version.nix b/hosts/nix-on-droid/state-version.nix
index 8ddf345c..861e8611 100644
--- a/hosts/nix-on-droid/state-version.nix
+++ b/hosts/nix-on-droid/state-version.nix
@@ -1 +1 @@
-"24.05"
+"23.05"
diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix
index 5ff6477d..0923a0eb 100644
--- a/hosts/nixos/default.nix
+++ b/hosts/nixos/default.nix
@@ -4,10 +4,7 @@
   custom = {
     base.users = [ "demo" "christian" ];
     roles = {
-      android.enable = true;
-      containers.enable = true;
       desktop.enable = true;
-      gaming.enable = true;
       printing.enable = true;
     };
   };
diff --git a/hosts/nixos/home-christian.nix b/hosts/nixos/home-christian.nix
index e059a219..6f227021 100644
--- a/hosts/nixos/home-christian.nix
+++ b/hosts/nixos/home-christian.nix
@@ -3,25 +3,11 @@
     users.christian.enable = true;
 
     roles = {
-      containers.enable = true;
       desktop = {
         enable = true;
-        xserver.enable = true;
       };
-      dev.enable = true;
-      gaming.enable = true;
-      graphics.enable = true;
       homeage.enable = true;
       mobile.enable = true;
-      multimedia = {
-        enable = true;
-        converters.enable = true;
-      };
-      office = {
-        enable = true;
-        cli.enable = true;
-      };
-      ops.enable = true;
       web.enable = true;
     };
   };
diff --git a/hosts/nixos/state-version.nix b/hosts/nixos/state-version.nix
index 8ddf345c..861e8611 100644
--- a/hosts/nixos/state-version.nix
+++ b/hosts/nixos/state-version.nix
@@ -1 +1 @@
-"24.05"
+"23.05"
diff --git a/hosts/non-nixos/state-version.nix b/hosts/non-nixos/state-version.nix
index 8ddf345c..861e8611 100644
--- a/hosts/non-nixos/state-version.nix
+++ b/hosts/non-nixos/state-version.nix
@@ -1 +1 @@
-"24.05"
+"23.05"
diff --git a/lib/checks/default.nix b/lib/checks/default.nix
index 34998821..ff1c623a 100644
--- a/lib/checks/default.nix
+++ b/lib/checks/default.nix
@@ -38,7 +38,7 @@
   # Misc
 
   markdownlint = pkgs.runCommand "check-markdownlint"
-    { buildInputs = [ pkgs.markdownlint-cli ]; }
+    { buildInputs = [ pkgs.unstable.markdownlint-cli ]; }
     ''
       mkdir $out
       cd ${flake}
diff --git a/nixos/base/default.nix b/nixos/base/default.nix
index 4ed09d40..c3a0a85c 100644
--- a/nixos/base/default.nix
+++ b/nixos/base/default.nix
@@ -40,7 +40,6 @@ in
     networking.hostName = cfg.hostname;
 
     programs = {
-      nano.enable = false;
       vim.defaultEditor = true;
       zsh.enable = true;
     };
diff --git a/nixos/base/input/default.nix b/nixos/base/input/default.nix
index 66d27355..8c8e4c0f 100644
--- a/nixos/base/input/default.nix
+++ b/nixos/base/input/default.nix
@@ -1,11 +1,11 @@
 {
-  services = {
-    xserver.xkb = {
-      layout = "de,de";
-      variant = "neo_qwertz,bone";
-      options = "grp:rctrl_toggle,grp_led:scroll";
-    };
-  };
+  #services = {
+  #  xserver.xkb = {
+  #    layout = "de,de";
+  #    variant = "neo_qwertz,bone";
+  #    options = "grp:rctrl_toggle,grp_led:scroll";
+  #  };
+  #};
 
   console.useXkbConfig = true;
 }
diff --git a/nixos/roles/steambox/default.nix b/nixos/roles/steambox/default.nix
deleted file mode 100644
index d5bd9c7a..00000000
--- a/nixos/roles/steambox/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.custom.roles.steambox;
-  steam_autostart = pkgs.makeAutostartItem {
-    name = "steam";
-    package = pkgs.steam;
-  };
-
-in
-
-{
-  options = {
-    custom.roles.steambox = {
-      enable = mkEnableOption "Steam box config";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    custom = {
-      base.users = [ "gamer" ];
-      roles = {
-        gaming.enable = true;
-        sound.enable = true;
-      };
-    };
-
-    environment.systemPackages = with pkgs; [
-      # Steam
-      steam_autostart
-      steam-run
-
-      # Other launchers
-      heroic
-      lutris
-
-      # Games
-      pinball
-      space-cadet-pinball
-      superTux
-      superTuxKart
-
-      # Geforce NOW
-      chromium
-      firefox
-    ];
-
-    # Enable the KDE Desktop Environment.
-    services = {
-      displayManager = {
-        sddm.enable = true;
-        autoLogin = {
-          enable = true;
-          user = "gamer";
-        };
-      };
-      xserver = {
-        enable = true;
-        desktopManager.plasma5.enable = true;
-      };
-    };
-  };
-}