diff --git a/base-config.nix b/base-config.nix
index 05a2bab..fea7854 100644
--- a/base-config.nix
+++ b/base-config.nix
@@ -119,6 +119,7 @@
     btrfs-progs
     git
     nerdfonts
+    timeshift
     vim
     xclip
     zsh
@@ -127,6 +128,14 @@
   # List of users allowed to connect to the Nix daemon
   nix.settings.allowed-users = [ "wesley" ];
 
+  # Enable Nix Flakes support (EXPERIMENTAL)
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+
   # Setup our ZSH shell.
   # First let's absolutely make sure the shell is enabled
   programs.zsh.enable = true;