From d5bb9ffdb40cc7ac6de2252407e897aee6affcc5 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 18 Jan 2024 12:45:27 -0700
Subject: [PATCH 01/70] hosts/clunk: +

---
 flake.nix                              |  3 +-
 hosts/clunk/default.nix                | 64 ++++++++++++++++++++++++++
 hosts/clunk/hardware-configuration.nix | 26 +++++++++++
 3 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 hosts/clunk/default.nix
 create mode 100644 hosts/clunk/hardware-configuration.nix

diff --git a/flake.nix b/flake.nix
index 0fca22d..15971a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -218,6 +218,7 @@
         europa = buildSys "x86_64-linux" unstable [
           nixos-hardware.nixosModules.framework-11th-gen-intel
         ] "europa";
+        clunk = buildSys "x86_64-linux" unstable [ ] "clunk";
         pwntie = buildSys "x86_64-linux" stable [ ] "pwntie";
         stan = buildSys "x86_64-linux" unstable [
           nixos-hardware.nixosModules.framework-11th-gen-intel
@@ -390,7 +391,7 @@
 
       checks =
         let
-          buildList = [ "europa" "stan" "h" "box" "faf" "weather" ];
+          buildList = [ "europa" "stan" "h" "box" "faf" "weather" "clunk" ];
         in
         with unstable.lib;
         foldl' recursiveUpdate { } (mapAttrsToList
diff --git a/hosts/clunk/default.nix b/hosts/clunk/default.nix
new file mode 100644
index 0000000..6b2051e
--- /dev/null
+++ b/hosts/clunk/default.nix
@@ -0,0 +1,64 @@
+{ pkgs
+, config
+, ...
+}:
+let
+  pubKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7v+/xS8832iMqJHCWsxUZ8zYoMWoZhjj++e26g1fLT europa"
+  ];
+in
+{
+  _module.args.isUnstable = true;
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  hardware.rtl-sdr.enable = true;
+
+  # Bootloader.
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot/efi";
+      };
+    };
+    kernelPackages = pkgs.linuxPackages_latest;
+  };
+  nixpkgs.config.allowUnsupportedSystem = true;
+
+  networking = {
+    hostName = "clunk";
+    networkmanager.enable = true;
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ 22 ];
+      checkReversePath = "loose";
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    rtl-sdr
+    direwolf
+  ];
+
+  services = {
+    fwupd = {
+      enable = true;
+      enableTestRemote = true;
+    };
+  };
+
+  users = {
+    users = {
+      root = { openssh.authorizedKeys.keys = pubKeys; };
+      qbit = {
+        openssh.authorizedKeys.keys = pubKeys;
+        extraGroups = [ "dialout" "libvirtd" "plugdev" ];
+      };
+    };
+  };
+
+  system.stateVersion = "22.11";
+}
diff --git a/hosts/clunk/hardware-configuration.nix b/hosts/clunk/hardware-configuration.nix
new file mode 100644
index 0000000..fce6666
--- /dev/null
+++ b/hosts/clunk/hardware-configuration.nix
@@ -0,0 +1,26 @@
+{ config, lib, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "ums_realtek" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/d97f80ac-63fe-43d3-a3f5-3c385a41a068";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/b70a6cac-996e-4a05-a3d0-17c7acf90f08"; }
+    ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

From 25decbca17818e55727ba53c9864401983582eb4 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 18 Jan 2024 14:24:17 -0700
Subject: [PATCH 02/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'xin-secrets':
    'git+ssh://xin-secrets-ro/qbit/xin-secrets.git?ref=main&rev=0934337798b36835864df2fe8298aeb86a7bbc6c' (2023-12-28)
  → 'git+ssh://xin-secrets-ro/qbit/xin-secrets.git?ref=main&rev=f6ef694e6d8a6bc9af28996238bc379b6348ea88' (2024-01-18)
---
 flake.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1f3dce7..1d087a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -553,11 +553,11 @@
         "unstable": "unstable_2"
       },
       "locked": {
-        "lastModified": 1703787975,
-        "narHash": "sha256-KCIiOu/LU3juaw+MipIsJOWkwU1QlIMlQZ+JuKEoRhY=",
+        "lastModified": 1705613028,
+        "narHash": "sha256-YeZWRn1sqFFtBp1HgDSJAVczlPGS62TMUA0ruB8d+CQ=",
         "ref": "main",
-        "rev": "0934337798b36835864df2fe8298aeb86a7bbc6c",
-        "revCount": 121,
+        "rev": "f6ef694e6d8a6bc9af28996238bc379b6348ea88",
+        "revCount": 122,
         "type": "git",
         "url": "ssh://xin-secrets-ro/qbit/xin-secrets.git"
       },

From ff7c6fbf0da6790cb906cc686c0edc26baab9f23 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 18 Jan 2024 23:01:11 -0700
Subject: [PATCH 03/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/ad9669c74e7ef4f6a13040851fef9aa05f8ceb7b' (2024-01-17)
  → 'github:NixOS/nixpkgs/8ae7c0e4333357288dc0ce3b6ae2c1685bf11fe0' (2024-01-18)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1d087a5..930d2ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1705524007,
-        "narHash": "sha256-XyjcYXCJBO9cshjp98d8aG/DAgu0gPFBBWvgHPiwt7E=",
+        "lastModified": 1705596992,
+        "narHash": "sha256-35rXLgkJS050C8O8hj/zdoJq2zaglyBklGWWuyJ2YsU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad9669c74e7ef4f6a13040851fef9aa05f8ceb7b",
+        "rev": "8ae7c0e4333357288dc0ce3b6ae2c1685bf11fe0",
         "type": "github"
       },
       "original": {

From 20773cb00f32c0240266e2e7d9904954df5a3670 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 18 Jan 2024 23:29:52 -0700
Subject: [PATCH 04/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/cefcf19e1c6d4255b2aede5535d04064f6917e9b' (2024-01-18)
  → 'github:NixOS/nixpkgs/ceb6fa0e0a0ca692cfda3e2359d435ece9fca394' (2024-01-19)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 930d2ff..48e38fd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1705556346,
-        "narHash": "sha256-2+ZUEFCKlctTsut81S84xkCccMsZLLX7DA/U3xZ3BqY=",
+        "lastModified": 1705644058,
+        "narHash": "sha256-5QeFx2Jqsg47jgWqzhSsjFw3N3Fqxa8qHRggfs3v6f4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cefcf19e1c6d4255b2aede5535d04064f6917e9b",
+        "rev": "ceb6fa0e0a0ca692cfda3e2359d435ece9fca394",
         "type": "github"
       },
       "original": {

From d9809753e933bc17791d3ea7842d8d7a10c75715 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 18 Jan 2024 23:35:48 -0700
Subject: [PATCH 05/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/cc3ab0e45687d15cb21663a95f5a53a05abd39e4' (2024-01-16)
  → 'github:NixOS/nixpkgs/7f10f172110477ea263d63b6c793ebd8637eed63' (2024-01-18)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 48e38fd..9e14818 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1705429789,
-        "narHash": "sha256-7gQju9WiToi7wI6oahTXiqwJu2RZoV0cg8OGa9YhEvw=",
+        "lastModified": 1705604756,
+        "narHash": "sha256-/yf1XDVcuGbUOE1bZkFJlQc91QcPJbu6PFLN4fHjdNQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cc3ab0e45687d15cb21663a95f5a53a05abd39e4",
+        "rev": "7f10f172110477ea263d63b6c793ebd8637eed63",
         "type": "github"
       },
       "original": {

From bc7e9e60b7a6b31847c161a68877279aac7ea1a7 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 19 Jan 2024 05:40:02 -0700
Subject: [PATCH 06/70] hosts/clunk: enable xmonad and fix xorg

---
 hosts/clunk/default.nix | 150 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 143 insertions(+), 7 deletions(-)

diff --git a/hosts/clunk/default.nix b/hosts/clunk/default.nix
index 6b2051e..1fc5319 100644
--- a/hosts/clunk/default.nix
+++ b/hosts/clunk/default.nix
@@ -17,12 +17,11 @@ in
 
   # Bootloader.
   boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot/efi";
-      };
+    loader.grub = {
+      enable = true;
+      devices = [
+        "/dev/disk/by-id/wwn-0x5001b448be78d64a"
+      ];
     };
     kernelPackages = pkgs.linuxPackages_latest;
   };
@@ -39,8 +38,12 @@ in
   };
 
   environment.systemPackages = with pkgs; [
-    rtl-sdr
     direwolf
+    polybar
+    python3Packages.nomadnet
+    python3Packages.rns
+    rofi
+    rtl-sdr
   ];
 
   services = {
@@ -48,6 +51,139 @@ in
       enable = true;
       enableTestRemote = true;
     };
+    xserver = {
+      enable = true;
+
+      displayManager.lightdm.enable = true;
+
+      videoDrivers = [ "intel" ];
+      deviceSection = ''
+        Option "DRI" "2"
+        Option "TearFree" "true"
+      '';
+
+      libinput.enable = true;
+
+      windowManager.xmonad = {
+        enable = true;
+        extraPackages = haskellPackages: [ haskellPackages.xmonad-contrib ];
+        config = ''
+          {-# LANGUAGE QuasiQuotes #-}
+
+          import qualified Data.Map as M
+          import Data.Monoid
+          import XMonad
+          import XMonad.Actions.CycleWS
+          import XMonad.Hooks.EwmhDesktops
+          import XMonad.Hooks.ManageDocks
+          import XMonad.Hooks.UrgencyHook
+          import XMonad.Layout.Decoration
+          import XMonad.Layout.LayoutModifier
+          import XMonad.Layout.Simplest (Simplest(..))
+          import XMonad.Layout.Spacing
+          import XMonad.Layout.SubLayouts
+          import XMonad.Layout.Tabbed
+          import XMonad.Layout.WindowNavigation
+          import qualified XMonad.StackSet as W
+          import XMonad.Util.EZConfig
+          import XMonad.Util.NamedWindows
+          import XMonad.Util.Run
+          import XMonad.Util.SpawnOnce
+
+          data LibNotifyUrgencyHook =
+            LibNotifyUrgencyHook
+            deriving (Read, Show)
+
+          instance UrgencyHook LibNotifyUrgencyHook where
+            urgencyHook LibNotifyUrgencyHook w = do
+              name <- getName w
+              Just idx <- fmap (W.findTag w) $ gets windowset
+              safeSpawn "notify-send" [show name, "workspace " ++ idx]
+
+          main :: IO ()
+          main = do
+            xmonad $
+              ewmh $
+              withUrgencyHook LibNotifyUrgencyHook $
+              def
+                { normalBorderColor = "#666666"
+                , focusedBorderColor = "darkgrey"
+                , focusFollowsMouse = False
+                , terminal = "xterm"
+                , workspaces = myWorkspaces
+                , startupHook = myStartupHook
+                , layoutHook = myLayoutHook
+                , keys = \c -> myKeys c `M.union` XMonad.keys def c
+                , manageHook = manageDocks <+> myManageHook <+> manageHook def
+                } `removeKeysP`
+              ["M-p"] -- don't clober emacs.
+
+          myKeys :: XConfig t -> M.Map (KeyMask, KeySym) (X ())
+          myKeys (XConfig {XMonad.modMask = modm}) =
+            M.fromList
+              [ ((modm .|. shiftMask, xK_Right), shiftToNext)
+              , ((modm .|. shiftMask, xK_Left), shiftToPrev)
+              , ((modm, xK_r), spawn "rofi -show run")
+              , ((modm .|. controlMask, xK_h), sendMessage $ pullGroup L)
+              , ((modm .|. controlMask, xK_l), sendMessage $ pullGroup R)
+              , ((modm .|. controlMask, xK_k), sendMessage $ pullGroup U)
+              , ((modm .|. controlMask, xK_j), sendMessage $ pullGroup D)
+              , ((modm .|. controlMask, xK_m), withFocused (sendMessage . MergeAll))
+              , ((modm .|. controlMask, xK_u), withFocused (sendMessage . UnMerge))
+              , ((modm .|. controlMask, xK_period), onGroup W.focusUp')
+              , ((modm .|. controlMask, xK_comma), onGroup W.focusDown')
+              ]
+
+          myWorkspaces :: [String]
+          myWorkspaces =
+            clickable $ ["main", "2", "3", "4", "5", "6", "7", "8", "console"]
+            where
+              clickable l =
+                [ "%{A1:xdotool key alt+" ++ show (n) ++ "&:}" ++ ws ++ "%{A}"
+                | (i, ws) <- zip [1 :: Int .. 9 :: Int] l
+                , let n = i
+                ]
+
+          myTabTheme :: Theme
+          myTabTheme =
+            def
+              { activeTextColor = "#000"
+              , activeColor = "#ffffea"
+              , inactiveColor = "#dedeff"
+              , urgentBorderColor = "red"
+              }
+
+          myLayoutHook ::
+               XMonad.Layout.LayoutModifier.ModifiedLayout WindowNavigation (XMonad.Layout.LayoutModifier.ModifiedLayout (XMonad.Layout.Decoration.Decoration XMonad.Layout.Tabbed.TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker) (XMonad.Layout.LayoutModifier.ModifiedLayout (Sublayout Simplest) (XMonad.Layout.LayoutModifier.ModifiedLayout Spacing (Choose (XMonad.Layout.LayoutModifier.ModifiedLayout (XMonad.Layout.Decoration.Decoration XMonad.Layout.Tabbed.TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker) (XMonad.Layout.LayoutModifier.ModifiedLayout (Sublayout Simplest) Tall)) (Choose (Mirror (XMonad.Layout.LayoutModifier.ModifiedLayout (XMonad.Layout.Decoration.Decoration XMonad.Layout.Tabbed.TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker) (XMonad.Layout.LayoutModifier.ModifiedLayout (Sublayout Simplest) Tall))) Full))))) Window
+          myLayoutHook =
+            windowNavigation $
+            subTabbed $
+            spacingRaw True (Border 30 5 5 5) True (Border 10 10 10 10) True $
+            (tiled ||| Mirror tiled ||| Full)
+            where
+              tiled =
+                addTabs shrinkText myTabTheme . subLayout [] Simplest $
+                Tall nmaster delta ratio
+              nmaster = 1
+              ratio = 0.5
+              delta = 0.03
+
+          myManageHook :: Query (Data.Monoid.Endo WindowSet)
+          myManageHook =
+            composeAll
+              [ className =? "mpv" --> doFloat
+              , className =? "VLC" --> doFloat
+              , className =? "Pinentry-gtk-2" --> doFloat
+              , className =? "Pinentry-gnome3" --> doFloat
+              , className =? "XConsole" --> doF (W.shift (myWorkspaces !! 8))
+              ]
+
+          myStartupHook :: X ()
+          myStartupHook = do
+            spawn "pkill polybar; polybar"
+        '';
+      };
+    };
   };
 
   users = {

From 890606de70c5c94f46c5ddb1e55022e19ecce5a8 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 19 Jan 2024 08:24:34 -0700
Subject: [PATCH 07/70] configs/alacritty: initial bits

---
 configs/alacritty.nix | 35 +++++++++++++++++++++++++++++++++++
 configs/default.nix   |  1 +
 gui/default.nix       |  1 +
 3 files changed, 37 insertions(+)
 create mode 100644 configs/alacritty.nix

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
new file mode 100644
index 0000000..3751db8
--- /dev/null
+++ b/configs/alacritty.nix
@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+let
+  theme = {
+    colors = {
+      primary = {
+        background = "#ffffea";
+        foreground = "#000000";
+      };
+    };
+  };
+  themeFormat = pkgs.formats.toml { };
+  themeFile = themeFormat.generate "plan9.toml" theme;
+  settings = {
+    import = [
+      "${themeFile}"
+    ];
+
+    font = {
+      normal = {
+        family = "Go";
+        style = "Mono";
+      };
+    };
+  };
+  settingsFormat = pkgs.formats.toml { };
+  settingsFile = settingsFormat.generate "alacritty.toml" settings;
+in
+{
+  config = {
+    environment.etc = {
+      "alacritty/alacritty.toml".text = builtins.readFile settingsFile;
+      "alacritty/theme.yml".text = builtins.readFile themeFile;
+    };
+  };
+}
diff --git a/configs/default.nix b/configs/default.nix
index efa925d..e5fe8f4 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -1,5 +1,6 @@
 { ... }: {
   imports = [
+    ./alacritty.nix
     ./ca.nix
     ./ci.nix
     ./colemak.nix
diff --git a/gui/default.nix b/gui/default.nix
index 45cfc3f..ac8633f 100644
--- a/gui/default.nix
+++ b/gui/default.nix
@@ -102,6 +102,7 @@ with lib; {
           SSH_AUTH_SOCK = "$HOME/.traygent";
         };
         systemPackages = with pkgs; (xinlib.filterList [
+          alacritty
           bc
           beyt
           black

From 94b0145a3531bbda09fc35e527d2b06ad937935d Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 19 Jan 2024 08:38:34 -0700
Subject: [PATCH 08/70] hosts/clunk: move xmonad config

---
 hosts/clunk/default.nix | 121 ++--------------------------------
 hosts/clunk/xmonad.hs   | 141 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+), 117 deletions(-)
 create mode 100644 hosts/clunk/xmonad.hs

diff --git a/hosts/clunk/default.nix b/hosts/clunk/default.nix
index 1fc5319..39d25c9 100644
--- a/hosts/clunk/default.nix
+++ b/hosts/clunk/default.nix
@@ -1,5 +1,4 @@
 { pkgs
-, config
 , ...
 }:
 let
@@ -15,7 +14,6 @@ in
 
   hardware.rtl-sdr.enable = true;
 
-  # Bootloader.
   boot = {
     loader.grub = {
       enable = true;
@@ -44,6 +42,9 @@ in
     python3Packages.rns
     rofi
     rtl-sdr
+
+    # no GLSL ES 3.10
+    # (callPackage ../../pkgs/zutty.nix { })
   ];
 
   services = {
@@ -67,121 +68,7 @@ in
       windowManager.xmonad = {
         enable = true;
         extraPackages = haskellPackages: [ haskellPackages.xmonad-contrib ];
-        config = ''
-          {-# LANGUAGE QuasiQuotes #-}
-
-          import qualified Data.Map as M
-          import Data.Monoid
-          import XMonad
-          import XMonad.Actions.CycleWS
-          import XMonad.Hooks.EwmhDesktops
-          import XMonad.Hooks.ManageDocks
-          import XMonad.Hooks.UrgencyHook
-          import XMonad.Layout.Decoration
-          import XMonad.Layout.LayoutModifier
-          import XMonad.Layout.Simplest (Simplest(..))
-          import XMonad.Layout.Spacing
-          import XMonad.Layout.SubLayouts
-          import XMonad.Layout.Tabbed
-          import XMonad.Layout.WindowNavigation
-          import qualified XMonad.StackSet as W
-          import XMonad.Util.EZConfig
-          import XMonad.Util.NamedWindows
-          import XMonad.Util.Run
-          import XMonad.Util.SpawnOnce
-
-          data LibNotifyUrgencyHook =
-            LibNotifyUrgencyHook
-            deriving (Read, Show)
-
-          instance UrgencyHook LibNotifyUrgencyHook where
-            urgencyHook LibNotifyUrgencyHook w = do
-              name <- getName w
-              Just idx <- fmap (W.findTag w) $ gets windowset
-              safeSpawn "notify-send" [show name, "workspace " ++ idx]
-
-          main :: IO ()
-          main = do
-            xmonad $
-              ewmh $
-              withUrgencyHook LibNotifyUrgencyHook $
-              def
-                { normalBorderColor = "#666666"
-                , focusedBorderColor = "darkgrey"
-                , focusFollowsMouse = False
-                , terminal = "xterm"
-                , workspaces = myWorkspaces
-                , startupHook = myStartupHook
-                , layoutHook = myLayoutHook
-                , keys = \c -> myKeys c `M.union` XMonad.keys def c
-                , manageHook = manageDocks <+> myManageHook <+> manageHook def
-                } `removeKeysP`
-              ["M-p"] -- don't clober emacs.
-
-          myKeys :: XConfig t -> M.Map (KeyMask, KeySym) (X ())
-          myKeys (XConfig {XMonad.modMask = modm}) =
-            M.fromList
-              [ ((modm .|. shiftMask, xK_Right), shiftToNext)
-              , ((modm .|. shiftMask, xK_Left), shiftToPrev)
-              , ((modm, xK_r), spawn "rofi -show run")
-              , ((modm .|. controlMask, xK_h), sendMessage $ pullGroup L)
-              , ((modm .|. controlMask, xK_l), sendMessage $ pullGroup R)
-              , ((modm .|. controlMask, xK_k), sendMessage $ pullGroup U)
-              , ((modm .|. controlMask, xK_j), sendMessage $ pullGroup D)
-              , ((modm .|. controlMask, xK_m), withFocused (sendMessage . MergeAll))
-              , ((modm .|. controlMask, xK_u), withFocused (sendMessage . UnMerge))
-              , ((modm .|. controlMask, xK_period), onGroup W.focusUp')
-              , ((modm .|. controlMask, xK_comma), onGroup W.focusDown')
-              ]
-
-          myWorkspaces :: [String]
-          myWorkspaces =
-            clickable $ ["main", "2", "3", "4", "5", "6", "7", "8", "console"]
-            where
-              clickable l =
-                [ "%{A1:xdotool key alt+" ++ show (n) ++ "&:}" ++ ws ++ "%{A}"
-                | (i, ws) <- zip [1 :: Int .. 9 :: Int] l
-                , let n = i
-                ]
-
-          myTabTheme :: Theme
-          myTabTheme =
-            def
-              { activeTextColor = "#000"
-              , activeColor = "#ffffea"
-              , inactiveColor = "#dedeff"
-              , urgentBorderColor = "red"
-              }
-
-          myLayoutHook ::
-               XMonad.Layout.LayoutModifier.ModifiedLayout WindowNavigation (XMonad.Layout.LayoutModifier.ModifiedLayout (XMonad.Layout.Decoration.Decoration XMonad.Layout.Tabbed.TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker) (XMonad.Layout.LayoutModifier.ModifiedLayout (Sublayout Simplest) (XMonad.Layout.LayoutModifier.ModifiedLayout Spacing (Choose (XMonad.Layout.LayoutModifier.ModifiedLayout (XMonad.Layout.Decoration.Decoration XMonad.Layout.Tabbed.TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker) (XMonad.Layout.LayoutModifier.ModifiedLayout (Sublayout Simplest) Tall)) (Choose (Mirror (XMonad.Layout.LayoutModifier.ModifiedLayout (XMonad.Layout.Decoration.Decoration XMonad.Layout.Tabbed.TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker) (XMonad.Layout.LayoutModifier.ModifiedLayout (Sublayout Simplest) Tall))) Full))))) Window
-          myLayoutHook =
-            windowNavigation $
-            subTabbed $
-            spacingRaw True (Border 30 5 5 5) True (Border 10 10 10 10) True $
-            (tiled ||| Mirror tiled ||| Full)
-            where
-              tiled =
-                addTabs shrinkText myTabTheme . subLayout [] Simplest $
-                Tall nmaster delta ratio
-              nmaster = 1
-              ratio = 0.5
-              delta = 0.03
-
-          myManageHook :: Query (Data.Monoid.Endo WindowSet)
-          myManageHook =
-            composeAll
-              [ className =? "mpv" --> doFloat
-              , className =? "VLC" --> doFloat
-              , className =? "Pinentry-gtk-2" --> doFloat
-              , className =? "Pinentry-gnome3" --> doFloat
-              , className =? "XConsole" --> doF (W.shift (myWorkspaces !! 8))
-              ]
-
-          myStartupHook :: X ()
-          myStartupHook = do
-            spawn "pkill polybar; polybar"
-        '';
+        config = builtins.readFile ./xmonad.hs;
       };
     };
   };
diff --git a/hosts/clunk/xmonad.hs b/hosts/clunk/xmonad.hs
new file mode 100644
index 0000000..7a02742
--- /dev/null
+++ b/hosts/clunk/xmonad.hs
@@ -0,0 +1,141 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+import qualified Data.Map as M
+import Data.Monoid
+import XMonad
+import XMonad.Actions.CycleWS
+import XMonad.Hooks.EwmhDesktops
+import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.UrgencyHook
+import XMonad.Layout.Decoration
+import XMonad.Layout.LayoutModifier
+import XMonad.Layout.Simplest (Simplest(..))
+import XMonad.Layout.Spacing
+import XMonad.Layout.SubLayouts
+import XMonad.Layout.Tabbed
+import XMonad.Layout.WindowNavigation
+import qualified XMonad.StackSet as W
+import XMonad.Util.EZConfig
+import XMonad.Util.NamedWindows
+import XMonad.Util.Run
+import XMonad.Util.SpawnOnce
+
+data LibNotifyUrgencyHook =
+  LibNotifyUrgencyHook
+  deriving (Read, Show)
+
+instance UrgencyHook LibNotifyUrgencyHook where
+  urgencyHook LibNotifyUrgencyHook w = do
+    name <- getName w
+    Just idx <- fmap (W.findTag w) $ gets windowset
+    safeSpawn "notify-send" [show name, "workspace " ++ idx]
+
+main :: IO ()
+main = do
+  xmonad $
+    ewmh $
+    withUrgencyHook LibNotifyUrgencyHook $
+    def
+      { normalBorderColor = "#666666"
+      , focusedBorderColor = "darkgrey"
+      , focusFollowsMouse = False
+      , terminal = "xterm"
+      , workspaces = myWorkspaces
+      , startupHook = myStartupHook
+      , layoutHook = myLayoutHook
+      , keys = \c -> myKeys c `M.union` XMonad.keys def c
+      , manageHook = manageDocks <+> myManageHook <+> manageHook def
+      } `removeKeysP`
+    ["M-p"] -- don't clober emacs.
+
+myKeys :: XConfig t -> M.Map (KeyMask, KeySym) (X ())
+myKeys (XConfig {XMonad.modMask = modm}) =
+  M.fromList
+    [ ((modm .|. shiftMask, xK_Right), shiftToNext)
+    , ((modm .|. shiftMask, xK_Left), shiftToPrev)
+    , ((modm, xK_r), spawn "rofi -show run")
+    , ((modm .|. controlMask, xK_h), sendMessage $ pullGroup L)
+    , ((modm .|. controlMask, xK_l), sendMessage $ pullGroup R)
+    , ((modm .|. controlMask, xK_k), sendMessage $ pullGroup U)
+    , ((modm .|. controlMask, xK_j), sendMessage $ pullGroup D)
+    , ((modm .|. controlMask, xK_m), withFocused (sendMessage . MergeAll))
+    , ((modm .|. controlMask, xK_u), withFocused (sendMessage . UnMerge))
+    , ((modm .|. controlMask, xK_period), onGroup W.focusUp')
+    , ((modm .|. controlMask, xK_comma), onGroup W.focusDown')
+    ]
+
+myWorkspaces :: [String]
+myWorkspaces =
+  clickable $ ["main", "2", "3", "4", "5", "6", "7", "8", "console"]
+  where
+    clickable l =
+      [ "%{A1:xdotool key alt+" ++ show (n) ++ "&:}" ++ ws ++ "%{A}"
+      | (i, ws) <- zip [1 :: Int .. 9 :: Int] l
+      , let n = i
+      ]
+
+myTabTheme :: Theme
+myTabTheme =
+  def
+    { activeTextColor = "#000"
+    , activeColor = "#ffffea"
+    , inactiveColor = "#dedeff"
+    , urgentBorderColor = "red"
+    }
+
+myLayoutHook ::
+     XMonad.Layout.LayoutModifier.ModifiedLayout
+       WindowNavigation
+       (XMonad.Layout.LayoutModifier.ModifiedLayout
+          (XMonad.Layout.Decoration.Decoration
+             XMonad.Layout.Tabbed.TabbedDecoration
+             XMonad.Layout.Decoration.DefaultShrinker)
+          (XMonad.Layout.LayoutModifier.ModifiedLayout
+             (Sublayout Simplest)
+             (XMonad.Layout.LayoutModifier.ModifiedLayout
+                Spacing
+                (Choose
+                   (XMonad.Layout.LayoutModifier.ModifiedLayout
+                      (XMonad.Layout.Decoration.Decoration
+                         XMonad.Layout.Tabbed.TabbedDecoration
+                         XMonad.Layout.Decoration.DefaultShrinker)
+                      (XMonad.Layout.LayoutModifier.ModifiedLayout
+                         (Sublayout Simplest)
+                         Tall))
+                   (Choose
+                      (Mirror
+                         (XMonad.Layout.LayoutModifier.ModifiedLayout
+                            (XMonad.Layout.Decoration.Decoration
+                               XMonad.Layout.Tabbed.TabbedDecoration
+                               XMonad.Layout.Decoration.DefaultShrinker)
+                            (XMonad.Layout.LayoutModifier.ModifiedLayout
+                               (Sublayout Simplest)
+                               Tall)))
+                      Full)))))
+       Window
+myLayoutHook =
+  windowNavigation $
+  subTabbed $
+  spacingRaw True (Border 30 5 5 5) True (Border 10 10 10 10) True $
+  (tiled ||| Mirror tiled ||| Full)
+  where
+    tiled =
+      addTabs shrinkText myTabTheme . subLayout [] Simplest $
+      Tall nmaster delta ratio
+    nmaster = 1
+    ratio = 0.5
+    delta = 0.03
+
+myManageHook :: Query (Data.Monoid.Endo WindowSet)
+myManageHook =
+  composeAll
+    [ className =? "mpv" --> doFloat
+    , className =? "VLC" --> doFloat
+    , className =? "Pinentry-gtk-2" --> doFloat
+    , className =? "Pinentry-gnome3" --> doFloat
+    , className =? "XConsole" --> doF (W.shift (myWorkspaces !! 8))
+    ]
+
+myStartupHook :: X ()
+myStartupHook = do
+  spawn "pkill polybar; polybar"

From 558906869bfdd2ad677d3ca05a4cfb8f44a8958f Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 19 Jan 2024 11:11:29 -0700
Subject: [PATCH 09/70] configs/alacritty: use config in desktop file, add
 cmdline wrapper

---
 configs/alacritty.nix   | 47 +++++++++++++++++++++++++----------------
 hosts/clunk/default.nix |  1 +
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index 3751db8..2ccbbf7 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -1,6 +1,13 @@
 { pkgs, ... }:
 let
-  theme = {
+  settings = {
+    font = {
+      normal = {
+        family = "Go Mono";
+      };
+      size = 6;
+    };
+
     colors = {
       primary = {
         background = "#ffffea";
@@ -8,28 +15,32 @@ let
       };
     };
   };
-  themeFormat = pkgs.formats.toml { };
-  themeFile = themeFormat.generate "plan9.toml" theme;
-  settings = {
-    import = [
-      "${themeFile}"
-    ];
-
-    font = {
-      normal = {
-        family = "Go";
-        style = "Mono";
-      };
-    };
-  };
   settingsFormat = pkgs.formats.toml { };
   settingsFile = settingsFormat.generate "alacritty.toml" settings;
+  script = pkgs.writeScriptBin "alacritty-etc" ''
+    ${pkgs.alacritty}/bin/alacritty --config-file ${settingsFile}
+  '';
 in
 {
   config = {
-    environment.etc = {
-      "alacritty/alacritty.toml".text = builtins.readFile settingsFile;
-      "alacritty/theme.yml".text = builtins.readFile themeFile;
+    nixpkgs.overlays = [
+      (self: super: {
+        alacritty = super.alacritty.overrideAttrs (old: {
+          postInstall = old.postInstall + ''
+            ${super.gnused}/bin/sed -i 's#^Exec=alacritty#Exec=alacritty --config-file ${settingsFile}#g' \
+              extra/linux/Alacritty.desktop
+            install -D extra/linux/Alacritty.desktop -t $out/share/applications/
+          '';
+        });
+      })
+    ];
+    environment = {
+      systemPackages = [
+        script
+      ];
+      etc = {
+        " alacritty/alacritty.toml ".text = builtins.readFile settingsFile;
+      };
     };
   };
 }
diff --git a/hosts/clunk/default.nix b/hosts/clunk/default.nix
index 1fc5319..debd5fa 100644
--- a/hosts/clunk/default.nix
+++ b/hosts/clunk/default.nix
@@ -38,6 +38,7 @@ in
   };
 
   environment.systemPackages = with pkgs; [
+    alacritty
     direwolf
     polybar
     python3Packages.nomadnet

From b2a44ef87a1b7557563a9d3832440bae685f0800 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 20 Jan 2024 14:07:01 -0700
Subject: [PATCH 10/70] configs/alacritty: move config to xdg dir

---
 configs/alacritty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index 2ccbbf7..0f73b23 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -39,7 +39,7 @@ in
         script
       ];
       etc = {
-        " alacritty/alacritty.toml ".text = builtins.readFile settingsFile;
+        "xdg/alacritty/alacritty.toml ".text = builtins.readFile settingsFile;
       };
     };
   };

From 11befad76e206a5e24052908750b786ab186d726 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 20 Jan 2024 20:04:22 -0700
Subject: [PATCH 11/70] configs/alacritty: fix config file name

---
 configs/alacritty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index 0f73b23..5c7c864 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -39,7 +39,7 @@ in
         script
       ];
       etc = {
-        "xdg/alacritty/alacritty.toml ".text = builtins.readFile settingsFile;
+        "xdg/alacritty/alacritty.toml".text = builtins.readFile settingsFile;
       };
     };
   };

From fb6d7df0e770f1bfcb41b84a0814a298deac9d4e Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 20 Jan 2024 20:24:23 -0700
Subject: [PATCH 12/70] configs/alacritty: remove complications and make sure
 font exists

---
 configs/alacritty.nix | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index 5c7c864..5780973 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -17,30 +17,16 @@ let
   };
   settingsFormat = pkgs.formats.toml { };
   settingsFile = settingsFormat.generate "alacritty.toml" settings;
-  script = pkgs.writeScriptBin "alacritty-etc" ''
-    ${pkgs.alacritty}/bin/alacritty --config-file ${settingsFile}
-  '';
 in
 {
   config = {
-    nixpkgs.overlays = [
-      (self: super: {
-        alacritty = super.alacritty.overrideAttrs (old: {
-          postInstall = old.postInstall + ''
-            ${super.gnused}/bin/sed -i 's#^Exec=alacritty#Exec=alacritty --config-file ${settingsFile}#g' \
-              extra/linux/Alacritty.desktop
-            install -D extra/linux/Alacritty.desktop -t $out/share/applications/
-          '';
-        });
-      })
-    ];
     environment = {
-      systemPackages = [
-        script
-      ];
       etc = {
         "xdg/alacritty/alacritty.toml".text = builtins.readFile settingsFile;
       };
     };
+    fontSet = with pkgs; [
+      go-font
+    ];
   };
 }

From a8510c3cf86518058a98284f5aa0f15c4ccb29df Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 20 Jan 2024 20:30:16 -0700
Subject: [PATCH 13/70] configs/alacritty: fix fonts

---
 configs/alacritty.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index 5780973..678c978 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -25,8 +25,6 @@ in
         "xdg/alacritty/alacritty.toml".text = builtins.readFile settingsFile;
       };
     };
-    fontSet = with pkgs; [
-      go-font
-    ];
+    fonts = { packages = with pkgs; [ go-font ]; };
   };
 }

From dd311640f2fcf737d061d4ecf9847dc11fe2c040 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 21 Jan 2024 13:24:34 -0700
Subject: [PATCH 14/70] configs/polybar: init and configure for a few hosts

---
 configs/default.nix |   9 ++--
 configs/polybar.nix | 125 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 configs/polybar.nix

diff --git a/configs/default.nix b/configs/default.nix
index e5fe8f4..94ac843 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -7,13 +7,14 @@
     ./dns.nix
     ./doas.nix
     ./git.nix
-    ./neovim.nix
-    ./peerix.nix
     ./manager.nix
-    ./tmux.nix
+    ./neovim.nix
     ./net-overlay.nix
-    ./zsh.nix
     ./nix.nix
+    ./peerix.nix
+    ./polybar.nix
+    ./tmux.nix
     ./update.nix
+    ./zsh.nix
   ];
 }
diff --git a/configs/polybar.nix b/configs/polybar.nix
new file mode 100644
index 0000000..bed0d4a
--- /dev/null
+++ b/configs/polybar.nix
@@ -0,0 +1,125 @@
+{ pkgs, ... }:
+let
+  barBase = {
+    background = "\${colors.background}";
+    foreground = "\${colors.foreground}";
+
+    border-color = "#DEDeff";
+    border-size = "2pt";
+
+    width = "100%";
+    height = "24pt";
+
+    enable-ipc = true;
+
+    font-0 = "Go Mono;3";
+
+    line-size = "3pt";
+    module-margin = 1;
+    padding = 2;
+    radius = 15;
+    separator = "|";
+
+    modules-left = "xworkspaces";
+    modules-right = "wifi ethernet memory cpu battery date";
+  };
+  settings = {
+    colors = {
+      background = "#ffffea";
+      background-alt = "#373B41";
+      foreground = "#000000";
+      primary = "#F0C674";
+      secondary = "#8ABEB7";
+      alert = "#A54242";
+      disabled = "#707880";
+    };
+
+    "module/cpu" = {
+      type = "internal/cpu";
+      interval = 2;
+      format-prefix = "CPU: ";
+      label = "%percentage:2%%";
+    };
+
+    "module/date" = {
+      type = "internal/date";
+      interval = 1;
+
+      date = "%H:%M";
+      date-alt = "%Y-%m-%d %H:%M:%S";
+
+      label = "%date%";
+    };
+
+    "module/memory" = {
+      type = "internal/memory";
+      interval = 2;
+      format-prefix = "RAM: ";
+      label = "%percentage_used:2%%";
+    };
+
+    "module/xworkspaces" = {
+      type = "internal/xworkspaces";
+    };
+
+    "module/xwindow" = {
+      type = "internal/xwindow";
+    };
+
+    "module/systray" = {
+      type = "internal/tray";
+    };
+
+    "module/battery" = {
+      type = "internal/battery";
+      full-at = 99;
+      low-at = 5;
+
+      # $ ls -1 /sys/class/power_supply/
+      battery = "BAT1";
+      adapter = "ACAD";
+
+      poll-interval = 5;
+
+      time-format = "%H:%M";
+
+      label-charging = "+%percentage%%";
+      label-discharging = "-%percentage%%";
+      label-low = "BATTERY LOW";
+    };
+
+    "module/wifi" = {
+      type = "internal/network";
+      interface-type = "wireless";
+
+      accumulate-stats = true;
+
+      label-connected = "%essid% %netspeed%";
+    };
+
+    "module/ethernet" = {
+      type = "internal/network";
+      interface-type = "wired";
+
+      accumulate-stats = true;
+
+      label-connected = "%netspeed%";
+    };
+
+    "bar/europa" = barBase // { };
+    "bar/clunk" = barBase // { };
+  };
+  settingsFormat = pkgs.formats.ini { };
+  settingsFile = settingsFormat.generate "polybar-config.ini" settings;
+in
+{
+  config = {
+    environment = {
+      systemPackages = [ pkgs.polybar ];
+      etc = {
+        "xdg/polybar/config.ini".text = builtins.readFile settingsFile;
+      };
+    };
+    fonts = { packages = [ pkgs.go-font ]; };
+  };
+}

From 2d6b71c7f6e57fd6552987955e96e2811e706006 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 21 Jan 2024 13:29:17 -0700
Subject: [PATCH 15/70] hosts/clunk: use alacritty as the terminal

---
 hosts/clunk/xmonad.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/clunk/xmonad.hs b/hosts/clunk/xmonad.hs
index 7a02742..f40545b 100644
--- a/hosts/clunk/xmonad.hs
+++ b/hosts/clunk/xmonad.hs
@@ -39,7 +39,7 @@ main = do
       { normalBorderColor = "#666666"
       , focusedBorderColor = "darkgrey"
       , focusFollowsMouse = False
-      , terminal = "xterm"
+      , terminal = "alacritty"
       , workspaces = myWorkspaces
       , startupHook = myStartupHook
       , layoutHook = myLayoutHook

From 0176b9f43670a476455fe174fc68fc052fed95b3 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 21 Jan 2024 23:00:19 -0700
Subject: [PATCH 16/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/74ab0227ee495e526f2dd57ea684b34f6396445a' (2024-01-17)
  → 'github:lnl7/nix-darwin/91c19ab206b4b8af72f3f34a947969964ad45908' (2024-01-21)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9e14818..0b7d613 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705452289,
-        "narHash": "sha256-i/WodLabBcmRr9hdSv5jzDigL1hRYuI8vNh+xTbGt+g=",
+        "lastModified": 1705833550,
+        "narHash": "sha256-CyzbM1mw5xUG4rV5G6FIRM44EvdOgRdWR3joqswyuIU=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "74ab0227ee495e526f2dd57ea684b34f6396445a",
+        "rev": "91c19ab206b4b8af72f3f34a947969964ad45908",
         "type": "github"
       },
       "original": {

From 673c5cd257af67dc82cf4018b88b59ebf825eee6 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 21 Jan 2024 23:02:46 -0700
Subject: [PATCH 17/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/87755331580fdf23df7e39b46d63ac88236bf42c' (2024-01-15)
  → 'github:Mic92/sops-nix/ae171b54e76ced88d506245249609f8c87305752' (2024-01-21)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0b7d613..4cff233 100644
--- a/flake.lock
+++ b/flake.lock
@@ -361,11 +361,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705356877,
-        "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=",
+        "lastModified": 1705805983,
+        "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "87755331580fdf23df7e39b46d63ac88236bf42c",
+        "rev": "ae171b54e76ced88d506245249609f8c87305752",
         "type": "github"
       },
       "original": {

From 910c92eb3413c61eecc7c5efb4a1170520f3fd6d Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 21 Jan 2024 23:05:32 -0700
Subject: [PATCH 18/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/8ae7c0e4333357288dc0ce3b6ae2c1685bf11fe0' (2024-01-18)
  → 'github:NixOS/nixpkgs/a1aa4980b64eb5fbfa652da57ed4de92e92be630' (2024-01-21)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4cff233..9332509 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1705596992,
-        "narHash": "sha256-35rXLgkJS050C8O8hj/zdoJq2zaglyBklGWWuyJ2YsU=",
+        "lastModified": 1705864497,
+        "narHash": "sha256-GVjAt3eHgSGp76Nx6/BXkl38w25FyLbS5Y3hn+BvLk0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8ae7c0e4333357288dc0ce3b6ae2c1685bf11fe0",
+        "rev": "a1aa4980b64eb5fbfa652da57ed4de92e92be630",
         "type": "github"
       },
       "original": {

From 19da433625bb2afd97546bad07546e966d0cf1e2 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 21 Jan 2024 23:08:20 -0700
Subject: [PATCH 19/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/ceb6fa0e0a0ca692cfda3e2359d435ece9fca394' (2024-01-19)
  → 'github:NixOS/nixpkgs/5836514c534568510e7c2f3ad358f70af0925088' (2024-01-22)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9332509..94a4c10 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1705644058,
-        "narHash": "sha256-5QeFx2Jqsg47jgWqzhSsjFw3N3Fqxa8qHRggfs3v6f4=",
+        "lastModified": 1705899308,
+        "narHash": "sha256-hw6r6E3thdgoYH3UzboLfuUYJFg31hIXCe3jH01inzA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ceb6fa0e0a0ca692cfda3e2359d435ece9fca394",
+        "rev": "5836514c534568510e7c2f3ad358f70af0925088",
         "type": "github"
       },
       "original": {

From 3bee0af6d867c0fbf281ec8d461217878abb5649 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 22 Jan 2024 01:21:11 -0700
Subject: [PATCH 20/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/7f10f172110477ea263d63b6c793ebd8637eed63' (2024-01-18)
  → 'github:NixOS/nixpkgs/8cccce637e19577815de54c5ecc3132dff965aee' (2024-01-22)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 94a4c10..f3586ce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1705604756,
-        "narHash": "sha256-/yf1XDVcuGbUOE1bZkFJlQc91QcPJbu6PFLN4fHjdNQ=",
+        "lastModified": 1705891108,
+        "narHash": "sha256-PQ0Df5BzByg+0gPE1goa9WYVXSoEP6gtjblrbYC8WOI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7f10f172110477ea263d63b6c793ebd8637eed63",
+        "rev": "8cccce637e19577815de54c5ecc3132dff965aee",
         "type": "github"
       },
       "original": {

From f04f8ef3243d34c345bda606fb9cfe194cbc749e Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 22 Jan 2024 07:19:41 -0700
Subject: [PATCH 21/70] pkgs/sliding-sync: 0.99.14 -> 0.99.15

---
 pkgs/sliding-sync.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/sliding-sync.nix b/pkgs/sliding-sync.nix
index a714d08..3252294 100644
--- a/pkgs/sliding-sync.nix
+++ b/pkgs/sliding-sync.nix
@@ -6,13 +6,13 @@
 with lib;
 buildGoModule rec {
   pname = "sliding-sync";
-  version = "0.99.14";
+  version = "0.99.15";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-C6osjpmz6cpqtzi2GEkLgNeXsF/Cfj9p1pPqYqxVg3Y=";
+    hash = "sha256-9JYR9fBxtv+3E+l+l26jryqEstnOUm657VsKsDRzD9g=";
   };
 
   vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw=";

From e3070e5f69bcb9cb68ea53a7df59bfda0153210d Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 22 Jan 2024 08:50:19 -0700
Subject: [PATCH 22/70] h: +nomadnet

---
 hosts/h/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/h/default.nix b/hosts/h/default.nix
index 7c66578..c651b23 100644
--- a/hosts/h/default.nix
+++ b/hosts/h/default.nix
@@ -236,6 +236,7 @@ in
 
       zonemaster-cli
       sqlite
+      python3Packages.nomadnet
     ];
   };
 

From 392de935afb8d23ed866af0258bfc50c2ece14ee Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 22 Jan 2024 23:00:08 -0700
Subject: [PATCH 23/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/91c19ab206b4b8af72f3f34a947969964ad45908' (2024-01-21)
  → 'github:lnl7/nix-darwin/1e706ef323de76236eb183d7784f3bd57255ec0b' (2024-01-22)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index f3586ce..ef58428 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705833550,
-        "narHash": "sha256-CyzbM1mw5xUG4rV5G6FIRM44EvdOgRdWR3joqswyuIU=",
+        "lastModified": 1705915768,
+        "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "91c19ab206b4b8af72f3f34a947969964ad45908",
+        "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b",
         "type": "github"
       },
       "original": {

From 8a74404baf2ac5f0b7b118a698cae855a77f55e7 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 22 Jan 2024 23:03:01 -0700
Subject: [PATCH 24/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/a1aa4980b64eb5fbfa652da57ed4de92e92be630' (2024-01-21)
  → 'github:NixOS/nixpkgs/a68e369deabd4da76320af93966a6308535a68f3' (2024-01-22)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index ef58428..38c493c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1705864497,
-        "narHash": "sha256-GVjAt3eHgSGp76Nx6/BXkl38w25FyLbS5Y3hn+BvLk0=",
+        "lastModified": 1705946224,
+        "narHash": "sha256-Zq738rVNvThvWKq6rpqO54u3ALkSDhJ1mhsIBrrr++o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a1aa4980b64eb5fbfa652da57ed4de92e92be630",
+        "rev": "a68e369deabd4da76320af93966a6308535a68f3",
         "type": "github"
       },
       "original": {

From 3c2e027352ebd43a04e72ff8e47d5617d8f09a56 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 22 Jan 2024 23:05:50 -0700
Subject: [PATCH 25/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/5836514c534568510e7c2f3ad358f70af0925088' (2024-01-22)
  → 'github:NixOS/nixpkgs/9dbf5074dba2c3c43cc9faa065c85acf1a246b64' (2024-01-23)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 38c493c..217c0cb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1705899308,
-        "narHash": "sha256-hw6r6E3thdgoYH3UzboLfuUYJFg31hIXCe3jH01inzA=",
+        "lastModified": 1705989589,
+        "narHash": "sha256-Knzn+DnDQ7oI48gqMY5BZVrM5oY12ArYfsYP2INEzXI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5836514c534568510e7c2f3ad358f70af0925088",
+        "rev": "9dbf5074dba2c3c43cc9faa065c85acf1a246b64",
         "type": "github"
       },
       "original": {

From 531c74f4de9b0000ee9034bd598349aad4aa8916 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 23 Jan 2024 07:01:33 -0700
Subject: [PATCH 26/70] h: only allow nix usage by root

---
 hosts/h/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hosts/h/default.nix b/hosts/h/default.nix
index c651b23..ec7d6f4 100644
--- a/hosts/h/default.nix
+++ b/hosts/h/default.nix
@@ -72,6 +72,13 @@ in
     kernelParams = [ "net.ifnames=0" ];
   };
 
+  nix = {
+    settings = {
+      allowed-users = lib.mkForce [ "root" ];
+      trusted-users = lib.mkForce [ "root" ];
+    };
+  };
+
   tailscale.sshOnly = true;
 
   nixpkgs.overlays = [

From 62fc5a8fbafff4819db1bd4479cb8c720a837a6a Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 23 Jan 2024 23:00:36 -0700
Subject: [PATCH 27/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/a68e369deabd4da76320af93966a6308535a68f3' (2024-01-22)
  → 'github:NixOS/nixpkgs/74c3d9e1e7b0eef015d1a4d93acbd1666a5387b7' (2024-01-23)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 217c0cb..b6a0917 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1705946224,
-        "narHash": "sha256-Zq738rVNvThvWKq6rpqO54u3ALkSDhJ1mhsIBrrr++o=",
+        "lastModified": 1705978131,
+        "narHash": "sha256-nMEV1Mi2PkqLjz7tEVkDC21zW2if2LavtDfLItF5W2s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a68e369deabd4da76320af93966a6308535a68f3",
+        "rev": "74c3d9e1e7b0eef015d1a4d93acbd1666a5387b7",
         "type": "github"
       },
       "original": {

From ecf3c177cc5e17a3dd1602e8401dfe19db46e170 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 23 Jan 2024 23:03:29 -0700
Subject: [PATCH 28/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/9dbf5074dba2c3c43cc9faa065c85acf1a246b64' (2024-01-23)
  → 'github:NixOS/nixpkgs/19f815760d1785594aa5009043c7708caebffdb9' (2024-01-24)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index b6a0917..e694c4c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1705989589,
-        "narHash": "sha256-Knzn+DnDQ7oI48gqMY5BZVrM5oY12ArYfsYP2INEzXI=",
+        "lastModified": 1706071396,
+        "narHash": "sha256-3F+n5HsvQqXCwDhN4kDod894oqPGnNOY73TP6wwi6ks=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9dbf5074dba2c3c43cc9faa065c85acf1a246b64",
+        "rev": "19f815760d1785594aa5009043c7708caebffdb9",
         "type": "github"
       },
       "original": {

From ea8deadc452bf6f9ef9c40cca9d710fcc8eafff9 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 23 Jan 2024 23:59:50 -0700
Subject: [PATCH 29/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/8cccce637e19577815de54c5ecc3132dff965aee' (2024-01-22)
  → 'github:NixOS/nixpkgs/15ff1758e7816331033baa14eebbea68626128f3' (2024-01-23)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index e694c4c..3542105 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1705891108,
-        "narHash": "sha256-PQ0Df5BzByg+0gPE1goa9WYVXSoEP6gtjblrbYC8WOI=",
+        "lastModified": 1706022028,
+        "narHash": "sha256-F8Gv4R4K/AvS3+6pWd8wlnw4Vhgf7bcszy7i8XPbzA0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8cccce637e19577815de54c5ecc3132dff965aee",
+        "rev": "15ff1758e7816331033baa14eebbea68626128f3",
         "type": "github"
       },
       "original": {

From e8ea9213217200d0e0e719ba0c5e0df899a1418c Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 24 Jan 2024 07:09:34 -0700
Subject: [PATCH 30/70] clunk: make polybar use dynamic hostname

---
 hosts/clunk/default.nix | 2 +-
 hosts/clunk/xmonad.hs   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hosts/clunk/default.nix b/hosts/clunk/default.nix
index 0f5f27c..df84dc8 100644
--- a/hosts/clunk/default.nix
+++ b/hosts/clunk/default.nix
@@ -68,7 +68,7 @@ in
 
       windowManager.xmonad = {
         enable = true;
-        extraPackages = haskellPackages: [ haskellPackages.xmonad-contrib ];
+        extraPackages = haskellPackages: with haskellPackages; [ xmonad-contrib hostname ];
         config = builtins.readFile ./xmonad.hs;
       };
     };
diff --git a/hosts/clunk/xmonad.hs b/hosts/clunk/xmonad.hs
index f40545b..d9b6cd5 100644
--- a/hosts/clunk/xmonad.hs
+++ b/hosts/clunk/xmonad.hs
@@ -2,6 +2,7 @@
 
 import qualified Data.Map as M
 import Data.Monoid
+import Network.HostName
 import XMonad
 import XMonad.Actions.CycleWS
 import XMonad.Hooks.EwmhDesktops
@@ -32,6 +33,7 @@ instance UrgencyHook LibNotifyUrgencyHook where
 
 main :: IO ()
 main = do
+  hostname <- getHostName
   xmonad $
     ewmh $
     withUrgencyHook LibNotifyUrgencyHook $
@@ -41,7 +43,7 @@ main = do
       , focusFollowsMouse = False
       , terminal = "alacritty"
       , workspaces = myWorkspaces
-      , startupHook = myStartupHook
+      , startupHook = myStartupHook hostname
       , layoutHook = myLayoutHook
       , keys = \c -> myKeys c `M.union` XMonad.keys def c
       , manageHook = manageDocks <+> myManageHook <+> manageHook def
@@ -136,6 +138,5 @@ myManageHook =
     , className =? "XConsole" --> doF (W.shift (myWorkspaces !! 8))
     ]
 
-myStartupHook :: X ()
-myStartupHook = do
-  spawn "pkill polybar; polybar"
+myStartupHook hostname = do
+  spawn ("pkill polybar; polybar " ++ hostname)

From 5ac4f08838f8e4f2b3e08c68012c9a463dc761b3 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 24 Jan 2024 08:27:31 -0700
Subject: [PATCH 31/70] overlays: cleanup cruft

---
 overlays/default.nix | 41 +++--------------------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index 99019a4..d7041e3 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -4,52 +4,17 @@
 }:
 let
   inherit (xinlib) prIsOpen;
-  tailscale = prIsOpen.overlay 0 import ./tailscale.nix;
   matrix-synapse = prIsOpen.overlay 0 (import ./matrix-synapse.nix);
   heisenbridge = prIsOpen.overlay 0 (import ./heisenbridge.nix);
 in
 {
-  nixpkgs.overlays =
-    if isUnstable
+  nixpkgs.overlays = [ heisenbridge ] ++
+    (if isUnstable
     then [
-      tailscale
-      heisenbridge
-      (_: super: {
-        cloud-hypervisor = super.cloud-hypervisor.overrideAttrs (_: {
-          cargoTestFlags = [ "--bins" ];
-        });
-      })
-      (_: super: {
-        clementine = super.clementine.overrideAttrs (_: {
-          patches = [
-            (super.fetchpatch {
-              name = "clementine-di-radio-fix.diff";
-              url = "https://patch-diff.githubusercontent.com/raw/clementine-player/Clementine/pull/7217.diff";
-              hash = "sha256-kaKc2YFkXJRPibbKbBCHvlm6Y/H9zS83ohMxtUNUFlM=";
-            })
-          ];
-        });
-      })
     ]
     else [
-      #rex
-      (_: super: {
-        python3 = super.python3.override {
-          packageOverrides = _: python-super: {
-            pillow = python-super.pillow.overrideAttrs (_: rec {
-              version = "10.0.1";
-              src = python-super.fetchPypi {
-                pname = "Pillow";
-                inherit version;
-                hash = "sha256-1ylnsGvpMA/tXPvItbr87sSL983H2rZrHSVJA1KHGR0=";
-              };
-            });
-          };
-        };
-      })
       matrix-synapse
-      heisenbridge
-    ];
+    ]);
 }
 # Example Python dep overlay
 # (self: super: {

From 9a57473c42fe0ef0f14a4c21fd160985db62328b Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 24 Jan 2024 23:00:12 -0700
Subject: [PATCH 32/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/bee2202bec57e521e3bd8acd526884b9767d7fa0' (2024-01-15)
  → 'github:NixOS/nixos-hardware/e756ff62c2e9db4f7c197bc1849a02024a7bfb2e' (2024-01-24)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3542105..755a529 100644
--- a/flake.lock
+++ b/flake.lock
@@ -161,11 +161,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1705312285,
-        "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
+        "lastModified": 1706085157,
+        "narHash": "sha256-0pTbYwn9qubaZLtuN0Ouj0neEfrir1wSNyH8gL1BzB0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
+        "rev": "e756ff62c2e9db4f7c197bc1849a02024a7bfb2e",
         "type": "github"
       },
       "original": {

From ae1ab6e8a8941ceba58f329a0580c79b53e9b5cb Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 24 Jan 2024 23:02:35 -0700
Subject: [PATCH 33/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/ae171b54e76ced88d506245249609f8c87305752' (2024-01-21)
  → 'github:Mic92/sops-nix/4606d9b1595e42ffd9b75b9e69667708c70b1d68' (2024-01-24)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 755a529..d07cf4a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -361,11 +361,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705805983,
-        "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=",
+        "lastModified": 1706130372,
+        "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ae171b54e76ced88d506245249609f8c87305752",
+        "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68",
         "type": "github"
       },
       "original": {

From fa85f337b04241ab7dbd28beb29475a2f9f355fe Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 24 Jan 2024 23:05:25 -0700
Subject: [PATCH 34/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/74c3d9e1e7b0eef015d1a4d93acbd1666a5387b7' (2024-01-23)
  → 'github:NixOS/nixpkgs/6737bac6ac4a5314f34d2c736360a23182c09f17' (2024-01-24)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index d07cf4a..59c12ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1705978131,
-        "narHash": "sha256-nMEV1Mi2PkqLjz7tEVkDC21zW2if2LavtDfLItF5W2s=",
+        "lastModified": 1706117534,
+        "narHash": "sha256-lpqFyGl6cs6jGGH6JAcELO8grB4NtJlu7Q4nNPL1UvM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "74c3d9e1e7b0eef015d1a4d93acbd1666a5387b7",
+        "rev": "6737bac6ac4a5314f34d2c736360a23182c09f17",
         "type": "github"
       },
       "original": {

From ac31237d8fe521922152ac164cbb1b40cf19805b Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 24 Jan 2024 23:08:16 -0700
Subject: [PATCH 35/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/19f815760d1785594aa5009043c7708caebffdb9' (2024-01-24)
  → 'github:NixOS/nixpkgs/06570e54184cb7f3aecb16c7c5ef82a871ce5873' (2024-01-25)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 59c12ab..9875d0a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706071396,
-        "narHash": "sha256-3F+n5HsvQqXCwDhN4kDod894oqPGnNOY73TP6wwi6ks=",
+        "lastModified": 1706161682,
+        "narHash": "sha256-vJ5goAufjkpWEyu/XPzM4NFMjM7uR/q9p6Moy4viWqo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "19f815760d1785594aa5009043c7708caebffdb9",
+        "rev": "06570e54184cb7f3aecb16c7c5ef82a871ce5873",
         "type": "github"
       },
       "original": {

From a8b61c3d941c80405447bbbf4e9e003e5e1ce492 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 24 Jan 2024 23:11:45 -0700
Subject: [PATCH 36/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/15ff1758e7816331033baa14eebbea68626128f3' (2024-01-23)
  → 'github:NixOS/nixpkgs/5cd2baa57a9ff2d84f2615700434fa04f3067fdb' (2024-01-24)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9875d0a..ebfc42d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1706022028,
-        "narHash": "sha256-F8Gv4R4K/AvS3+6pWd8wlnw4Vhgf7bcszy7i8XPbzA0=",
+        "lastModified": 1706112902,
+        "narHash": "sha256-GKPwSY0fBShj0FfaPqA4gg5oHGhpya/m2DVb+3m+Uzs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "15ff1758e7816331033baa14eebbea68626128f3",
+        "rev": "5cd2baa57a9ff2d84f2615700434fa04f3067fdb",
         "type": "github"
       },
       "original": {

From f26ff8aee2c70bdc0248b989c4db4512d455c070 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 25 Jan 2024 08:37:33 -0700
Subject: [PATCH 37/70] clunk: +python3

---
 hosts/clunk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/clunk/default.nix b/hosts/clunk/default.nix
index df84dc8..c5a21f8 100644
--- a/hosts/clunk/default.nix
+++ b/hosts/clunk/default.nix
@@ -39,6 +39,7 @@ in
     alacritty
     direwolf
     polybar
+    python3
     python3Packages.nomadnet
     python3Packages.rns
     rofi

From eeeb404c568ffc891e979a26ca3481998374b8a4 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 25 Jan 2024 13:57:49 -0700
Subject: [PATCH 38/70] h: switch back to mimalloc since we are not using
 wallabag

---
 hosts/h/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/h/default.nix b/hosts/h/default.nix
index ec7d6f4..88c4e37 100644
--- a/hosts/h/default.nix
+++ b/hosts/h/default.nix
@@ -225,7 +225,7 @@ in
   };
 
   environment = {
-    memoryAllocator.provider = "libc";
+    memoryAllocator.provider = "mimalloc";
     systemPackages = with pkgs; [
       inetutils
 

From e08c0342b4899775278429deb329f93b0c82c310 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 25 Jan 2024 18:22:36 -0700
Subject: [PATCH 39/70] configs/hardened: set allocator to libc for everything

also fmt
---
 configs/hardened.nix                   |  2 +-
 hosts/box/default.nix                  | 23 ++++++++++++-----------
 hosts/clunk/hardware-configuration.nix | 21 +++++++++++++--------
 hosts/h/default.nix                    |  1 -
 hosts/stan/hardware-configuration.nix  |  1 -
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/configs/hardened.nix b/configs/hardened.nix
index b882c0a..86c49bb 100644
--- a/configs/hardened.nix
+++ b/configs/hardened.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 with lib; {
   environment = {
-    memoryAllocator.provider = mkDefault "scudo";
+    memoryAllocator.provider = mkDefault "libc";
     variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1";
   };
 
diff --git a/hosts/box/default.nix b/hosts/box/default.nix
index f611a94..98806a4 100644
--- a/hosts/box/default.nix
+++ b/hosts/box/default.nix
@@ -1,7 +1,6 @@
 { config
 , lib
 , pkgs
-, isUnstable
 , xinlib
 , ...
 }:
@@ -207,15 +206,17 @@ in
   #  "services/home-automation/home-assistant.nix"
   #];
 
-  environment.systemPackages = with pkgs; [
-    tmux
-    mosh
-    apg
-    git
-    signify
-    glowing-bear
-    rtl_433
-  ];
+  environment = {
+    systemPackages = with pkgs; [
+      tmux
+      mosh
+      apg
+      git
+      signify
+      glowing-bear
+      rtl_433
+    ];
+  };
 
   security.acme = {
     acceptTerms = true;
@@ -512,7 +513,7 @@ in
 
     fwupd.enable = true;
     zfs = {
-      autoSnapshot={
+      autoSnapshot = {
         enable = true;
         daily = 3;
         hourly = 8;
diff --git a/hosts/clunk/hardware-configuration.nix b/hosts/clunk/hardware-configuration.nix
index fce6666..7bf8d10 100644
--- a/hosts/clunk/hardware-configuration.nix
+++ b/hosts/clunk/hardware-configuration.nix
@@ -2,22 +2,27 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "ums_realtek" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd = {
+      availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "ums_realtek" "sd_mod" ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d97f80ac-63fe-43d3-a3f5-3c385a41a068";
+    {
+      device = "/dev/disk/by-uuid/d97f80ac-63fe-43d3-a3f5-3c385a41a068";
       fsType = "ext4";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/b70a6cac-996e-4a05-a3d0-17c7acf90f08"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/b70a6cac-996e-4a05-a3d0-17c7acf90f08"; }];
 
   networking.useDHCP = lib.mkDefault true;
 
diff --git a/hosts/h/default.nix b/hosts/h/default.nix
index 88c4e37..4b71e66 100644
--- a/hosts/h/default.nix
+++ b/hosts/h/default.nix
@@ -225,7 +225,6 @@ in
   };
 
   environment = {
-    memoryAllocator.provider = "mimalloc";
     systemPackages = with pkgs; [
       inetutils
 
diff --git a/hosts/stan/hardware-configuration.nix b/hosts/stan/hardware-configuration.nix
index d74e53f..173efed 100644
--- a/hosts/stan/hardware-configuration.nix
+++ b/hosts/stan/hardware-configuration.nix
@@ -1,5 +1,4 @@
 { pkgs
-, config
 , lib
 , modulesPath
 , ...

From eadd5584d5b684deffd053dbd1b892ecec7c54e9 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 25 Jan 2024 23:00:10 -0700
Subject: [PATCH 40/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/e756ff62c2e9db4f7c197bc1849a02024a7bfb2e' (2024-01-24)
  → 'github:NixOS/nixos-hardware/f84eaffc35d1a655e84749228cde19922fcf55f1' (2024-01-25)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index ebfc42d..0725fce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -161,11 +161,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1706085157,
-        "narHash": "sha256-0pTbYwn9qubaZLtuN0Ouj0neEfrir1wSNyH8gL1BzB0=",
+        "lastModified": 1706182238,
+        "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e756ff62c2e9db4f7c197bc1849a02024a7bfb2e",
+        "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
         "type": "github"
       },
       "original": {

From aa88a79d694a7180e8fc8730829e93a80d272f72 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 25 Jan 2024 23:02:54 -0700
Subject: [PATCH 41/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/6737bac6ac4a5314f34d2c736360a23182c09f17' (2024-01-24)
  → 'github:NixOS/nixpkgs/72d28a6d71c30f0242c18317520bc3f4d822e794' (2024-01-25)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0725fce..89bb098 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1706117534,
-        "narHash": "sha256-lpqFyGl6cs6jGGH6JAcELO8grB4NtJlu7Q4nNPL1UvM=",
+        "lastModified": 1706176172,
+        "narHash": "sha256-+kOLrH4DNw6EMITqXosMqoQUyIGWTMYVYcqALP8+PPc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6737bac6ac4a5314f34d2c736360a23182c09f17",
+        "rev": "72d28a6d71c30f0242c18317520bc3f4d822e794",
         "type": "github"
       },
       "original": {

From f8dbbb23ee7d047c74626d6b464acc28d5f1465f Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 25 Jan 2024 23:06:20 -0700
Subject: [PATCH 42/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/06570e54184cb7f3aecb16c7c5ef82a871ce5873' (2024-01-25)
  → 'github:NixOS/nixpkgs/aa7e5cc700e39771f9a9c8802794e5af4ea1d498' (2024-01-26)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 89bb098..3be9d5e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706161682,
-        "narHash": "sha256-vJ5goAufjkpWEyu/XPzM4NFMjM7uR/q9p6Moy4viWqo=",
+        "lastModified": 1706247775,
+        "narHash": "sha256-vL6oiaR/0xXHOhLobupdvDfrinEqOY81ijSEg7wQPsc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "06570e54184cb7f3aecb16c7c5ef82a871ce5873",
+        "rev": "aa7e5cc700e39771f9a9c8802794e5af4ea1d498",
         "type": "github"
       },
       "original": {

From 017784390dc1adbeaf7be2cf3871a232b2786028 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 26 Jan 2024 00:01:57 -0700
Subject: [PATCH 43/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/5cd2baa57a9ff2d84f2615700434fa04f3067fdb' (2024-01-24)
  → 'github:NixOS/nixpkgs/854f4671883250e456dc1553c783ac9741a0e9a4' (2024-01-25)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3be9d5e..470fd40 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1706112902,
-        "narHash": "sha256-GKPwSY0fBShj0FfaPqA4gg5oHGhpya/m2DVb+3m+Uzs=",
+        "lastModified": 1706150372,
+        "narHash": "sha256-L0ioe5hifmkzltYr8Eo+72QvdDYPKHhDp9oWm3yqHkw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cd2baa57a9ff2d84f2615700434fa04f3067fdb",
+        "rev": "854f4671883250e456dc1553c783ac9741a0e9a4",
         "type": "github"
       },
       "original": {

From b37043851d51d6936ad53d4898d4705bf1a52a74 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 26 Jan 2024 08:10:31 -0700
Subject: [PATCH 44/70] stan: enable backups

---
 flake.lock             | 22 +++++++++++-----------
 hosts/stan/default.nix | 29 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 470fd40..643eb6d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -392,10 +392,10 @@
     },
     "stable_2": {
       "locked": {
-        "lastModified": 1702161203,
-        "narHash": "sha256-nq40oP9Pk/bC9/3ShxUah2FWsyHcObtS2NU5rV8shXY=",
-        "path": "/nix/store/2mk1z2xf4v5rnpml75gbmgv6bv6i4nig-source",
-        "rev": "901fc6ea49ca9e9bbf636c48e2611588802e7b16",
+        "lastModified": 1706176172,
+        "narHash": "sha256-+kOLrH4DNw6EMITqXosMqoQUyIGWTMYVYcqALP8+PPc=",
+        "path": "/nix/store/a2y0kc4g4xlxg5r50565y45734q4mssd-source",
+        "rev": "72d28a6d71c30f0242c18317520bc3f4d822e794",
         "type": "path"
       },
       "original": {
@@ -516,11 +516,11 @@
     },
     "unstable_2": {
       "locked": {
-        "lastModified": 1702397419,
-        "narHash": "sha256-CBMSwZHT7GLq2JdOPWAVDBaYFbUHWD1+jPFrYk0JeLM=",
+        "lastModified": 1706278372,
+        "narHash": "sha256-SYceUQX1wjDQQsdws5MjNOWXE79GESFp/9uc4w3tZDo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73ca2df642228129df7a968bad6499732dbc7ddd",
+        "rev": "6081df2649d246e60d9d0165c79bea8ac3a97816",
         "type": "github"
       },
       "original": {
@@ -553,11 +553,11 @@
         "unstable": "unstable_2"
       },
       "locked": {
-        "lastModified": 1705613028,
-        "narHash": "sha256-YeZWRn1sqFFtBp1HgDSJAVczlPGS62TMUA0ruB8d+CQ=",
+        "lastModified": 1706280764,
+        "narHash": "sha256-hvqQwniv9DTXHHf9wXdSus5aaZUMX+cPjm0BU5sT4cI=",
         "ref": "main",
-        "rev": "f6ef694e6d8a6bc9af28996238bc379b6348ea88",
-        "revCount": 122,
+        "rev": "28c6b8651be883f28933d2646221098394c1fdab",
+        "revCount": 125,
         "type": "git",
         "url": "ssh://xin-secrets-ro/qbit/xin-secrets.git"
       },
diff --git a/hosts/stan/default.nix b/hosts/stan/default.nix
index 728dbdc..2ba9100 100644
--- a/hosts/stan/default.nix
+++ b/hosts/stan/default.nix
@@ -133,6 +133,21 @@ in
       group = "wheel";
       mode = "400";
     };
+    restic_password_file = {
+      sopsFile = config.xin-secrets.stan.main;
+      owner = "root";
+      mode = "400";
+    };
+    restic_env_file = {
+      sopsFile = config.xin-secrets.stan.main;
+      owner = "root";
+      mode = "400";
+    };
+    restic_repo_file = {
+      sopsFile = config.xin-secrets.stan.main;
+      owner = "root";
+      mode = "400";
+    };
   };
 
   users.users.root = userBase;
@@ -193,6 +208,20 @@ in
   };
 
   services = {
+    restic = {
+      backups = {
+        remote = {
+          initialize = true;
+          environmentFile = "${config.sops.secrets.restic_env_file.path}";
+          passwordFile = "${config.sops.secrets.restic_password_file.path}";
+          repositoryFile = "${config.sops.secrets.restic_repo_file.path}";
+
+          paths = [ "/home/abieber" "/var/lib/libvirt" ];
+
+          pruneOpts = [ "--keep-daily 7" "--keep-weekly 2" "--keep-monthly 2" ];
+        };
+      };
+    };
     rsyslogd = {
       enable = testingMode;
       defaultConfig = ''

From 1b9e2e99b9e8f6c203470c7bc584b508350fdf16 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 26 Jan 2024 12:39:16 -0700
Subject: [PATCH 45/70] stan: ignore libvirt for now

---
 hosts/stan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/stan/default.nix b/hosts/stan/default.nix
index 2ba9100..a55912d 100644
--- a/hosts/stan/default.nix
+++ b/hosts/stan/default.nix
@@ -216,7 +216,7 @@ in
           passwordFile = "${config.sops.secrets.restic_password_file.path}";
           repositoryFile = "${config.sops.secrets.restic_repo_file.path}";
 
-          paths = [ "/home/abieber" "/var/lib/libvirt" ];
+          paths = [ "/home/abieber" ];
 
           pruneOpts = [ "--keep-daily 7" "--keep-weekly 2" "--keep-monthly 2" ];
         };

From 1dfcebb5f50f8bbf3bc2fd9a5f32dbc2ada2e797 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 26 Jan 2024 23:00:34 -0700
Subject: [PATCH 46/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/72d28a6d71c30f0242c18317520bc3f4d822e794' (2024-01-25)
  → 'github:NixOS/nixpkgs/c5f0e282bfd67e8380d924e771f385e3ff7bfe4f' (2024-01-26)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 643eb6d..6cb0d93 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1706176172,
-        "narHash": "sha256-+kOLrH4DNw6EMITqXosMqoQUyIGWTMYVYcqALP8+PPc=",
+        "lastModified": 1706260074,
+        "narHash": "sha256-J6iZiFCiqWuxeDKgMXv04qdtTgSjV++TBrZu4zv1SNA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72d28a6d71c30f0242c18317520bc3f4d822e794",
+        "rev": "c5f0e282bfd67e8380d924e771f385e3ff7bfe4f",
         "type": "github"
       },
       "original": {

From fc98271808179bf95e1eba660561128cfe66f7e4 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 26 Jan 2024 23:03:53 -0700
Subject: [PATCH 47/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/aa7e5cc700e39771f9a9c8802794e5af4ea1d498' (2024-01-26)
  → 'github:NixOS/nixpkgs/b0051767f1e1a0fcdf7fc1c22aad0ecc1c2fb42a' (2024-01-27)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6cb0d93..e5dfe90 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706247775,
-        "narHash": "sha256-vL6oiaR/0xXHOhLobupdvDfrinEqOY81ijSEg7wQPsc=",
+        "lastModified": 1706335098,
+        "narHash": "sha256-ktjdYzpBD4JpGB+qPJpG2mqX1jlIpgxGJ/dwN9X5mVs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa7e5cc700e39771f9a9c8802794e5af4ea1d498",
+        "rev": "b0051767f1e1a0fcdf7fc1c22aad0ecc1c2fb42a",
         "type": "github"
       },
       "original": {

From 978811798d48df06f9e355a154f90ec1b51d5053 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 26 Jan 2024 23:26:57 -0700
Subject: [PATCH 48/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/854f4671883250e456dc1553c783ac9741a0e9a4' (2024-01-25)
  → 'github:NixOS/nixpkgs/7ac72b3ee2af9bab80d66addd9b237277cc975c5' (2024-01-26)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index e5dfe90..db9f92b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1706150372,
-        "narHash": "sha256-L0ioe5hifmkzltYr8Eo+72QvdDYPKHhDp9oWm3yqHkw=",
+        "lastModified": 1706275741,
+        "narHash": "sha256-53O2JHFdDTWHzTfLkZRAZVAk9ntChFhcTTnAtj6bJKE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "854f4671883250e456dc1553c783ac9741a0e9a4",
+        "rev": "7ac72b3ee2af9bab80d66addd9b237277cc975c5",
         "type": "github"
       },
       "original": {

From f18a863cb3bfd02ba79f61160387639027920b52 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 27 Jan 2024 23:00:08 -0700
Subject: [PATCH 49/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/1e706ef323de76236eb183d7784f3bd57255ec0b' (2024-01-22)
  → 'github:lnl7/nix-darwin/0108864c15bb68ad57d17fb2e7d3a3e025751d79' (2024-01-28)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index db9f92b..41c36c9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705915768,
-        "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=",
+        "lastModified": 1706405065,
+        "narHash": "sha256-femlVBNWgr9a6HfBUzhBF/9S8VBlaHDKcEm8B89O+zc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b",
+        "rev": "0108864c15bb68ad57d17fb2e7d3a3e025751d79",
         "type": "github"
       },
       "original": {

From 2975168d7dc5af8160dfd29ee83cbed73d70ef72 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 27 Jan 2024 23:02:37 -0700
Subject: [PATCH 50/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4606d9b1595e42ffd9b75b9e69667708c70b1d68' (2024-01-24)
  → 'github:Mic92/sops-nix/73bf36912e31a6b21af6e0f39218e067283c67ef' (2024-01-28)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 41c36c9..aa7566a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -361,11 +361,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706130372,
-        "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=",
+        "lastModified": 1706410821,
+        "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68",
+        "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef",
         "type": "github"
       },
       "original": {

From f6dc29053d476298e39e17e37d820a1d475d7060 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 27 Jan 2024 23:05:19 -0700
Subject: [PATCH 51/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/c5f0e282bfd67e8380d924e771f385e3ff7bfe4f' (2024-01-26)
  → 'github:NixOS/nixpkgs/d865acc39246daafe6c639244d0b864f150ca59f' (2024-01-27)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index aa7566a..c323c1d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1706260074,
-        "narHash": "sha256-J6iZiFCiqWuxeDKgMXv04qdtTgSjV++TBrZu4zv1SNA=",
+        "lastModified": 1706340990,
+        "narHash": "sha256-Bs1T+WkM9LoqmaqXSwELcCD6uXD1+vwzEjeT686goh4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5f0e282bfd67e8380d924e771f385e3ff7bfe4f",
+        "rev": "d865acc39246daafe6c639244d0b864f150ca59f",
         "type": "github"
       },
       "original": {

From 85ed0a3c9615c39882af73e7cc1f2a8506d10579 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 27 Jan 2024 23:08:15 -0700
Subject: [PATCH 52/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/b0051767f1e1a0fcdf7fc1c22aad0ecc1c2fb42a' (2024-01-27)
  → 'github:NixOS/nixpkgs/9e77a12cbf067251f53e40a3a4d0df675d6fd581' (2024-01-28)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index c323c1d..0ecd54e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706335098,
-        "narHash": "sha256-ktjdYzpBD4JpGB+qPJpG2mqX1jlIpgxGJ/dwN9X5mVs=",
+        "lastModified": 1706422045,
+        "narHash": "sha256-wSG9IRpGIS7Gbnei/TThlzYl5y51jf/QLOJuFFUO8Z4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0051767f1e1a0fcdf7fc1c22aad0ecc1c2fb42a",
+        "rev": "9e77a12cbf067251f53e40a3a4d0df675d6fd581",
         "type": "github"
       },
       "original": {

From 49306833a318ac9cb6a9790273cc9aa83761c751 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 28 Jan 2024 00:09:55 -0700
Subject: [PATCH 53/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/7ac72b3ee2af9bab80d66addd9b237277cc975c5' (2024-01-26)
  → 'github:NixOS/nixpkgs/3fb3707af869e32b0ad0676f589b16cc7711a376' (2024-01-27)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0ecd54e..012000a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1706275741,
-        "narHash": "sha256-53O2JHFdDTWHzTfLkZRAZVAk9ntChFhcTTnAtj6bJKE=",
+        "lastModified": 1706370590,
+        "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7ac72b3ee2af9bab80d66addd9b237277cc975c5",
+        "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376",
         "type": "github"
       },
       "original": {

From 908abaee8aadefd4ed1a76deba77312357b25b8c Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 28 Jan 2024 23:00:08 -0700
Subject: [PATCH 54/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/0108864c15bb68ad57d17fb2e7d3a3e025751d79' (2024-01-28)
  → 'github:lnl7/nix-darwin/00538eecf2d1a8f98a53a71c9c84f913003ec5e8' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 012000a..2f0fd32 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706405065,
-        "narHash": "sha256-femlVBNWgr9a6HfBUzhBF/9S8VBlaHDKcEm8B89O+zc=",
+        "lastModified": 1706497381,
+        "narHash": "sha256-VzzLBvm4ejehe42yKlCUjG3op3NLXq78MKS8u/W3NLQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "0108864c15bb68ad57d17fb2e7d3a3e025751d79",
+        "rev": "00538eecf2d1a8f98a53a71c9c84f913003ec5e8",
         "type": "github"
       },
       "original": {

From 6178ced301a580a216f6dd5a61dfb8aa90756986 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 28 Jan 2024 23:02:51 -0700
Subject: [PATCH 55/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/d865acc39246daafe6c639244d0b864f150ca59f' (2024-01-27)
  → 'github:NixOS/nixpkgs/169ea5834515d2b3a81a16973ad3d6b992293376' (2024-01-28)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2f0fd32..309f8c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1706340990,
-        "narHash": "sha256-Bs1T+WkM9LoqmaqXSwELcCD6uXD1+vwzEjeT686goh4=",
+        "lastModified": 1706459302,
+        "narHash": "sha256-lwdThovy5KA4m5r00+z7XG6f163BwjvcG/XRql3F9T8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d865acc39246daafe6c639244d0b864f150ca59f",
+        "rev": "169ea5834515d2b3a81a16973ad3d6b992293376",
         "type": "github"
       },
       "original": {

From 04127a3f7f04e22dcd2d151e6e22191fc8ac4193 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 28 Jan 2024 23:07:28 -0700
Subject: [PATCH 56/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/9e77a12cbf067251f53e40a3a4d0df675d6fd581' (2024-01-28)
  → 'github:NixOS/nixpkgs/3b0201816178b4eebb20ba7996ff5bab223ddcac' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 309f8c2..5247e4c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706422045,
-        "narHash": "sha256-wSG9IRpGIS7Gbnei/TThlzYl5y51jf/QLOJuFFUO8Z4=",
+        "lastModified": 1706507859,
+        "narHash": "sha256-eY+32+fsgtq9b7iVSMTkCfn4t+r2TeqekHdhpjXXaXU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e77a12cbf067251f53e40a3a4d0df675d6fd581",
+        "rev": "3b0201816178b4eebb20ba7996ff5bab223ddcac",
         "type": "github"
       },
       "original": {

From b5cd4350045f8a175da48ead3b09571f21035ca6 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 28 Jan 2024 23:41:18 -0700
Subject: [PATCH 57/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/3fb3707af869e32b0ad0676f589b16cc7711a376' (2024-01-27)
  → 'github:NixOS/nixpkgs/48f6e0d2866ef7168f42f30ed9601c70fdc49899' (2024-01-28)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5247e4c..6ee7160 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1706370590,
-        "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=",
+        "lastModified": 1706472015,
+        "narHash": "sha256-SkBuhrn0o7g/FqRBxrqRqgjFObO9cxK1r1Tq2DfAIkg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376",
+        "rev": "48f6e0d2866ef7168f42f30ed9601c70fdc49899",
         "type": "github"
       },
       "original": {

From 64c23d6dbee60b6872b0c0be6edf69156a62845a Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 08:39:26 -0700
Subject: [PATCH 58/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'gostart':
    'github:qbit/gostart/650550af32e0d001e0728fe3b95aaa0be8ed8f45' (2023-11-15)
  → 'github:qbit/gostart/06238dbfc214e7cd8663d199ec9b2cb2f727a5c1' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6ee7160..57d1f28 100644
--- a/flake.lock
+++ b/flake.lock
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700085029,
-        "narHash": "sha256-lxI1Lubo3tG3GeMVIPXM+TXBPTEtTZFVUrxWcIBzRbQ=",
+        "lastModified": 1706538267,
+        "narHash": "sha256-1LKxeGiH18qTf5uyQowEHpd0+ytXs8s0MspLxXelXzM=",
         "owner": "qbit",
         "repo": "gostart",
-        "rev": "650550af32e0d001e0728fe3b95aaa0be8ed8f45",
+        "rev": "06238dbfc214e7cd8663d199ec9b2cb2f727a5c1",
         "type": "github"
       },
       "original": {

From b13e8c61cc278c158eb567e7aac2b7efde85d339 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 08:47:33 -0700
Subject: [PATCH 59/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/169ea5834515d2b3a81a16973ad3d6b992293376' (2024-01-28)
  → 'github:NixOS/nixpkgs/da33deae34a869896c1dfd052608f9001cfb73a5' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 57d1f28..1a6fa28 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1706459302,
-        "narHash": "sha256-lwdThovy5KA4m5r00+z7XG6f163BwjvcG/XRql3F9T8=",
+        "lastModified": 1706494836,
+        "narHash": "sha256-uP9Sl2MRDIg3ew1pOUujpcQdyZvbSseLwLjGaptcu0g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "169ea5834515d2b3a81a16973ad3d6b992293376",
+        "rev": "da33deae34a869896c1dfd052608f9001cfb73a5",
         "type": "github"
       },
       "original": {

From 5849f25ae4a0b236793ac02992af298ea8577168 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 08:49:57 -0700
Subject: [PATCH 60/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'tsRevProx':
    'github:qbit/ts-reverse-proxy/4a932dae8d68ed4de61b8d2c9d096127171cbf48' (2023-11-17)
  → 'github:qbit/ts-reverse-proxy/32dcd0f1a301833230b003efb84b148ba39230b2' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1a6fa28..2756be3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -450,11 +450,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700230166,
-        "narHash": "sha256-4C3zisZ2YZRUzWagNgbKnLjSP2W1lCdqDvusuF7LFeQ=",
+        "lastModified": 1706541995,
+        "narHash": "sha256-H08lKKLU3db/USh17x2sD6f6Zf5tRr0r3cFQEMHF3vQ=",
         "owner": "qbit",
         "repo": "ts-reverse-proxy",
-        "rev": "4a932dae8d68ed4de61b8d2c9d096127171cbf48",
+        "rev": "32dcd0f1a301833230b003efb84b148ba39230b2",
         "type": "github"
       },
       "original": {

From 6cd5cdf775339db076b238af7d1cc5c9e0955032 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 08:52:34 -0700
Subject: [PATCH 61/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'tsvnstat':
    'github:qbit/tsvnstat/8503704a62b535db058dc499233e6045ee2bd53f' (2023-12-09)
  → 'github:qbit/tsvnstat/163b4b642e4c44a4929d3a8d17179436b6739451' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2756be3..7ab3728 100644
--- a/flake.lock
+++ b/flake.lock
@@ -470,11 +470,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702158663,
-        "narHash": "sha256-GaNzTaOuFk3oWQnPugtXsAW/BUxLDna9O2MGjeSYamg=",
+        "lastModified": 1706542526,
+        "narHash": "sha256-L0+rDINoY9fpSpn+Xf0LZfF4ItbKi3snLTXgvm0SUyQ=",
         "owner": "qbit",
         "repo": "tsvnstat",
-        "rev": "8503704a62b535db058dc499233e6045ee2bd53f",
+        "rev": "163b4b642e4c44a4929d3a8d17179436b6739451",
         "type": "github"
       },
       "original": {

From 6f800ad7b44c3458faf8ac09072fa8e4d5db45f2 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 08:55:29 -0700
Subject: [PATCH 62/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/3b0201816178b4eebb20ba7996ff5bab223ddcac' (2024-01-29)
  → 'github:NixOS/nixpkgs/cb8d00f6c5a88644d38b8eb3f23c239cc120465d' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7ab3728..40857c6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706507859,
-        "narHash": "sha256-eY+32+fsgtq9b7iVSMTkCfn4t+r2TeqekHdhpjXXaXU=",
+        "lastModified": 1706541638,
+        "narHash": "sha256-sAEo8TWEyi4SxdyVOC6PQaJAWmeT8uHngYtIkYN4SB0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3b0201816178b4eebb20ba7996ff5bab223ddcac",
+        "rev": "cb8d00f6c5a88644d38b8eb3f23c239cc120465d",
         "type": "github"
       },
       "original": {

From facc8d5405e02ddc51d912c2776e9ae3518b4869 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 09:19:01 -0700
Subject: [PATCH 63/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'xintray':
    'github:qbit/xintray/fd0dbedf136831e5eefd4fceaf8ad1f973c084e0' (2023-11-13)
  → 'github:qbit/xintray/2db51608995317dcae33c450a2cabf6580cb8210' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 40857c6..3c2ff70 100644
--- a/flake.lock
+++ b/flake.lock
@@ -574,11 +574,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699892883,
-        "narHash": "sha256-ilSljUKveIjUd0dHJhZiAZ3rwKqO7ZBslvBsPEzQ7/U=",
+        "lastModified": 1706533372,
+        "narHash": "sha256-hKUfvEYQWSfb9y99wUE4V8qqKbkCTlP+P9rpJLMZhZQ=",
         "owner": "qbit",
         "repo": "xintray",
-        "rev": "fd0dbedf136831e5eefd4fceaf8ad1f973c084e0",
+        "rev": "2db51608995317dcae33c450a2cabf6580cb8210",
         "type": "github"
       },
       "original": {

From 8f4bddc0f0b0b6ddab2f2ee7dc7435de95bf5c42 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 23:00:08 -0700
Subject: [PATCH 64/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/00538eecf2d1a8f98a53a71c9c84f913003ec5e8' (2024-01-29)
  → 'github:lnl7/nix-darwin/91b9daf672c957ef95a05491a75f62e6a01d5aaf' (2024-01-30)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3c2ff70..1a57835 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706497381,
-        "narHash": "sha256-VzzLBvm4ejehe42yKlCUjG3op3NLXq78MKS8u/W3NLQ=",
+        "lastModified": 1706581965,
+        "narHash": "sha256-1H7dRdK9LJ7+2X1XQtbwXr+QMqtVVo/ZF0/LIvkjdK8=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "00538eecf2d1a8f98a53a71c9c84f913003ec5e8",
+        "rev": "91b9daf672c957ef95a05491a75f62e6a01d5aaf",
         "type": "github"
       },
       "original": {

From 7134dff83ab3e5c899eed627911f7b4153956fdf Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 29 Jan 2024 23:02:58 -0700
Subject: [PATCH 65/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/cb8d00f6c5a88644d38b8eb3f23c239cc120465d' (2024-01-29)
  → 'github:NixOS/nixpkgs/07ba912223ee26bd59c2be251050c071c6906553' (2024-01-30)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1a57835..a6a32a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706541638,
-        "narHash": "sha256-sAEo8TWEyi4SxdyVOC6PQaJAWmeT8uHngYtIkYN4SB0=",
+        "lastModified": 1706594455,
+        "narHash": "sha256-zLZz4p0bDvCaMPpUPDqX+KzKfi2ldk+s6HDLwQXTGWE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cb8d00f6c5a88644d38b8eb3f23c239cc120465d",
+        "rev": "07ba912223ee26bd59c2be251050c071c6906553",
         "type": "github"
       },
       "original": {

From cc59642e29cd5f067916daa5f1af8d20ca1d6bcd Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 30 Jan 2024 00:18:51 -0700
Subject: [PATCH 66/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/48f6e0d2866ef7168f42f30ed9601c70fdc49899' (2024-01-28)
  → 'github:NixOS/nixpkgs/8131c739ff0b40820a7d7888666dbf6e43809233' (2024-01-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index a6a32a6..eb6756d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1706472015,
-        "narHash": "sha256-SkBuhrn0o7g/FqRBxrqRqgjFObO9cxK1r1Tq2DfAIkg=",
+        "lastModified": 1706547092,
+        "narHash": "sha256-Gs3RWi83YRmQFnEKDI2vK5XWTOpUK21uDHH/GEMWIio=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "48f6e0d2866ef7168f42f30ed9601c70fdc49899",
+        "rev": "8131c739ff0b40820a7d7888666dbf6e43809233",
         "type": "github"
       },
       "original": {

From 0efaac55d47370742ca469622d5c3a42513e121d Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 30 Jan 2024 12:47:55 -0700
Subject: [PATCH 67/70] europa/clunk: +tncattach

---
 hosts/clunk/default.nix  | 1 +
 hosts/europa/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hosts/clunk/default.nix b/hosts/clunk/default.nix
index c5a21f8..d424ddf 100644
--- a/hosts/clunk/default.nix
+++ b/hosts/clunk/default.nix
@@ -44,6 +44,7 @@ in
     python3Packages.rns
     rofi
     rtl-sdr
+    tncattach
 
     # no GLSL ES 3.10
     # (callPackage ../../pkgs/zutty.nix { })
diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix
index aa85732..6715985 100644
--- a/hosts/europa/default.nix
+++ b/hosts/europa/default.nix
@@ -374,6 +374,7 @@ in
       tea
       thunderbird
       tigervnc
+      tncattach
       unzip
       veilid
       virt-manager

From 4f7692bf30a9331784e950dbe81bdd16f2683e76 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 30 Jan 2024 23:00:44 -0700
Subject: [PATCH 68/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'stable':
    'github:NixOS/nixpkgs/da33deae34a869896c1dfd052608f9001cfb73a5' (2024-01-29)
  → 'github:NixOS/nixpkgs/5b8cd3c2523ab08051ef5d5a5f8164aee3e67410' (2024-01-30)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index eb6756d..af487d7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -376,11 +376,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1706494836,
-        "narHash": "sha256-uP9Sl2MRDIg3ew1pOUujpcQdyZvbSseLwLjGaptcu0g=",
+        "lastModified": 1706625233,
+        "narHash": "sha256-DLlMXRloZm22UvHa1F3K1Perd0PhSmtlCUglyjIwlek=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da33deae34a869896c1dfd052608f9001cfb73a5",
+        "rev": "5b8cd3c2523ab08051ef5d5a5f8164aee3e67410",
         "type": "github"
       },
       "original": {

From a2f3817b87067656187d13fee4fe5035c54b1323 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 30 Jan 2024 23:21:49 -0700
Subject: [PATCH 69/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstable':
    'github:NixOS/nixpkgs/07ba912223ee26bd59c2be251050c071c6906553' (2024-01-30)
  → 'github:NixOS/nixpkgs/632751bf0ceeefc74af7a9d2335ea923ad9c831a' (2024-01-31)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index af487d7..b0f5aea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -485,11 +485,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706594455,
-        "narHash": "sha256-zLZz4p0bDvCaMPpUPDqX+KzKfi2ldk+s6HDLwQXTGWE=",
+        "lastModified": 1706672657,
+        "narHash": "sha256-API05c0SDZrmzz1wpqt/K3iCwlaOqDeDfZGp0YGQnek=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "07ba912223ee26bd59c2be251050c071c6906553",
+        "rev": "632751bf0ceeefc74af7a9d2335ea923ad9c831a",
         "type": "github"
       },
       "original": {

From dad1dbe829fd218a084ec3690cf75e194d9e993a Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 30 Jan 2024 23:35:14 -0700
Subject: [PATCH 70/70] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'unstableSmall':
    'github:NixOS/nixpkgs/8131c739ff0b40820a7d7888666dbf6e43809233' (2024-01-29)
  → 'github:NixOS/nixpkgs/d3c09ae008dbb08a238aadfad70d5a168bc63e29' (2024-01-30)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index b0f5aea..0d5d290 100644
--- a/flake.lock
+++ b/flake.lock
@@ -500,11 +500,11 @@
     },
     "unstableSmall": {
       "locked": {
-        "lastModified": 1706547092,
-        "narHash": "sha256-Gs3RWi83YRmQFnEKDI2vK5XWTOpUK21uDHH/GEMWIio=",
+        "lastModified": 1706631780,
+        "narHash": "sha256-prq+Rk/1drYmoG5Xm/ttzyYux2NNn5ZGX0Lt3j69VBo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8131c739ff0b40820a7d7888666dbf6e43809233",
+        "rev": "d3c09ae008dbb08a238aadfad70d5a168bc63e29",
         "type": "github"
       },
       "original": {