diff --git a/hosts/nolrem/configuration.nix b/hosts/nolrem/configuration.nix
index bac6553..b3c95db 100644
--- a/hosts/nolrem/configuration.nix
+++ b/hosts/nolrem/configuration.nix
@@ -7,6 +7,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    backupFileExtension = "backup";
     users.bates64 =
       { ... }:
       {
diff --git a/modules/home/cpp/default.nix b/modules/home/cpp/default.nix
index 4b6e12f..910ed35 100644
--- a/modules/home/cpp/default.nix
+++ b/modules/home/cpp/default.nix
@@ -1,12 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   # Packages regularly needed for C/C++ projects
   home.packages = with pkgs; [
     clang-tools
-    gdb
     lldb
     gnumake
     cmake
     ninja
-  ];
+  ] ++ (if config.isMacOS then [ ] else [ gdb ]);
 }