Add my Pinebook into the mix

flake.nix

@@ -25,6 +25,7 @@
     nur,
     nixos-mailserver,
     blender-bin,
+    nixos-hardware,
     home-manager,
     ...
   } @inputs: let
@@ -59,6 +60,13 @@
 	  nixos-mailserver.nixosModule
         ];
       };
+      JimPine = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs outputs;};
+        modules = [
+          ./nixos/pinebook.nix
+	  nixos-hardware.nixosModules.pine64-pinebook-pro
+        ];
+      };
       JimLenovo = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
@@ -85,6 +93,14 @@
           ./home-manager/jimbo_server.nix
         ];
       };
+      "jimbo@JimPine" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.aarch64-linux;
+        extraSpecialArgs = {inherit inputs outputs;};
+        modules = [
+          ./home-manager/jimbo_pinebook.nix
+	  nur.nixosModules.nur
+        ];
+      };
       "jimbo@JimLenovo" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};

home-manager/jimbo_pinebook.nix

@@ -0,0 +1,35 @@
+{
+  imports = [
+    # Common modules
+    ./home.nix
+    ./users/jimbo.nix
+    ./tuiapps/git.nix
+
+    # GUI Apps
+    ./misc/guifiles.nix
+    ./sway/sway.nix
+    ./sway/swaylock.nix
+    ./guiapps/gtk.nix
+    ./guiapps/foot.nix
+    ./guiapps/librewolf.nix
+    ./guiapps/mangohud.nix
+    ./guiapps/mpv.nix
+    ./guiapps/pcmanfm-qt.nix
+    ./guiapps/rofi.nix
+    ./guiapps/swappy.nix
+    ./guiapps/easyeffects.nix
+    ./tuiapps/ncmpcpp.nix
+
+    # Misc apps and tools
+    ./misc/useful.nix
+    ./misc/avtools.nix
+    ./misc/filemanager.nix
+    ./misc/remotedesktop.nix
+    ./misc/variables.nix
+
+    # Services
+    ./services/gnome-keyring.nix
+    ./services/mako.nix
+    ./services/udiskie.nix
+  ];
+}

nixos/hardware/extlinux.nix

@@ -0,0 +1,7 @@
+{
+  # For ARM machines
+  boot.loader = {
+    generic-extlinux-compatible.enable = true;
+    grub.enable = false;
+  };
+}

nixos/hardware/machines/desktop.nix

@@ -1,4 +1,3 @@
-# This file was initially made by 'nixos-generate-config', try not to edit too much
 { config, lib, pkgs, modulesPath, ... }: let
   # Set common boot paramaters
   commonKernelParams = [

nixos/hardware/machines/lenovo.nix

@@ -1,4 +1,3 @@
-# This file was initially made by 'nixos-generate-config', try not to edit too much
 { config, lib, pkgs, modulesPath, ... }: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")

nixos/hardware/machines/pinebook.nix

@@ -0,0 +1,34 @@
+{ config, outputs, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ ];
+      kernelModules = [ ];
+    };
+    blacklistedKernelModules = [
+      "pcspkr"
+    ];               
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/25738e24-385e-4bcf-bff5-d0e6274003b6";
+      fsType = "btrfs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/01D2-E962";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/95c43e5a-b53d-41fd-99a3-54181510070e"; }
+  ];
+
+  networking.useDHCP = lib.mkDefault true;
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}

nixos/hardware/machines/server.nix

@@ -104,7 +104,7 @@
   networking.useDHCP = lib.mkDefault true;
 
   # Hardware settings
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   boot.swraid.enable = true;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

nixos/hardware/opengl.nix

@@ -2,7 +2,6 @@
   # Enable OpenGL
   hardware.opengl = {
     enable = true;
-    driSupport = true;
     driSupport32Bit = true;
     extraPackages = with pkgs; [
       vulkan-loader

nixos/hardware/systemdboot.nix

@@ -1,5 +1,5 @@
 {
-  # For UEFI Machines
+  # For UEFI machines
   boot.loader.systemd-boot = {
     enable = true;
     netbootxyz.enable = true;

nixos/pinebook.nix

@@ -0,0 +1,47 @@
+{ lib, ...}: {
+  imports = [
+    # Base configs
+    ./base.nix
+
+    # Import users and groups
+    ./users/jimbo.nix
+    ./users/groups.nix
+
+    # Desktop only
+    ./desktop/misc.nix
+    ./desktop/sway.nix
+    ./desktop/greetd-sway.nix
+    ./desktop/printing.nix
+    ./desktop/pipewire.nix
+    ./desktop/bluetooth.nix
+    ./desktop/firewall.nix
+    ./desktop/fonts.nix
+    ./desktop/qt.nix
+
+    # Laptop/Portable only
+    ./hardware/wireless.nix
+
+    # Modules
+    ./modules/security.nix
+    ./modules/legacy.nix
+
+    # Hardware
+    ./hardware/machines/pinebook.nix
+    ./hardware/extlinux.nix
+    ./hardware/opengl.nix
+
+    # Services
+    ./services/openssh.nix
+    ./services/udev.nix
+    ./services/mpd.nix
+  ];
+
+  # Disable 32 bit graphics
+  hardware.opengl.driSupport32Bit = lib.mkForce false;
+
+  # Set hostname
+  networking.hostName = "JimPine";
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  system.stateVersion = "24.05";
+}