diff --git a/flake.lock b/flake.lock
index 2e14740..93da4c4 100755
--- a/flake.lock
+++ b/flake.lock
@@ -1239,6 +1239,18 @@
         "type": "github"
       }
     },
+    "pi4-argononed": {
+      "flake": false,
+      "locked": {
+        "path": "gitlab:/DarkElvenAngel/argononed/-/tree/master/OS/nixos",
+        "type": "path"
+      },
+      "original": {
+        "path": "gitlab:/DarkElvenAngel/argononed/-/tree/master/OS/nixos",
+        "type": "path"
+      },
+      "parent": []
+    },
     "pi4-disko": {
       "inputs": {
         "nixpkgs": [
@@ -1609,6 +1621,7 @@
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixpkgs-stable": "nixpkgs-stable_4",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "pi4-argononed": "pi4-argononed",
         "pi4-disko": "pi4-disko",
         "pi4-home-manager": "pi4-home-manager",
         "pi4-impermanence": "pi4-impermanence",
diff --git a/flake.nix b/flake.nix
index 723bd6d..920d601 100755
--- a/flake.nix
+++ b/flake.nix
@@ -186,6 +186,11 @@
       inputs.nixpkgs.follows = "pi4-nixpkgs";
     };
 
+    pi4-argononed = {
+      url = "gitlab:/DarkElvenAngel/argononed/-/tree/master/OS/nixos";
+      flake = false;
+    };
+
     #####################################################
     #                  Steamdeck                        #
     #####################################################
@@ -306,6 +311,7 @@
       pi4-nixos-hardware,
       pi4-nixos-raspberrypi,
       pi4-disko,
+      pi4-argononed,
 
       # Steamdeck
       steamdeck-nixpkgs,
diff --git a/hosts/pi4/argononed.nix b/hosts/pi4/argononed.nix
new file mode 100644
index 0000000..cd94bff
--- /dev/null
+++ b/hosts/pi4/argononed.nix
@@ -0,0 +1,15 @@
+{ argononed, ...}:
+{
+  imports = [ "${argononed}/OS/nixos" ];
+
+  services.argonone = {
+    enable = true;
+    logLevel = 4;
+    settings = {
+      fanTemp0 = 36; fanSpeed0 = 10;
+      fanTemp1 = 41; fanSpeed1 = 50;
+      fanTemp2 = 46; fanSpeed2 = 80;
+      hysteresis = 4;
+    };
+  };
+}
\ No newline at end of file
diff --git a/hosts/pi4/boot.nix b/hosts/pi4/boot.nix
index a17b7aa..4474b8e 100755
--- a/hosts/pi4/boot.nix
+++ b/hosts/pi4/boot.nix
@@ -11,6 +11,8 @@ in
     };
     plymouth.enable = true;
     kernelPackages = pkgs.linuxPackages_latest;
+    kernelModules = [ "i2c-dev" "i2c-bcm2835" ];
+    initrd.kernelModules = [  "i2c-dev" "i2c-bcm2835"  ];
   };
   environment.systemPackages = [ uefi_pi4 ];
 
diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix
index 8baef52..7922ae1 100755
--- a/hosts/pi4/configuration.nix
+++ b/hosts/pi4/configuration.nix
@@ -10,6 +10,7 @@ in
 {
   imports = [
     ./adguard.nix
+    ./argononed.nix
     ./boot.nix
     ./impermanence.nix
     ./networking.nix
@@ -18,10 +19,11 @@ in
     ../default.nix
   ];
   programs.zsh.enable = true;
+  hardware.i2c.enable = true;
 
   services = {
     hardware.argonone = {
-      enable = true;
+      enable = false;
       package = pkgs.argononed;
     };
     openssh = {
@@ -44,7 +46,6 @@ in
 
   environment = {
     systemPackages = with pkgs; [
-      argononed
       git
       libraspberrypi
       raspberrypi-eeprom
diff --git a/hosts/pi4/impermanence.nix b/hosts/pi4/impermanence.nix
index 6dff37e..8bf4430 100755
--- a/hosts/pi4/impermanence.nix
+++ b/hosts/pi4/impermanence.nix
@@ -24,7 +24,6 @@
     ];
    files = [
      "/etc/machine-id"
-     #{ file = "/etc/nix/id_rsa"; parentDirectory = { mode = "u=rwx,g=,o="; }; }
    ];
   };
 
diff --git a/hosts/pi4/pi4-uefi.nix b/hosts/pi4/pi4-uefi.nix
index 8537dec..928a4b9 100644
--- a/hosts/pi4/pi4-uefi.nix
+++ b/hosts/pi4/pi4-uefi.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "UEFI Firmware for Raspberry Pi 4";
     homepage = "https://github.com/pftf/RPi4";
-#    license = stdenv.lib.licenses.bsd2; # or appropriate license
     platforms = [ "aarch64-linux" ];
   };
 }
diff --git a/hosts/pi4/sops.nix b/hosts/pi4/sops.nix
index 1bc4874..ced3c22 100755
--- a/hosts/pi4/sops.nix
+++ b/hosts/pi4/sops.nix
@@ -37,9 +37,25 @@ in
       };
       "ssh-keys-public/pi5" = {
         neededForUsers = true;
+        mode = "0600";
+        owner = config.users.users.root.name;
+        group = config.users.users.root.group;
+        restartUnits = [ "sshd.service" ];
+      };
+      "pi4/sys-public-key" = {
+        neededForUsers = true;
+        mode = "0600";
+        owner = config.users.users.root.name;
+        group = config.users.users.root.group;
+        restartUnits = [ "sshd.service" ];
+      };
+      "pi4/sys-priv-key" = {
+        neededForUsers = true;
+        mode = "0600";
+        owner = config.users.users.root.name;
+        group = config.users.users.root.group;
+        restartUnits = [ "sshd.service" ];
       };
-      "pi4/sys-public-key" = { };
-      "pi4/sys-priv-key" = { };
     };
   };
 }