From 252126317a51db9366df81080a5fd029baf6219a Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 15 May 2023 14:29:56 +0200
Subject: [PATCH] thor: Add deploy config, desktop stuff, enable GPU
 modesetting

---
 machines/default.nix            |  6 ++++++
 machines/thor/configuration.nix | 25 +++++++++++++++++++++++--
 machines/thor/home.nix          | 17 +++--------------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/machines/default.nix b/machines/default.nix
index ddc1be0..cc7c468 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -73,5 +73,11 @@ inputs: {
   thor = {
     system = "aarch64-linux";
     config = import ./thor/configuration.nix inputs;
+    deploy = {
+      host = "10.0.0.198";
+      sshUser = "erwin";
+      buildOn = "local";
+      substituteOnTarget = true;
+    };
   };
 }
diff --git a/machines/thor/configuration.nix b/machines/thor/configuration.nix
index e25e1b4..fead530 100644
--- a/machines/thor/configuration.nix
+++ b/machines/thor/configuration.nix
@@ -15,14 +15,34 @@
     users.erwin = {
       enable = true;
     };
-    base.kernel = pkgs.linuxKernel.packages.linux_rpi4;
+    base = {
+      kernel = pkgs.linuxKernel.packages.linux_rpi4;
+      plymouth.enable = true;
+    };
+    desktop = {
+      enable = true;
+      wayland = true;
+    };
+    fonts.enable = true;
+    gnome.enable = true;
+    greetd = {
+      enable = true;
+      sway = true;
+    };
     networking.enable = true;
-    nix-common.enable = true;
+    nix-common = {
+      enable = true;
+      remote-builders = true;
+    };
     systemd.enable = true;
   };
 
   hardware = {
     enableAllFirmware = true;
+    raspberry-pi."4".fkms-3d = {
+      enable = true;
+      cma = 256;
+    };
   };
 
   boot = {
@@ -30,6 +50,7 @@
   };
 
   zramSwap.enable = true;
+  sdImage.compressImage = false;
 
   networking = {
     hostName = "thor";
diff --git a/machines/thor/home.nix b/machines/thor/home.nix
index 500782c..4f35e84 100644
--- a/machines/thor/home.nix
+++ b/machines/thor/home.nix
@@ -26,20 +26,9 @@ in
         emacs = {
           enable = true;
           # package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
-          package =
-            let
-              emacs29 = pkgs.emacsPgtk.overrideAttrs (_: {
-                version = "29.0.90+gitc0ab4e9ca932";
-                src = pkgs.fetchFromSavannah {
-                  repo = "emacs";
-                  rev = "c0ab4e9ca9326c472ff1d9d01a0e3966f20fda27";
-                  sha256 = "HxwVIVPIPMpp551Uo2qzcSSk2cM1N4YDBH6p3V2P4Rg=";
-                };
-              });
-            in
-            emacs29.override {
-              treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
-            };
+          package = pkgs.emacsUnstablePgtk.override {
+            treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
+          };
 
           daemon = true;
         };