From de517dca0772b7ea7c3a5998d80aac8303b9668e Mon Sep 17 00:00:00 2001
From: Kate Adkins <kate@deprekated.net>
Date: Mon, 11 Nov 2024 16:57:50 -0700
Subject: [PATCH] tweaks for design

---
 flake.nix                     |  2 ++
 nixos/configs/droid-gui.nix   |  3 +++
 nixos/configuration.droid.nix | 23 ++++++++++++++++++++---
 nixos/packages/gui.droid.nix  |  3 +--
 nixos/packages/gui.pkgs.nix   | 23 +++++++++--------------
 xonsh/localhost.xsh           |  7 +++++--
 6 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index ae6c008..33355ba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -490,6 +490,7 @@
         pkgs = import nixpkgs {
           system = "aarch64-linux";
           config.allowUnfree = true;
+          config.permittedInsecurePackages = [ "olm-3.2.16" ];
         };
         extraSpecialArgs = mkSpecialArgsDroid "aarch64-linux" pkgs;
 
@@ -504,6 +505,7 @@
 
           ./nixos/packages/droid.nix
           ./nixos/packages/offline.droid.nix
+          ./nixos/packages/gui.droid.nix
         ];
 
       };
diff --git a/nixos/configs/droid-gui.nix b/nixos/configs/droid-gui.nix
index 71f0b36..2fc504b 100644
--- a/nixos/configs/droid-gui.nix
+++ b/nixos/configs/droid-gui.nix
@@ -6,6 +6,9 @@
     wezterm
     mesa
     roxterm
+    xorg.xkeyboardconfig
+    dmenu
+	  xfce.xfce4-session
   ];
 
   #
diff --git a/nixos/configuration.droid.nix b/nixos/configuration.droid.nix
index eed4f37..e26c721 100644
--- a/nixos/configuration.droid.nix
+++ b/nixos/configuration.droid.nix
@@ -1,7 +1,6 @@
-{ pkgs, deprekages, ... }:
+{ pkgs, deprekages, lib, ... }:
 {
-
-  nix.package = pkgs.lix;
+  nix.package = lib.mkForce pkgs.lix;
 
   environment.motd = "";
 
@@ -14,6 +13,24 @@
     deprekages.xonsh-with-xontribs
   ];
 
+  # Use tailscale DNS.
+  environment.etc."resolv.conf".text = lib.mkForce ''
+    nameserver 100.100.100.100
+    nameserver 1.1.1.1
+  '';
+
+  # Make dbus work.
+  environment.etc = {
+    "dbus-1/session.conf".text = ''
+        <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+        <busconfig>
+          <listen>unix:tmpdir=/data/data/com.termux.nix/files/usr/tmp</listen> 
+        </busconfig>
+    '';
+    "machine-id".text = "f78ff6ce2aa29790a23403e8671fec4b";
+  };
+
   # Termux tool support.
   android-integration = {
     am.enable = true;
diff --git a/nixos/packages/gui.droid.nix b/nixos/packages/gui.droid.nix
index c95a2e9..5a6e333 100644
--- a/nixos/packages/gui.droid.nix
+++ b/nixos/packages/gui.droid.nix
@@ -15,6 +15,5 @@
   #
   # Systemwide environment packages, for GUI.
   #
-  nixpkgs.config.android_sdk.accept_license = true;
-  environment.systemPackages = (import ./gui.pkgs.nix) args;
+  environment.packages = (import ./gui.pkgs.nix) args;
 }
diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix
index bc53b4b..39e8e14 100644
--- a/nixos/packages/gui.pkgs.nix
+++ b/nixos/packages/gui.pkgs.nix
@@ -19,7 +19,6 @@ with pkgs;
   dino
   gajim
   vesktop
-  mqtt-explorer
   nheko
 
   (pkgs.weechat.override {
@@ -48,7 +47,6 @@ with pkgs;
   thunderbird
   libreoffice
   drawio
-  zoom-us
   krita
   xournalpp
   kdePackages.itinerary
@@ -56,21 +54,15 @@ with pkgs;
 
   # PDFs.
   (zathuraPkgs.override { useMupdf = false; }).zathuraWrapper
-  masterpdfeditor
-
-  # Task management.
-  deprekages.todoist-electron
 
   # Dev
   bytecode-viewer
   # Poking our phone.
-  android-studio
 
   # Backup
   kitty
 
   # Media
-  calibre
   pavucontrol
   deprekages.argos
   tidal-hifi
@@ -110,10 +102,7 @@ with pkgs;
       #nheko
       signal-desktop
       signal-export
-      slack
-      zulip
       obs-studio
-      obs-studio-plugins.wlrobs
 
       # Browsers.
       firefox
@@ -121,7 +110,6 @@ with pkgs;
       falkon
 
       # Tools.
-      deprekages.home-assistant-desktop
       inkscape
       p3x-onenote
       virt-manager
@@ -135,7 +123,6 @@ with pkgs;
 
       # Music stuffs.
       ardour
-      bitwig-studio
       linvstmanager
 
       # 3D stuffs.
@@ -160,10 +147,18 @@ with pkgs;
 ++ (
   if pkgs.stdenv.isx86_64 then
     [
-
       jupyter # For now.
       (wineWowPackages.unstableFull.override { waylandSupport = true; })
       winetricks
+      zoom-us
+      masterpdfeditor
+      android-studio
+      slack
+      zulip
+      obs-studio-plugins.wlrobs
+      ktemkin.home-assistant-desktop
+      bitwig-studio
+      calibre
     ]
   else
     [ ]
diff --git a/xonsh/localhost.xsh b/xonsh/localhost.xsh
index c8a2771..d0f4825 100644
--- a/xonsh/localhost.xsh
+++ b/xonsh/localhost.xsh
@@ -5,10 +5,13 @@
 # Use a much abbreviated prompt.
 $PROMPT = "{BOLD_BLUE}{cwd}{RESET}{RED}{last_return_code_if_nonzero:[{BOLD_INTENSE_RED}{}{RED}] }{RESET}{BOLD_BLUE}{prompt_end}{RESET} "
 
+# Set our XKB directory.
+$XKB_CONFIG_DIR = $HOME + "/.nix-profile/share/X11/xkb"
+
 # Add things to our path.
 PATH_ADDS = [
   "/nix/var/nix/profiles/default/bin/",
-  "/home/deprekated/.nix-profile/bin"
+  $HOME + "/.nix-profile/bin"
 ]
 
 $DISPLAY=":0"
@@ -21,5 +24,5 @@ aliases['rebuild'] = "nix-on-droid --flake '~/dotfiles#design'"
 $XDG_DATA_DIRS = [
   "/usr/share",
   "/usr/local/share",
-  "/home/deprekated/.nix-profile/share"
+  $HOME + "/.nix-profile/share"
 ]