From 569734690bd7d0d974628d192994fff47c8f748e Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Wed, 7 Jun 2023 17:24:40 -0500
Subject: [PATCH] Move desktop module into sbc-deploys

---
 flake.lock                  |  8 ++---
 flake.nix                   |  2 ++
 modules/desktop/default.nix | 63 +++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 modules/desktop/default.nix

diff --git a/flake.lock b/flake.lock
index 076f4d4..5eefde7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -152,11 +152,11 @@
         "rockchip": "rockchip"
       },
       "locked": {
-        "lastModified": 1686167917,
-        "narHash": "sha256-yZRKsPjV1pRe4fxMI/OKd9BLkBNzx3I5TSZaPux9X9s=",
+        "lastModified": 1686175220,
+        "narHash": "sha256-+jdhbkTLmvf2ZCwFjlvZXCHg7fR4v4G+eM0KubQ5x2c=",
         "ref": "asonix/nabam-sd-image",
-        "rev": "f606e4ebc4e7f4cc898b37fbc27079546ea6ea1d",
-        "revCount": 39,
+        "rev": "b0eda5c0d9e84a9cf81e164b83c24104b9096fa7",
+        "revCount": 41,
         "type": "git",
         "url": "https://git.asonix.dog/asonix/sd-images"
       },
diff --git a/flake.nix b/flake.nix
index 22d73cd..d32df50 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,7 @@
       k3sModule = import ./modules/k3s;
       networkModule = import ./modules/network;
       wireguardModule = import ./modules/wireguard;
+      desktopModule = import ./modules/desktop;
 
       makeConfig = { hostname, extraModules ? [ ] }:
         nixpkgs.lib.nixosSystem {
@@ -899,6 +900,7 @@
               address = "192.168.5.13/24";
               privateKeyFile = config.sops.secrets.pinetabWireguardKey.path;
             })
+            (desktopModule)
           ] ++ sd-images.packages.${system}.PineTab2.modules;
         };
 
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 0000000..5f016cc
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,63 @@
+{ pkgs, ... }:
+
+{
+  users.users.asonix = {
+    extraGroups = [ "networkmanager" ];
+    shell = pkgs.zsh;
+  };
+  networking.networkmanager.enable = true;
+  services = {
+    xserver = {
+      layout = "us";
+      xkbVariant = "";
+      enable = true;
+      desktopManager.gnome.enable = true;
+      displayManager.gdm.enable = true;
+    };
+    flatpak.enable = true;
+    printing.enable = true;
+    avahi = {
+      enable = true;
+      openFirewall = true;
+    };
+    pipewire = {
+      enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+      pulse.enable = true;
+      jack.enable = true;
+    };
+  };
+  programs = {
+    dconf.enable = true;
+    zsh.enable = true;
+  };
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    android-tools
+    firefox
+    git
+    vim
+    zsh
+
+    gnomeExtensions.improved-osk
+    gnomeExtensions.fullscreen-on-new-workspace
+    gnomeExtensions.gesture-improvements
+
+    usbutils
+    pciutils
+    wireguard-tools
+  ];
+
+  environment.sessionVariables = {
+    MOZ_ENABLE_WAYLAND = "1";
+  };
+
+  networking.hostName = "pinetab2";
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+}