From 1712d8869530e221223320c9c2d71f486a0d65c9 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 2 Feb 2024 22:38:32 -0600
Subject: [PATCH] Raw font works

---
 nixos/dragon.nix              |  1 +
 nixos/htpc.nix                | 75 ++++++++++++++++++++++++++++++++---
 pkgs/iosevka-lyteterm-raw.nix |  3 +-
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/nixos/dragon.nix b/nixos/dragon.nix
index d6993c1..cc31242 100644
--- a/nixos/dragon.nix
+++ b/nixos/dragon.nix
@@ -35,6 +35,7 @@
     imports = with outputs.homeManagerModules; [
       sway
       pass
+      firefox-no-tabs
       melee
       # sway-laptop
       hyprland
diff --git a/nixos/htpc.nix b/nixos/htpc.nix
index 23c7575..33d465a 100644
--- a/nixos/htpc.nix
+++ b/nixos/htpc.nix
@@ -11,9 +11,10 @@
 
   imports = with outputs.nixosModules; [
     (modulesPath + "/installer/scan/not-detected.nix")
-    inputs.hardware.nixosModules.common-cpu-intel-kaby-lake
-    inputs.hardware.nixosModules.common-pc-ssd
-    inputs.hardware.nixosModules.common-pc
+    inputs.hardware.nixosModules.raspberry-pi-4
+    # inputs.hardware.nixosModules.common-cpu-intel-kaby-lake
+    # inputs.hardware.nixosModules.common-pc-ssd
+    # inputs.hardware.nixosModules.common-pc
     desktop-usage
     gnome
     wifi
@@ -21,6 +22,15 @@
     flanfamkiosk
   ];
 
+  hardware = {
+    raspberry-pi."4".apply-overlays-dtmerge.enable = true;
+    deviceTree = {
+      enable = true;
+      filter = "*rpi-4-*.dtb";
+    };
+  };
+  console.enable = false;
+
   services.gnome.gnome-remote-desktop.enable = true;
 
   networking.networkmanager.enable = true;
@@ -32,7 +42,12 @@
 
   environment.systemPackages = with pkgs;
   #with pkgs;
-    [variety];
+    [
+      libcec
+      variety
+      libraspberrypi
+      raspberrypi-eeprom
+    ];
 
   programs.steam.enable = true;
   programs.steam.remotePlay.openFirewall = true;
@@ -40,6 +55,23 @@
   services.xserver.displayManager.autoLogin.enable = true;
   services.xserver.displayManager.autoLogin.user = "daniel";
 
+  services.xserver = {
+    enable = true;
+    displayManager.lightdm.enable = true;
+    desktopManager.gnome.enable = true;
+    videoDrivers = ["fbdev"];
+  };
+
+  hardware.raspberry-pi."4".fkms-3d.enable = true;
+  hardware.raspberry-pi."4".audio.enable = true;
+
+  nixpkgs.overlays = [
+    # nixos-22.05
+    # (self: super: { libcec = super.libcec.override { inherit (self) libraspberrypi; }; })
+    # nixos-22.11
+    (self: super: {libcec = super.libcec.override {withLibraspberrypi = true;};})
+  ];
+
   # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
   systemd.services."getty@tty1".enable = false;
   systemd.services."autovt@tty1".enable = false;
@@ -57,7 +89,9 @@
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
   boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
+  boot.kernelModules = [
+    # "kvm-intel"
+  ];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
@@ -76,7 +110,38 @@
     };
   };
 
+  services.udev.extraRules = ''
+    # allow access to raspi cec device for video group (and optionally register it as a systemd device, used below)
+    SUBSYSTEM=="vchiq", GROUP="video", MODE="0660", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/vchiq"
+  '';
+
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
+  # optional: attach a persisted cec-client to `/run/cec.fifo`, to avoid the CEC ~1s startup delay per command
+  # scan for devices: `echo 'scan' &gt; /run/cec.fifo ; journalctl -u cec-client.service`
+  # set pi as active source: `echo 'as' &gt; /run/cec.fifo`
+  systemd.sockets."cec-client" = {
+    after = ["dev-vchiq.device"];
+    bindsTo = ["dev-vchiq.device"];
+    wantedBy = ["sockets.target"];
+    socketConfig = {
+      ListenFIFO = "/run/cec.fifo";
+      SocketGroup = "video";
+      SocketMode = "0660";
+    };
+  };
+  systemd.services."cec-client" = {
+    after = ["dev-vchiq.device"];
+    bindsTo = ["dev-vchiq.device"];
+    wantedBy = ["multi-user.target"];
+    serviceConfig = {
+      ExecStart = ''${pkgs.libcec}/bin/cec-client -d 1'';
+      ExecStop = ''/bin/sh -c "echo q &gt; /run/cec.fifo"'';
+      StandardInput = "socket";
+      StandardOutput = "journal";
+      Restart = "no";
+    };
+  };
+
   system.stateVersion = "23.11";
 }
diff --git a/pkgs/iosevka-lyteterm-raw.nix b/pkgs/iosevka-lyteterm-raw.nix
index f07dec0..d6a0eaf 100644
--- a/pkgs/iosevka-lyteterm-raw.nix
+++ b/pkgs/iosevka-lyteterm-raw.nix
@@ -16,7 +16,8 @@
       runHook preInstall
       install -d "$out"
       ls -la .
-      install ./* "$out"
+      ls -la dist
+      cp -r dist/* "$out"
       runHook postInstall
     '';
   }))