From 7b40f8745a832ec42cc5382ad09052c7e30ea844 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 6 Oct 2023 20:11:44 -0500
Subject: [PATCH] Fix dog, revert to network manager

---
 modules/home-manager/linux.nix | 16 ++++++++++++++++
 modules/nixos/common.nix       |  2 +-
 modules/nixos/wifi.nix         |  8 ++++----
 nixos/thinker/default.nix      |  4 ++++
 readme.md                      |  2 ++
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/modules/home-manager/linux.nix b/modules/home-manager/linux.nix
index 6a0ade1..c89c32f 100644
--- a/modules/home-manager/linux.nix
+++ b/modules/home-manager/linux.nix
@@ -7,6 +7,12 @@
     common
   ];
 
+  home = {
+    sessionVariables = {
+      MOZ_ENABLE_WAYLAND = "1";
+    };
+  };
+
   programs.fish = {
     shellAliases = {
       sctl = "sudo systemctl";
@@ -14,6 +20,16 @@
       pa = "pulsemixer";
       sctlu = "systemctl --user";
     };
+
+    functions = {
+      pp = ''
+        if test (count $argv) -gt 0
+          while true; ping -O -i 1 -w 5 -c 10000000 $argv; sleep 1; end
+        else
+          while true; ping -O -i 1 -w 5 -c 10000000 1.1.1.1; sleep 1; end
+        end
+      '';
+    };
   };
 
   home.packages = [
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index 76e340b..7134854 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -34,7 +34,7 @@
         btrfs-progs
         cue
         curl
-        dog
+        dogdns
         dua
         eza
         fd
diff --git a/modules/nixos/wifi.nix b/modules/nixos/wifi.nix
index e15dddf..9ce9a54 100644
--- a/modules/nixos/wifi.nix
+++ b/modules/nixos/wifi.nix
@@ -1,7 +1,7 @@
-{...}: {
-  # TODO: would like to move away from network manager to iwd
-  networking.networkmanager.enable = true;
-  systemd.services.NetworkManager-wait-online.enable = false;
+{lib, ...}: {
+  networking.networkmanager.enable = lib.mkDefault true;
+  systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
+  # TODO: networking.networkmanager.wifi.backend = "iwd"; ?
 
   # TODO: powersave?
 
diff --git a/nixos/thinker/default.nix b/nixos/thinker/default.nix
index 92462aa..db9a471 100644
--- a/nixos/thinker/default.nix
+++ b/nixos/thinker/default.nix
@@ -53,5 +53,9 @@
     };
   };
 
+  # networking.networkmanager.enable = false;
+  # systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
+  # networking.wireless.iwd.enable = true;
+
   system.stateVersion = "23.11";
 }
diff --git a/readme.md b/readme.md
index f47fb6d..ad5720d 100644
--- a/readme.md
+++ b/readme.md
@@ -129,6 +129,8 @@ nix-shell --packages git \
 
 ## Long Term
 
+- nix-darwin for work profile(s)
+  - https://medium.com/@zmre/nix-darwin-quick-tip-activate-your-preferences-f69942a93236
 - I don't understand Nix well enough to know why stuff is being compiled even when I have a binary cache
   - Maybe it detects different CPUs and will recompile certain packages for per-CPU optimizations?
     - How does this factor in with "pureness"?