From 6ea3eb4b1901af7e71635c4877b8ae8e057a624d Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Tue, 14 Nov 2023 02:02:35 -0800
Subject: [PATCH] Adds p4box host

---
 flake.nix                 |  1 +
 home/programs/default.nix |  2 --
 nixos/hosts/p4box.nix     | 37 ++++++++++++++++++++++++++++++++++++
 packages/default.nix      |  1 -
 packages/hishtory.nix     | 40 ---------------------------------------
 5 files changed, 38 insertions(+), 43 deletions(-)
 create mode 100644 nixos/hosts/p4box.nix
 delete mode 100644 packages/hishtory.nix

diff --git a/flake.nix b/flake.nix
index 3e897fa..103a390 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,6 +83,7 @@
         nixosConfigurations.x86_64-live = mkNixos "x86_64" ./nixos/hosts/x86_64-live.nix;
         nixosConfigurations.aarch64-live = mkNixos "aarch64" ./nixos/hosts/aarch64-live.nix;
 
+        nixosConfigurations.p4box = mkNixos "i686" ./nixos/hosts/p4box.nix;
         nixosConfigurations.nixbox = mkNixos "x86_64" ./nixos/hosts/nixbox.nix;
         nixosConfigurations.thinkpad = mkNixos "x86_64" ./nixos/hosts/thinkpad.nix;
 
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 095e4b0..6c23a42 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -63,8 +63,6 @@
     hishtory = {
       enable = true;
       enableZshIntegration = true;
-      enableConfig = true;
-      settings.enable-control-r = true;
     };
 
     java = {
diff --git a/nixos/hosts/p4box.nix b/nixos/hosts/p4box.nix
new file mode 100644
index 0000000..ac4243b
--- /dev/null
+++ b/nixos/hosts/p4box.nix
@@ -0,0 +1,37 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    ../profiles/default.nix
+    ../users/willem
+    ../modules/zerotier.nix
+  ];
+
+  boot.loader.grub.enable = true;
+
+  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "sata_sil" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = [];
+  boot.extraModulePackages = [];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/4f558bc6-e3b3-46e4-a3b1-520eab6d090f";
+    fsType = "ext4";
+  };
+
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/413077c1-e921-4377-8c7d-ca2acf8a60d2";}
+  ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  networking.hostName = "p4box";
+
+  nixpkgs.hostPlatform = lib.mkDefault "i686-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/packages/default.nix b/packages/default.nix
index 103f1d2..eb4e515 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,4 +1,3 @@
 _final: prev: {
   org-auctex = prev.callPackage ./org-auctex.nix {};
-  hishtory = prev.callPackage ./hishtory.nix {};
 }
diff --git a/packages/hishtory.nix b/packages/hishtory.nix
deleted file mode 100644
index f5ed1db..0000000
--- a/packages/hishtory.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  breakpointHook,
-  lib,
-}:
-buildGoModule rec {
-  pname = "hishtory";
-  version = "0.251";
-
-  src = fetchFromGitHub {
-    owner = "ddworken";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-as7OO14S2ia9ty/HRP35Zw9EOvFxBQeCzCluDWo/VnI=";
-  };
-
-  vendorHash = "sha256-HzHLGrPXUSkyt2Dr7tLjfJrbg/EPBHkljoXIlPWIppU=";
-
-  ldflags = [
-    "-s -w -X github.com/ddworken/hishtory/client/lib.Version=${version}"
-    "-extldflags '-static'"
-  ];
-
-  excludedPackages = ["backend/server" "client"];
-
-  postInstall = ''
-    mkdir -p $out/share/hishtory
-    cp client/lib/config.* $out/share/hishtory
-  '';
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Your shell history: synced, queryable, and in context";
-    homepage = "https://github.com/ddworken/hishtory";
-    license = licenses.mit;
-    maintainers = with maintainers; [Enzime];
-  };
-}