diff --git a/hosts/Garand-Desktop/home-modules.nix b/hosts/Garand-Desktop/home-modules.nix
index 7c1a141..d1a6f86 100644
--- a/hosts/Garand-Desktop/home-modules.nix
+++ b/hosts/Garand-Desktop/home-modules.nix
@@ -6,7 +6,7 @@ _: {
 
   zed-editor = {
     enable = true; # Zed Editor: a modern, high‑performance code editor
-    remote-server = true; # Remote Server: enable remote editing capabilities
+    remote-server.enable = true; # Remote Server: enable remote editing capabilities
   };
 
   /*
diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix
index d3f98b4..72ffe37 100644
--- a/hosts/Garand-Desktop/system-modules.nix
+++ b/hosts/Garand-Desktop/system-modules.nix
@@ -6,9 +6,9 @@ _: {
   flatpak = {
     enable = true; # Flatpak: universal packaging system for Linux
     packages = {
-      sober = false; # Roblox client
-      warehouse = true; # Flatpak manager
-      flatseal = true; # Flatpak permissions manager
+      sober.enable = false; # Roblox client
+      warehouse.enable = true; # Flatpak manager
+      flatseal.enable = true; # Flatpak permissions manager
     };
   };
 
diff --git a/hosts/Garand-Laptop/home-modules.nix b/hosts/Garand-Laptop/home-modules.nix
index 7c1a141..d1a6f86 100644
--- a/hosts/Garand-Laptop/home-modules.nix
+++ b/hosts/Garand-Laptop/home-modules.nix
@@ -6,7 +6,7 @@ _: {
 
   zed-editor = {
     enable = true; # Zed Editor: a modern, high‑performance code editor
-    remote-server = true; # Remote Server: enable remote editing capabilities
+    remote-server.enable = true; # Remote Server: enable remote editing capabilities
   };
 
   /*
diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix
index d3f98b4..72ffe37 100644
--- a/hosts/Garand-Laptop/system-modules.nix
+++ b/hosts/Garand-Laptop/system-modules.nix
@@ -6,9 +6,9 @@ _: {
   flatpak = {
     enable = true; # Flatpak: universal packaging system for Linux
     packages = {
-      sober = false; # Roblox client
-      warehouse = true; # Flatpak manager
-      flatseal = true; # Flatpak permissions manager
+      sober.enable = false; # Roblox client
+      warehouse.enable = true; # Flatpak manager
+      flatseal.enable = true; # Flatpak permissions manager
     };
   };
 
diff --git a/hosts/default/home-modules.nix b/hosts/default/home-modules.nix
index 7c1a141..d1a6f86 100644
--- a/hosts/default/home-modules.nix
+++ b/hosts/default/home-modules.nix
@@ -6,7 +6,7 @@ _: {
 
   zed-editor = {
     enable = true; # Zed Editor: a modern, high‑performance code editor
-    remote-server = true; # Remote Server: enable remote editing capabilities
+    remote-server.enable = true; # Remote Server: enable remote editing capabilities
   };
 
   /*
diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix
index d3f98b4..72ffe37 100644
--- a/hosts/default/system-modules.nix
+++ b/hosts/default/system-modules.nix
@@ -6,9 +6,9 @@ _: {
   flatpak = {
     enable = true; # Flatpak: universal packaging system for Linux
     packages = {
-      sober = false; # Roblox client
-      warehouse = true; # Flatpak manager
-      flatseal = true; # Flatpak permissions manager
+      sober.enable = false; # Roblox client
+      warehouse.enable = true; # Flatpak manager
+      flatseal.enable = true; # Flatpak permissions manager
     };
   };
 
diff --git a/modules/core/flatpak.nix b/modules/core/flatpak.nix
index 0c7ecde..001b462 100644
--- a/modules/core/flatpak.nix
+++ b/modules/core/flatpak.nix
@@ -4,10 +4,10 @@
   ...
 }: let
   mkFlatpakPackage = name: pkgId: {
-    options.flatpak.packages.${name} = lib.mkEnableOption "Flatpak: ${name}";
+    options.flatpak.packages.${name}.enable = lib.mkEnableOption "Flatpak: ${name}";
 
     config.services.flatpak.packages =
-      lib.mkIf config.flatpak.packages.${name} [pkgId];
+      lib.mkIf config.flatpak.packages.${name}.enable [pkgId];
   };
 
   flatpakPackages = {
diff --git a/modules/home/zed/default.nix b/modules/home/zed/default.nix
index 62b7152..8a39bcc 100644
--- a/modules/home/zed/default.nix
+++ b/modules/home/zed/default.nix
@@ -6,13 +6,13 @@
 }: {
   options.zed-editor = {
     enable = lib.mkEnableOption "Zed Editor";
-    remote-server = lib.mkEnableOption "Zed Editor Remote Server";
+    remote-server.enable = lib.mkEnableOption "Zed Editor Remote Server";
   };
 
   config.programs.zed-editor = lib.mkIf config.zed-editor.enable {
     enable = true;
     package = pkgs.zed-editor;
-    installRemoteServer = lib.mkIf config.zed-editor.remote-server true;
+    installRemoteServer = lib.mkIf config.zed-editor.remote-server.enable true;
   };
 
   imports = [
diff --git a/modules/home/zed/user-settings/languages.nix b/modules/home/zed/user-settings/languages.nix
index a9a2e78..cc5ea2b 100644
--- a/modules/home/zed/user-settings/languages.nix
+++ b/modules/home/zed/user-settings/languages.nix
@@ -62,5 +62,9 @@ _: {
       };
       tab_size = 2;
     };
+    "C++" = {
+      format_on_save = "on";
+      tab_size = 2;
+    };
   };
 }
diff --git a/modules/home/zed/user-settings/lsp.nix b/modules/home/zed/user-settings/lsp.nix
index c7c4911..e216cc1 100644
--- a/modules/home/zed/user-settings/lsp.nix
+++ b/modules/home/zed/user-settings/lsp.nix
@@ -27,6 +27,27 @@
         };
       };
     };
+    clangd = {
+      binary = {
+        path = lib.getExe pkgs.bash;
+        arguments = [
+          "-c"
+          "if [ -e flake.nix ]; then nix develop --command clangd; else clangd; fi"
+        ];
+      };
+      initialization_options = {
+        inlayHints = {
+          maxLength = null;
+          lifetimeElisionHints = {
+            enable = "skip_trivial";
+            useParameterNames = true;
+          };
+          closureReturnTypeHints = {
+            enable = "always";
+          };
+        };
+      };
+    };
     nixd = {
       initialization_options.formatting.command = [
         "alejandra"