From acee2a06d4694109c4ac48905eee53cc917dd57e Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaron@system76.com>
Date: Tue, 14 Nov 2023 17:19:51 -0700
Subject: [PATCH] Update joker build and add new shepard flake

---
 systems/x86_64/shepard/flake.nix   | 123 +++++++++++++++++++++++++++++
 systems/x86_64/thelio-b1/flake.nix |   2 -
 2 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 systems/x86_64/shepard/flake.nix

diff --git a/systems/x86_64/shepard/flake.nix b/systems/x86_64/shepard/flake.nix
new file mode 100644
index 0000000..77d0146
--- /dev/null
+++ b/systems/x86_64/shepard/flake.nix
@@ -0,0 +1,123 @@
+{
+  description = "Shepard";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-23.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+  };
+
+  outputs = { self, nixpkgs, nixos-hardware, ... }@inputs: {
+    nixosConfigurations = {
+      "shepard" = nixpkgs.lib.nixosSystem {
+        system = "aarch64-linux";
+        modules = [
+          # Import the configuration.nix we used before, so that the old configuration file can still take effect. 
+          # Note: /etc/nixos/configuration.nix itself is also a Nix Module, so you can import it directly here
+#          nixos-hardware.nixosModules.raspberry-pi-4	
+#          ./configuration.nix
+          ./hardware-configuration.nix
+
+        ({config, pkgs, ...}: {
+
+          # Latest kernel
+          boot.kernelPackages = pkgs.linuxPackages_latest;
+  
+          boot.loader = {
+             systemd-boot.enable = true;
+             systemd-boot.consoleMode = "0";
+          }; 
+
+          boot.initrd.luks.devices = {
+             root = {
+                device = "/dev/nvme1n1p2";
+                preLVM = true; 
+             };
+          };
+
+          nix = {
+             settings.auto-optimise-store = true;
+             settings.experimental-features = [ "nix-command" "flakes" ];
+ 
+             gc = {
+                automatic = true;
+                dates = "weekly";
+                options = "--delete-older-than 30d";
+             };
+          };
+
+          networking = {
+             hostName = "shepard";
+             networkmanager.enable = true;   
+          };
+
+          time.timeZone = "America/Denver";
+
+          environment.systemPackages = with pkgs; [
+             avahi
+             cargo
+             dmidecode
+             fire
+             firefox
+             fish
+             git
+             git-lfs
+             libcamera
+             lshw
+             roboto-slab
+             neofetch
+             restic
+             unzip
+             wget
+             xz
+          ];
+
+          users.users.aaronh = {
+             description = "Aaron Honeycutt";
+             home = "/home/aaronh";
+             extraGroups = [ "wheel" "networkmanager" "adm" ];
+             isNormalUser = true;
+             shell = pkgs.fish;
+             hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx.";
+          };
+
+          programs.fish.enable = true;
+
+          # Enable Pipewire
+          security.rtkit.enable = true;
+          services.pipewire = {
+             enable = true;
+             alsa.enable = true;
+             alsa.support32Bit = true;
+             pulse.enable = true;
+          };
+          
+          # Turn off PulseAudio 
+          hardware.pulseaudio.enable = false;
+
+          # Enable Bluetooth
+          hardware.bluetooth.enable = true;
+
+          # Enable SSH
+          services.openssh.enable = true;
+
+          # Enable CUPS
+          services.printing.enable = true;
+
+          # Allow Unfree
+          nixpkgs.config.allowUnfree = true;
+
+          # System
+          system = {
+             stateVersion = "23.05";
+             autoUpgrade.enable = true;
+          };  
+         })
+       ];
+     };
+   };
+ };
+}
diff --git a/systems/x86_64/thelio-b1/flake.nix b/systems/x86_64/thelio-b1/flake.nix
index 959c151..fa89f0b 100644
--- a/systems/x86_64/thelio-b1/flake.nix
+++ b/systems/x86_64/thelio-b1/flake.nix
@@ -40,8 +40,6 @@
               # kernelPackages = pkgs.linuxPackages_latest;
               # kernelParams = [ "console=ttyS0,1920n8" ];
 
-              binfmt.emulatedSystems = [ "aarch64-linux" ];
-
               loader.systemd-boot.enable = true;
               loader.systemd-boot.consoleMode = "0";
             };