diff --git a/flake.nix b/flake.nix
index 9442ad4..84aa409 100755
--- a/flake.nix
+++ b/flake.nix
@@ -183,6 +183,8 @@
 
     pi4-nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi";
 
+    pi4-argon40-nix.url = "github:guusvanmeerveld/argon40-nix";
+
     pi4-disko = {
       # the fork is needed for partition attributes support
       url = "github:nvmd/disko/gpt-attrs";
@@ -321,6 +323,7 @@
       pi4-nixos-hardware,
       pi4-nixos-raspberrypi,
       pi4-disko,
+      pi4-argononed,
 
       # Steamdeck
       steamdeck-nixpkgs,
@@ -612,6 +615,7 @@
             pi4-impermanence.nixosModules.impermanence
             pi4-sops-nix.nixosModules.sops
             ./hosts/pi4/configuration.nix
+            pi4-argon40-nix.nixosModules.default
             pi4-home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
diff --git a/hosts/pi4/argononed.nix b/hosts/pi4/argononed.nix
index 51b99c7..270cb19 100644
--- a/hosts/pi4/argononed.nix
+++ b/hosts/pi4/argononed.nix
@@ -1,28 +1,69 @@
-#{ pkgs, ... }:
-#let
-#  argononed = pkgs.callPackage ./pkg.nix {};
-#in
-#{
-#  environment.systemPackages = [ argononed ];
-#}
-{ lib, stdenv, pkgs, config, ...}:
+{ ... }:
 {
-  imports = let
-    argononed = fetchGit {
-      url = "https://github.com/mjallen18/argononed.git";
-      ref = "dev"; # Or any other branches deemed suitable
-    };
-  in
-    [ "${argononed}/OS/nixos" ];
-
-  services.argonone = {
+ programs.argon.one = {
     enable = true;
-    logLevel = 4;
+
     settings = {
-      fanTemp0 = 36; fanSpeed0 = 10;
-      fanTemp1 = 41; fanSpeed1 = 50;
-      fanTemp2 = 46; fanSpeed2 = 80;
-      hysteresis = 4;
+      # Is 'celsius' by default, can also be set to 'fahrenheit'
+      displayUnits = "celsius";
+
+      # This is the same config as the original Argon40 config.
+      # This is also the default config for this flake.
+      fanspeed = [
+        {
+          # This the temperature threshold at which this fan speed will activate.
+          # The temperature is in the above specified unit.
+          temperature = 55;
+          # This is speed percentage at which the fan will spin.
+          speed = 30;
+        }
+        {
+          temperature = 60;
+          speed = 55;
+        }
+        {
+          temperature = 65;
+          speed = 100;
+        }
+      ];
+      ir = {
+        enable = true;
+        gpio.enable = true;
+        keymap = {
+          "POWER" = "00ff39c6";
+          "UP" = "00ff53ac";
+          "DOWN" = "00ff4bb4";
+          "LEFT" = "00ff9966";
+          "RIGHT" = "00ff837c";
+          "VOLUMEUP" = "00ff01fe";
+          "VOLUMEDOWN" = "00ff817e";
+          "OK" = "00ff738c";
+          "HOME" = "00ffd32c";
+          "MENU" = "00ffb946";
+          "BACK" = "00ff09f6";
+        };
+      };
     };
   };
 }
+# { lib, stdenv, pkgs, config, ...}:
+# {
+#   imports = let
+#     argononed = fetchGit {
+#       url = "https://github.com/mjallen18/argononed.git";
+#       ref = "dev"; # Or any other branches deemed suitable
+#     };
+#   in
+#     [ "${argononed}/OS/nixos" ];
+
+#   services.argonone = {
+#     enable = true;
+#     logLevel = 4;
+#     settings = {
+#       fanTemp0 = 36; fanSpeed0 = 10;
+#       fanTemp1 = 41; fanSpeed1 = 50;
+#       fanTemp2 = 46; fanSpeed2 = 80;
+#       hysteresis = 4;
+#     };
+#   };
+# }
diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix
index a53c655..6005fe4 100755
--- a/hosts/pi4/configuration.nix
+++ b/hosts/pi4/configuration.nix
@@ -5,7 +5,7 @@
 { config, pkgs, ... }:
 let
   user = "matt";
-  password = config.sops.secrets."pi4/matt-password".path;
+  # password = config.sops.secrets."pi4/matt-password".path;
 in
 {
   imports = [
@@ -73,7 +73,8 @@ in
     mutableUsers = false;
     users."${user}" = {
       isNormalUser = true;
-      hashedPasswordFile = password;
+      # hashedPasswordFile = password;
+      password = "BogieDudie1";
       extraGroups = [
         "wheel"
         "docker"
diff --git a/hosts/pi4/networking.nix b/hosts/pi4/networking.nix
index 6968e62..9043a0e 100755
--- a/hosts/pi4/networking.nix
+++ b/hosts/pi4/networking.nix
@@ -28,27 +28,27 @@ in
         ];
 
         profiles = {
-          "Joey's Jungle 5G" = {
-            connection = {
-              id = "Joey's Jungle 5G";
-              type = "wifi";
-            };
-            ipv4 = {
-              method = "auto";
-            };
-            ipv6 = {
-              addr-gen-mode = "stable-privacy";
-              method = "auto";
-            };
-            wifi = {
-              mode = "infrastructure";
-              ssid = "Joey's Jungle 5G";
-            };
-            wifi-security = {
-              key-mgmt = "sae";
-              psk = "$PSK";
-            };
-          };
+          # "Joey's Jungle 5G" = {
+          #   connection = {
+          #     id = "Joey's Jungle 5G";
+          #     type = "wifi";
+          #   };
+          #   ipv4 = {
+          #     method = "auto";
+          #   };
+          #   ipv6 = {
+          #     addr-gen-mode = "stable-privacy";
+          #     method = "auto";
+          #   };
+          #   wifi = {
+          #     mode = "infrastructure";
+          #     ssid = "Joey's Jungle 5G";
+          #   };
+          #   wifi-security = {
+          #     key-mgmt = "sae";
+          #     psk = "$PSK";
+          #   };
+          # };
 
           "static-enabcm6e4ei0" = {
             connection = {