From 2874f47a39a2e2a259e53e039c8831b0f538a4a5 Mon Sep 17 00:00:00 2001
From: Chris Thompson <chris@agaric.com>
Date: Mon, 11 Nov 2024 00:52:53 -0500
Subject: [PATCH] Add a few packages, enable host file editing

---
 hosts/default/configuration.nix | 15 ++++++++++-----
 hosts/default/main-user.nix     |  2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index b84bfc9..ce929e0 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -54,11 +54,11 @@
   services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
 
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
+  # Configure keymap in X11 (presumably, XWayland uses something different?)
+  #services.xserver.xkb = {
+  #  layout = "us";
+  #  variant = "";
+  #};
 
   # Enable CUPS to print documents.
   # services.printing.enable = true;
@@ -104,6 +104,8 @@
   # Add docker!
   virtualisation.docker.enable = true;
   virtualisation.docker.storageDriver = "btrfs"; # Only when using BTRFS! (wolcen approved!)
+  # Required for DDEV to add hosts files, if your DNS will not resolve addresses to localhost. 
+  environment.etc.hosts.mode = "0644";
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -116,6 +118,9 @@
     tmux
     whois
     git
+    wl-clipboard-rs
+    dogdns
+    bat
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
diff --git a/hosts/default/main-user.nix b/hosts/default/main-user.nix
index c007c0a..6b695ba 100644
--- a/hosts/default/main-user.nix
+++ b/hosts/default/main-user.nix
@@ -28,6 +28,8 @@ in
         z-lua
         logseq # REQUIRES TEMPORARY INSECURE ELECTRON
         signal-desktop
+        ddev
+        vscodium
       ];
     };
   };