diff --git a/flake.lock b/flake.lock
index e3b55309..203b0512 100644
--- a/flake.lock
+++ b/flake.lock
@@ -173,16 +173,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1700392168,
-        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
+        "lastModified": 1700814205,
+        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
+        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -324,16 +324,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701053011,
-        "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=",
+        "lastModified": 1701263465,
+        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9",
+        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 019d0e2e..af6a06f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,14 @@
   description = "NixOS & Home-Manager Configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";
 
     flake-utils.url = "github:numtide/flake-utils";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
diff --git a/home/base/non-nixos/default.nix b/home/base/non-nixos/default.nix
index 21de2a11..8654786c 100644
--- a/home/base/non-nixos/default.nix
+++ b/home/base/non-nixos/default.nix
@@ -37,7 +37,7 @@ in
     };
 
     nix = {
-      package = pkgs.nix;
+      package = mkForce pkgs.nix;
       settings = {
         experimental-features = [
           "nix-command"
diff --git a/home/roles/office/default.nix b/home/roles/office/default.nix
index a817f333..a09e4bb0 100644
--- a/home/roles/office/default.nix
+++ b/home/roles/office/default.nix
@@ -20,7 +20,7 @@ in
 
     home.packages = with pkgs; [
       libreoffice
-      nodePackages.reveal-md
+      reveal-md
     ];
   };
 }
diff --git a/home/users/christian/shell/default.nix b/home/users/christian/shell/default.nix
index 8e4ac91b..5d3bf14d 100644
--- a/home/users/christian/shell/default.nix
+++ b/home/users/christian/shell/default.nix
@@ -72,7 +72,7 @@ in
       ssh = import ./ssh.nix;
 
       bat.enable = true;
-      exa.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 05dcc1ac..86cf5526 100644
--- a/home/users/christian/shell/zsh/default.nix
+++ b/home/users/christian/shell/zsh/default.nix
@@ -20,7 +20,6 @@ in
       enable = true;
       enableAutosuggestions = true;
       enableCompletion = true;
-      enableSyntaxHighlighting = true;
       autocd = true;
       dotDir = ".config/zsh";
       dirHashes = {
@@ -68,6 +67,7 @@ in
         G = "| grep";
         UUID = "$(uuidgen | tr -d \\n)";
       };
+      syntaxHighlighting.enable = true;
     };
   };
 }
diff --git a/hosts/nix-on-droid/state-version.nix b/hosts/nix-on-droid/state-version.nix
index 861e8611..1bdfcb57 100644
--- a/hosts/nix-on-droid/state-version.nix
+++ b/hosts/nix-on-droid/state-version.nix
@@ -1 +1 @@
-"23.05"
+"23.11"
diff --git a/hosts/nixos-vm/home-christian.nix b/hosts/nixos-vm/home-christian.nix
index f9bdf066..d3b7a692 100644
--- a/hosts/nixos-vm/home-christian.nix
+++ b/hosts/nixos-vm/home-christian.nix
@@ -1,6 +1,22 @@
 {
   custom = {
     users.christian.enable = true;
+
+    roles = {
+      desktop.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;
+      ops.enable = true;
+      web.enable = true;
+    };
   };
 
   home.stateVersion = import ./state-version.nix;
diff --git a/hosts/nixos-vm/state-version.nix b/hosts/nixos-vm/state-version.nix
index 861e8611..1bdfcb57 100644
--- a/hosts/nixos-vm/state-version.nix
+++ b/hosts/nixos-vm/state-version.nix
@@ -1 +1 @@
-"23.05"
+"23.11"
diff --git a/hosts/non-nixos-vm/home-christian.nix b/hosts/non-nixos-vm/home-christian.nix
index cbd42af5..64b36dcb 100644
--- a/hosts/non-nixos-vm/home-christian.nix
+++ b/hosts/non-nixos-vm/home-christian.nix
@@ -2,6 +2,22 @@
   custom = {
     base.non-nixos.enable = true;
     users.christian.enable = true;
+
+    roles = {
+      desktop.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;
+      ops.enable = true;
+      web.enable = true;
+    };
   };
 
   home.stateVersion = import ./state-version.nix;
diff --git a/hosts/non-nixos-vm/state-version.nix b/hosts/non-nixos-vm/state-version.nix
index 861e8611..1bdfcb57 100644
--- a/hosts/non-nixos-vm/state-version.nix
+++ b/hosts/non-nixos-vm/state-version.nix
@@ -1 +1 @@
-"23.05"
+"23.11"
diff --git a/nixos/base/nix/default.nix b/nixos/base/nix/default.nix
index a2cde950..47d27a50 100644
--- a/nixos/base/nix/default.nix
+++ b/nixos/base/nix/default.nix
@@ -29,8 +29,6 @@
     };
   };
 
-  nixpkgs.config.allowUnfree = true;
-
   system.activationScripts.diff = {
     supportsDryActivation = true;
     text = ''