diff --git a/flake.nix b/flake.nix
index 96d6f74..c967c5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,9 +27,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixos-hardware = {
-      url = "github:NixOS/nixos-hardware/master";
-    };
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
   outputs = {
@@ -54,8 +52,8 @@
           home-manager.nixosModules.home-manager
           {
             environment.systemPackages = [
-              agenix.packages.${system}.default
-              osbm-nvim.packages.${system}.default
+              agenix.packages.x86_64-linux.default
+              osbm-nvim.packages.x86_64-linux.default
             ];
           }
         ];
@@ -71,8 +69,8 @@
           home-manager.nixosModules.home-manager
           {
             environment.systemPackages = [
-              agenix.packages.${system}.default
-              osbm-nvim.packages.${system}.default
+              agenix.packages.x86_64-linux.default
+              osbm-nvim.packages.x86_64-linux.default
             ];
           }
         ];
@@ -87,7 +85,7 @@
           ./hosts/harmonica/configuration.nix
           {
             environment.systemPackages = [
-              agenix.packages.${system}.default
+              agenix.packages.aarch64-linux.default
             ];
           }
         ];
@@ -102,8 +100,8 @@
           home-manager.nixosModules.home-manager
           {
             environment.systemPackages = [
-              agenix.packages.${system}.default
-              osbm-nvim.packages.${system}.default
+              agenix.packages.aarch64-linux.default
+              osbm-nvim.packages.aarch64-linux.default
             ];
           }
         ];
diff --git a/hosts/pochita-sd/configuration.nix b/hosts/pochita-sd/configuration.nix
index 8c6ddeb..f09ae4b 100644
--- a/hosts/pochita-sd/configuration.nix
+++ b/hosts/pochita-sd/configuration.nix
@@ -1,42 +1,46 @@
-{ pkgs, lib, ... }: {
-      # bcm2711 for rpi 3, 3+, 4, zero 2 w
-      # bcm2712 for rpi 5
-      # See the docs at:
-      # https://www.raspberrypi.com/documentation/computers/linux_kernel.html#native-build-configuration
-      raspberry-pi-nix.board = "bcm2712";
-      time.timeZone = "America/Chicago";
-      users.users.root = {
-        initialPassword = "root";
-      };
-      # Define a user account. Don't forget to set a password with ‘passwd’.
-      users.users.osbm = {
-        isNormalUser = true;
-        extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-        initialPassword = "changeme";
-      };
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  # bcm2711 for rpi 3, 3+, 4, zero 2 w
+  # bcm2712 for rpi 5
+  # See the docs at:
+  # https://www.raspberrypi.com/documentation/computers/linux_kernel.html#native-build-configuration
+  raspberry-pi-nix.board = "bcm2712";
+  time.timeZone = "America/Chicago";
+  users.users.root = {
+    initialPassword = "root";
+  };
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.osbm = {
+    isNormalUser = true;
+    extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
+    initialPassword = "changeme";
+  };
 
-      networking = {
-        hostName = "pochita";
-      };
-      environment.systemPackages = with pkgs; [
-        neovim
-        git-lfs
-        git
-        wakeonlan
-        htop
-        unzip
-        zip
-        wget
-      ];
+  networking = {
+    hostName = "pochita";
+  };
+  environment.systemPackages = with pkgs; [
+    neovim
+    git-lfs
+    git
+    wakeonlan
+    htop
+    unzip
+    zip
+    wget
+  ];
 
-      nix.settings.experimental-features = ["nix-command" "flakes"];
+  nix.settings.experimental-features = ["nix-command" "flakes"];
 
-      nix.settings.trusted-users = ["root" "osbm"];
+  nix.settings.trusted-users = ["root" "osbm"];
 
-      nixpkgs.hostPlatform = "aarch64-linux";
+  nixpkgs.hostPlatform = "aarch64-linux";
 
-      services.openssh = {
-        enable = true;
-      };
-      system.stateVersion = "25.05";
-    }
+  services.openssh = {
+    enable = true;
+  };
+  system.stateVersion = "25.05";
+}
diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix
index bf7e788..1741424 100644
--- a/hosts/pochita/configuration.nix
+++ b/hosts/pochita/configuration.nix
@@ -41,7 +41,7 @@ in {
 
   services.getty.autologinUser = "osbm";
 
-   # The board and wanted kernel version
+  # The board and wanted kernel version
   raspberry-pi-nix = {
     board = "bcm2712";
     #kernel-version = "v6_10_12";
diff --git a/hosts/pochita/hardware-configuration.nix b/hosts/pochita/hardware-configuration.nix
index 195f999..073bec0 100644
--- a/hosts/pochita/hardware-configuration.nix
+++ b/hosts/pochita/hardware-configuration.nix
@@ -1,30 +1,34 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = [];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = [];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot/firmware" =
-    { device = "/dev/disk/by-uuid/2178-694E";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot/firmware" = {
+    device = "/dev/disk/by-uuid/2178-694E";
+    fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
+  };
 
-  swapDevices = [ ];
+  swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -35,4 +39,4 @@
   # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}
\ No newline at end of file
+}
diff --git a/modules/fonts.nix b/modules/fonts.nix
index feed1dc..a8907b1 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -4,7 +4,6 @@
   config,
   ...
 }: {
-
   options = {
     enableFonts = lib.mkOption {
       type = lib.types.bool;
@@ -36,6 +35,4 @@
       ];
     })
   ];
-
-
 }
diff --git a/modules/home.nix b/modules/home.nix
index ad2c1eb..f49d7f1 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -24,8 +24,6 @@
     hashKnownHosts = true;
     compression = true;
 
-
-
     matchBlocks = {
       "tartarus" = {
         hostname = "192.168.0.4";