hosts/pi4/boot.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-
-{
-  boot = {
-    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "usbhid"
-      "usb_storage"
-    ];
-    loader = {
-      grub.enable = false;
-      generic-extlinux-compatible.enable = true;
-    };
-  };
-}

hosts/pi4/default.nix

@@ -1,15 +1,49 @@
 {
+  pkgs,
   systemConfig,
   ...
 }:
 
 {
-  imports = [
-    ./boot.nix
-    ./hardware.nix
-    ./networking.nix
-    ./security.nix
+  boot = {
+    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "usbhid"
+      "usb_storage"
     ];
+    loader = {
+      grub.enable = false;
+      generic-extlinux-compatible.enable = true;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    vim
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+
+  hardware.enableRedistributableFirmware = true;
+
+  networking = {
+    hostName = systemConfig.hostName;
+    networkmanager.enable = true;
+  };
+
+  services.openssh.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+  services.pcscd.enable = true;
 
   system.stateVersion = systemConfig.version;
 

hosts/pi4/hardware.nix

@@ -1,12 +0,0 @@
-{
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-      options = [ "noatime" ];
-    };
-    # TODO mount ext hdd
-  };
-
-  hardware.enableRedistributableFirmware = true;
-}

hosts/pi4/home-manager/default.nix

@@ -1,31 +1,17 @@
-{
-  lib,
-  inputs,
-  outputs,
-  systemConfig,
-  ...
-}:
+{ pkgs, lib, systemConfig, ... }:
 
 {
   imports = [
-    inputs.catppuccin.homeModules.catppuccin
-    (lib.custom.relativeToRoot "shared/home-manager/btop.nix")
     (lib.custom.relativeToRoot "shared/home-manager/development/git.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/development/nixvim")
-    (lib.custom.relativeToRoot "shared/home-manager/fastfetch.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/fish.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/gpg.nix")
   ];
 
   home.stateVersion = systemConfig.version;
 
-  # Adds pkgs.unstable in order to fetch packages from unstable repositories
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
+  programs.git.signing.key = "E3FA0E995C0D0E5E";
 
-  programs = {
-    git.signing.key = "E3FA0E995C0D0E5E";
-    # Let Home Manager install and manage itself.
-    home-manager.enable = true;
+  programs.gpg.enable = true;
+  services.gpg-agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
   };
-
 }

hosts/pi4/networking.nix

@@ -1,10 +0,0 @@
-{ systemConfig, ... }:
-
-{
-  networking = {
-    hostName = systemConfig.hostName;
-    networkmanager.enable = true;
-  };
-
-  services.openssh.enable = true;
-}

hosts/pi4/security.nix

@@ -1,7 +0,0 @@
-{
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-  services.pcscd.enable = true;
-}

justfile

@@ -4,12 +4,6 @@ default:
 fmt:
     treefmt --on-unmatched info
 
-build HOST:
-    git add .
-    just fmt
-    nh os build . -H {{HOST}}
-
-
 test *FLAGS:
     git add .
     just fmt

shared/home-manager/default-applications.nix

@@ -1,3 +1,4 @@
+# TODO more defaults
 {
   xdg.mimeApps = {
     enable = true;

shared/home-manager/gpg.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 
 {
-  programs.gpg.enable = true;
   services.gpg-agent = {
     enable = true;
     enableFishIntegration = true;

shared/modules/security/default.nix

@@ -2,6 +2,4 @@
   imports = [
     ./yubikey.nix
   ];
-
-  programs.gnupg.agent.enable = true;
 }

shared/modules/security/yubikey.nix

@@ -7,6 +7,8 @@
     yubioath-flutter # GUI
   ];
 
+  programs.gnupg.agent.enable = true;
+
   security = {
     pam = {
       services = {