diff --git a/.drone.yml b/.drone.yml
index aaf69ec..94cb083 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -136,6 +136,7 @@ trigger:
   event:
   - pull_request
   - cron
+  - push
 
 
   
@@ -191,5 +192,6 @@ trigger:
   - main
   event:
   - cron
+  - push
 
 
diff --git a/base.nix b/base.nix
index bb5e52e..8eab193 100644
--- a/base.nix
+++ b/base.nix
@@ -25,6 +25,7 @@
   luj.programs.mosh.enable = true;
   programs.gnupg.agent.enable = true;
 
+  networking.firewall.enable = true;
   environment.systemPackages = with pkgs; [
     wget
     rxvt_unicode
diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix
index 7134478..9730a19 100644
--- a/machines/macintosh/default.nix
+++ b/machines/macintosh/default.nix
@@ -12,7 +12,6 @@
 
   networking.hostName = "macintosh";
   networking.networkmanager.enable = true;
-  networking.firewall.enable = true;
 
   sound.enable = true;
   hardware.pulseaudio.enable = true;
diff --git a/machines/newton/default.nix b/machines/newton/default.nix
index a0d114a..5e77c2c 100644
--- a/machines/newton/default.nix
+++ b/machines/newton/default.nix
@@ -16,13 +16,10 @@ in
     zfs-mails.enable = true;
   };
 
-  programs.gnupg.agent.enable = true;
-
   networking.hostName = hostName;
   networking.hostId = "f7cdfbc9";
   networking.interfaces.enp2s0f0.useDHCP = true;
   networking.interfaces.enp2s0f1.useDHCP = true;
-  networking.firewall.enable = true;
 
   services.zfs.autoSnapshot.enable = true;
   services.zfs.autoScrub.enable = true;