diff --git a/modules/core/program.nix b/modules/core/program.nix
index 0c47035..3f7576a 100644
--- a/modules/core/program.nix
+++ b/modules/core/program.nix
@@ -1,10 +1,12 @@
-{ pkgs, ... }: 
+{ ... }: 
 {
-  programs.dconf.enable = true;
-  programs.zsh.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    # pinentryFlavor = "";
+  programs = {
+    dconf.enable = true;
+    zsh.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+      # pinentryFlavor = "";
+    };
   };
 }
diff --git a/modules/core/security.nix b/modules/core/security.nix
index f5fcfa1..6e5abac 100644
--- a/modules/core/security.nix
+++ b/modules/core/security.nix
@@ -1,6 +1,8 @@
 { ... }: 
 {
-  security.rtkit.enable = true;
-  security.sudo.enable = true;
-  security.pam.services.swaylock = { };
+  security = {
+    rtkit.enable = true;
+    sudo.enable = true;
+    pam.services.swaylock = { };
+  };
 }
diff --git a/modules/core/system.nix b/modules/core/system.nix
index 0b0cdca..b08adba 100644
--- a/modules/core/system.nix
+++ b/modules/core/system.nix
@@ -26,8 +26,8 @@
     git
   ];
 
-  time.timeZone = "Europe/Paris";
+  time.timeZone = "Europe/Amsterdam";
   i18n.defaultLocale = "en_US.UTF-8";
   nixpkgs.config.allowUnfree = true;
-  system.stateVersion = "23.05";
+  system.stateVersion = "24.05";
 }