From f1c469c7fce81a9872ea4b822b03818ae4f5f6a4 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Sun, 1 Sep 2024 10:30:16 -0500
Subject: [PATCH] theme - formating

---
 flake.nix                                |  77 ++++++++++++++++-------
 home/common/default.nix                  |   1 -
 home/common/khard.nix                    |  24 +++++--
 home/common/mail.nix                     |   8 ++-
 home/common/taskwarrior.nix              |   8 ++-
 home/common/todoman.nix                  |  15 -----
 home/default.nix                         |   4 +-
 home/gui/default.nix                     |   8 ++-
 home/gui/qutebrowser.nix                 |  34 ++++++++--
 home/gui/sway.nix                        |  23 ++++++-
 hosts/ace/hardware-configuration.nix     |   7 ++-
 hosts/dragon/hardware-configuration.nix  |   8 ++-
 hosts/eve/hardware-configuration.nix     |   8 ++-
 hosts/fred/hardware-configuration.nix    |  10 ++-
 hosts/loki/hardware-configuration.nix    |   9 ++-
 hosts/loki/kernel.nix                    |   5 +-
 hosts/pocket2/hardware-configuration.nix |   8 ++-
 hosts/server/default.nix                 |  36 +++++++++--
 hosts/server/tailscale.nix               | Bin 1090 -> 1150 bytes
 hosts/smaug/hardware-configuration.nix   |   8 ++-
 hosts/vm/hardware-configuration.nix      |   8 ++-
 hosts/vm1/hardware-configuration.nix     |   8 ++-
 hosts/workstation/default.nix            |  37 ++++++++---
 hosts/workstation/tailscale.nix          | Bin 1095 -> 1155 bytes
 hosts/www2/hardware-configuration.nix    |  10 ++-
 pkgs/.keepme                             |   0
 pkgs/kanshi-fix/99-kanshi-fix.rules      |   2 -
 pkgs/kanshi-fix/default.nix              |   2 -
 pkgs/kanshi-fix/derivation.nix           |  20 ------
 pkgs/kanshi-fix/kanshi-fix               |   4 --
 30 files changed, 287 insertions(+), 105 deletions(-)
 delete mode 100644 home/common/todoman.nix
 create mode 100644 pkgs/.keepme
 delete mode 100644 pkgs/kanshi-fix/99-kanshi-fix.rules
 delete mode 100644 pkgs/kanshi-fix/default.nix
 delete mode 100644 pkgs/kanshi-fix/derivation.nix
 delete mode 100755 pkgs/kanshi-fix/kanshi-fix

diff --git a/flake.nix b/flake.nix
index d147157..110e51b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,13 +23,18 @@
   }: let
     inherit (self) outputs;
     lib = nixpkgs.lib // home-manager.lib;
-    systems = ["x86_64-linux" "aarch64-linux"];
+    systems = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
-    pkgsFor = lib.genAttrs systems (system:
-      import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      });
+    pkgsFor = lib.genAttrs systems (
+      system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        }
+    );
   in {
     inherit lib;
     # nixosModules = import ./modules/nixos;
@@ -46,42 +51,60 @@
       # clients
       ace = lib.nixosSystem {
         modules = [./hosts/ace];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       dragon = lib.nixosSystem {
         modules = [./hosts/dragon];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       eve = lib.nixosSystem {
         modules = [./hosts/eve];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       loki = lib.nixosSystem {
         modules = [./hosts/loki];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
 
       pocket2 = lib.nixosSystem {
         modules = [./hosts/pocket2];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       smaug = lib.nixosSystem {
         modules = [./hosts/smaug];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       t2 = lib.nixosSystem {
         modules = [./hosts/t2];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
 
       # servers
       display = lib.nixosSystem {
         modules = [./hosts/display];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       fred = lib.nixosSystem {
         modules = [./hosts/fred];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       vm = lib.nixosSystem {
         modules = [
@@ -89,27 +112,39 @@
           "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
           ./hosts/vm
         ];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       harper2 = lib.nixosSystem {
         modules = [./hosts/harper2];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       harper = lib.nixosSystem {
         modules = [./hosts/harper];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       nuwww = lib.nixosSystem {
         modules = [./hosts/nuwww];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       pihole = lib.nixosSystem {
         modules = [./hosts/pihole];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
       www2 = lib.nixosSystem {
         modules = [./hosts/www2];
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+          inherit inputs outputs;
+        };
       };
     };
   };
diff --git a/home/common/default.nix b/home/common/default.nix
index 6d8e535..6fdd125 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -19,7 +19,6 @@
     ./neovim.nix
     ./newsboat.nix
     ./taskwarrior.nix
-    ./todoman.nix
     ./topgrade.nix
     ./tmux.nix
     ./vifm.nix
diff --git a/home/common/khard.nix b/home/common/khard.nix
index c42c946..5263d95 100644
--- a/home/common/khard.nix
+++ b/home/common/khard.nix
@@ -9,7 +9,10 @@
       general = {
         default_action = "list";
         editor = "${pkgs.neovim}/bin/nvim";
-        merge_editor = ["${pkgs.neovim}/bin/nvim" "-d"];
+        merge_editor = [
+          "${pkgs.neovim}/bin/nvim"
+          "-d"
+        ];
       };
       "contact table" = {
         display = "first_name";
@@ -19,11 +22,24 @@
         show_uids = "no";
         sort = "last_name";
         localize_dates = "yes";
-        preferred_phone_number_type = ["pref" "cell" "home"];
-        preferred_email_address_type = ["pref" "work" "home"];
+        preferred_phone_number_type = [
+          "pref"
+          "cell"
+          "home"
+        ];
+        preferred_email_address_type = [
+          "pref"
+          "work"
+          "home"
+        ];
       };
       vcard = {
-        private_objects = ["Jabber" "Skype" "Twitter" "Mastodon"];
+        private_objects = [
+          "Jabber"
+          "Skype"
+          "Twitter"
+          "Mastodon"
+        ];
         preferred_version = "3.0";
         search_in_source_files = "no";
         skip_unparsable = "no";
diff --git a/home/common/mail.nix b/home/common/mail.nix
index d6714a6..8af1725 100644
--- a/home/common/mail.nix
+++ b/home/common/mail.nix
@@ -18,7 +18,13 @@
     enable = true;
     new = {
       tags = ["unread"];
-      ignore = [".mbsyncstate" ".uidvalidity" ".mbsyncstate.journal" ".mbsyncstate.new" ".mbsyncstate.lock"];
+      ignore = [
+        ".mbsyncstate"
+        ".uidvalidity"
+        ".mbsyncstate.journal"
+        ".mbsyncstate.new"
+        ".mbsyncstate.lock"
+      ];
     };
     extraConfig = {
       database = {
diff --git a/home/common/taskwarrior.nix b/home/common/taskwarrior.nix
index c092b9e..9a2f4cc 100644
--- a/home/common/taskwarrior.nix
+++ b/home/common/taskwarrior.nix
@@ -1,5 +1,11 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [taskwarrior taskwarrior-tui tasksh vit timewarrior];
+  home.packages = with pkgs; [
+    taskwarrior
+    taskwarrior-tui
+    tasksh
+    vit
+    timewarrior
+  ];
   programs.taskwarrior = {
     enable = true;
     colorTheme = "dark-green-256";
diff --git a/home/common/todoman.nix b/home/common/todoman.nix
deleted file mode 100644
index b6e38ee..0000000
--- a/home/common/todoman.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [todoman];
-  xdg.configFile."todoman/config.py".text =
-    /*
-    python
-    */
-    ''
-      path = "~/.config/vdirsyncer/storage/calendar/*"
-      date_format = "%Y-%m-%d"
-      time_format = "%H:%M"
-      default_list = "duckunix@gmail.com"
-      # default_due = 48
-      default_command = "list --startable"
-    '';
-}
diff --git a/home/default.nix b/home/default.nix
index e21fc96..e266e61 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -6,7 +6,9 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];
-  home-manager.extraSpecialArgs = {inherit inputs outputs;};
+  home-manager.extraSpecialArgs = {
+    inherit inputs outputs;
+  };
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
diff --git a/home/gui/default.nix b/home/gui/default.nix
index 0eb7587..3ed01c9 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -78,7 +78,9 @@
         enable = true;
         associations.added = {
           "application/octet-stream" = ["gvim.desktop"];
-          "application/pdf" = ["qpdfview.desktop;org.gnome.Evince.desktop;org.pwmt.zathura-pdf-mupdf.desktop"];
+          "application/pdf" = [
+            "qpdfview.desktop;org.gnome.Evince.desktop;org.pwmt.zathura-pdf-mupdf.desktop"
+          ];
           "audio/mpeg" = ["org.kde.kid3.desktop"];
           "image/jpeg" = ["darktable.desktop;gimp.desktop;imv.desktop"];
           "image/png" = ["darktable.desktop;gimp.desktop;imv-folder.desktop;imv.desktop"];
@@ -86,7 +88,9 @@
           "inode/directory" = ["thunar.desktop"];
           "text/plain" = ["gvim.desktop"];
           "x-scheme-handler/pdf" = ["pdfview.desktop"];
-          "x-scheme-handler/tg" = ["userapp-Telegram Desktop-9M6O50.desktop;userapp-Telegram Desktop-6IJLW1.desktop;userapp-Telegram Desktop-IQIXX1.desktop;userapp-Telegram Desktop-FK06Y1.desktop;userapp-Telegram Desktop-1SZ7Y1.desktop;userapp-Telegram Desktop-C24MZ1.desktop;userapp-Telegram Desktop-29FD01.desktop;userapp-Telegram Desktop-21P401.desktop;userapp-Telegram Desktop-LOTG11.desktop"];
+          "x-scheme-handler/tg" = [
+            "userapp-Telegram Desktop-9M6O50.desktop;userapp-Telegram Desktop-6IJLW1.desktop;userapp-Telegram Desktop-IQIXX1.desktop;userapp-Telegram Desktop-FK06Y1.desktop;userapp-Telegram Desktop-1SZ7Y1.desktop;userapp-Telegram Desktop-C24MZ1.desktop;userapp-Telegram Desktop-29FD01.desktop;userapp-Telegram Desktop-21P401.desktop;userapp-Telegram Desktop-LOTG11.desktop"
+          ];
         };
         defaultApplications = {
           "inode/directory" = ["thunar.desktop"];
diff --git a/home/gui/qutebrowser.nix b/home/gui/qutebrowser.nix
index e3da3ac..9551154 100644
--- a/home/gui/qutebrowser.nix
+++ b/home/gui/qutebrowser.nix
@@ -196,13 +196,22 @@
         };
       };
       completion = {
-        open_categories = ["quickmarks" "searchengines" "bookmarks" "history"];
+        open_categories = [
+          "quickmarks"
+          "searchengines"
+          "bookmarks"
+          "history"
+        ];
       };
       content = {
         autoplay = false;
         blocking = {
           adblock = {
-            lists = ["https://secure.fanboy.co.nz/fanboy-annoyance.txt" "https://easylist.to/easylist/easylist.txt" "https://easylist.to/easylist/easyprivacy.txt"];
+            lists = [
+              "https://secure.fanboy.co.nz/fanboy-annoyance.txt"
+              "https://easylist.to/easylist/easylist.txt"
+              "https://easylist.to/easylist/easyprivacy.txt"
+            ];
           };
           enabled = true;
         };
@@ -212,14 +221,29 @@
       };
       fileselect = {
         folder = {
-          command = ["kitty" "-e" "ranger" "--choosedir={}"];
+          command = [
+            "kitty"
+            "-e"
+            "ranger"
+            "--choosedir={}"
+          ];
         };
         handler = "external";
         multiple_files = {
-          command = ["kitty" "-e" "ranger" "--choosefile={}"];
+          command = [
+            "kitty"
+            "-e"
+            "ranger"
+            "--choosefile={}"
+          ];
         };
         single_file = {
-          command = ["kitty" "-e" "ranger" "--choosefile={}"];
+          command = [
+            "kitty"
+            "-e"
+            "ranger"
+            "--choosefile={}"
+          ];
         };
       };
       qt = {
diff --git a/home/gui/sway.nix b/home/gui/sway.nix
index 1482a8d..fe28e03 100644
--- a/home/gui/sway.nix
+++ b/home/gui/sway.nix
@@ -30,10 +30,29 @@
           position = "bottom";
           height = 10;
           spacing = 0;
-          modules-left = ["sway/workspaces" "sway/mode" "wlr/workspaces" "custom/mycal"];
+          modules-left = [
+            "sway/workspaces"
+            "sway/mode"
+            "wlr/workspaces"
+            "custom/mycal"
+          ];
           modules-center = [];
           # modules-right = ["idle_inhibitor" "custom/mytimew" "pulseaudio" "custom/mymusic" "bluetooth" "network" "backlight" "battery" "battery#bat2" "tray" "custom/mycal" "clock"];
-          modules-right = ["idle_inhibitor" "custom/weather" "custom/mytimew" "pulseaudio" "custom/mymusic" "bluetooth" "network" "backlight" "battery" "battery#bat2" "tray" "custom/mycal" "clock"];
+          modules-right = [
+            "idle_inhibitor"
+            "custom/weather"
+            "custom/mytimew"
+            "pulseaudio"
+            "custom/mymusic"
+            "bluetooth"
+            "network"
+            "backlight"
+            "battery"
+            "battery#bat2"
+            "tray"
+            "custom/mycal"
+            "clock"
+          ];
           bluetooth = {
             format-alt = "bt: {status}";
             format-on = "bt";
diff --git a/hosts/ace/hardware-configuration.nix b/hosts/ace/hardware-configuration.nix
index b25edad..b840698 100644
--- a/hosts/ace/hardware-configuration.nix
+++ b/hosts/ace/hardware-configuration.nix
@@ -12,7 +12,12 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "uas" "sd_mod"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "uas"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/dragon/hardware-configuration.nix b/hosts/dragon/hardware-configuration.nix
index b373ad3..c4891e3 100644
--- a/hosts/dragon/hardware-configuration.nix
+++ b/hosts/dragon/hardware-configuration.nix
@@ -12,7 +12,13 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/eve/hardware-configuration.nix b/hosts/eve/hardware-configuration.nix
index 558bec7..09691ba 100644
--- a/hosts/eve/hardware-configuration.nix
+++ b/hosts/eve/hardware-configuration.nix
@@ -12,7 +12,13 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/fred/hardware-configuration.nix b/hosts/fred/hardware-configuration.nix
index 6e2bc2f..c2b5489 100644
--- a/hosts/fred/hardware-configuration.nix
+++ b/hosts/fred/hardware-configuration.nix
@@ -12,7 +12,15 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "ums_realtek" "sd_mod" "sr_mod"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "ums_realtek"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = ["dm-snapshot"];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/loki/hardware-configuration.nix b/hosts/loki/hardware-configuration.nix
index 41b4e5c..e29db33 100644
--- a/hosts/loki/hardware-configuration.nix
+++ b/hosts/loki/hardware-configuration.nix
@@ -12,7 +12,14 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "thunderbolt"
+    "nvme"
+    "uas"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/loki/kernel.nix b/hosts/loki/kernel.nix
index 33d0a59..0cf0bcc 100644
--- a/hosts/loki/kernel.nix
+++ b/hosts/loki/kernel.nix
@@ -3,5 +3,8 @@
   pkgs,
   ...
 }: {
-  boot.kernelModules = ["axge" "ax88179_178a"];
+  boot.kernelModules = [
+    "axge"
+    "ax88179_178a"
+  ];
 }
diff --git a/hosts/pocket2/hardware-configuration.nix b/hosts/pocket2/hardware-configuration.nix
index f8f11f0..5315fc3 100644
--- a/hosts/pocket2/hardware-configuration.nix
+++ b/hosts/pocket2/hardware-configuration.nix
@@ -12,7 +12,13 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/server/default.nix b/hosts/server/default.nix
index a94f3f5..74c09f9 100644
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -18,10 +18,16 @@
 in {
   nix = {
     settings = {
-      experimental-features = ["nix-command" "flakes"];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
       warn-dirty = false;
       auto-optimise-store = true;
-      trusted-users = ["root" "don"];
+      trusted-users = [
+        "root"
+        "don"
+      ];
     };
     gc = {
       automatic = true;
@@ -76,7 +82,9 @@ in {
       enable = true;
     };
     kernel = {
-      sysctl = {"vm.swappiness" = 10;};
+      sysctl = {
+        "vm.swappiness" = 10;
+      };
     };
   };
 
@@ -145,7 +153,15 @@ in {
       isNormalUser = true;
       initialPassword = "changeme";
       description = "Don Harper";
-      extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "scanner"
+        "lp"
+        "video"
+        "mlocate"
+        "disk"
+      ];
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
       ];
@@ -194,7 +210,11 @@ in {
   };
 
   nixpkgs.overlays = [
-    (final: super: {khal = super.khal.overridePythonAttrs (_: {doCheck = false;});})
+    (final: super: {
+      khal = super.khal.overridePythonAttrs (_: {
+        doCheck = false;
+      });
+    })
   ];
 
   # Open ports in the firewall.
@@ -223,7 +243,11 @@ in {
     allowedTCPPorts = [22];
     interfaces = {
       "tailscale0" = {
-        allowedTCPPorts = [22 8080 8443];
+        allowedTCPPorts = [
+          22
+          8080
+          8443
+        ];
         allowedTCPPortRanges = [
           {
             from = 1714;
diff --git a/hosts/server/tailscale.nix b/hosts/server/tailscale.nix
index bd15ef8d4ecfddbc46c7e34e4234dc9a3019e5f9..c0185a177f7ff81831a9264b9cf0e2f844e965ed 100644
GIT binary patch
literal 1150
zcmV-^1cCbiM@dveQdv+`08~rA?a(pDCj|E@pJm6DBzN^OIMplW0zIELObP(m|HfkX
zXPFK7lH?eU_h5`2!P&$uZ5ERrGuH#7LqW*J>?<h#Z)6F(vJp_ixyAQ(!mI5Jz8=<Y
z9ZSkcE5yY$`mxl(641C{7t&^$8V0UC3$joCeiAxE9r`FtUsJs4{9-&8X<X+LJiYPj
za#(?3KlijQ<<wGvPnv#P)o8z^m0ZoKiZdsSxX3M|fxV4B7tRUqSGG&$9QkvynC!W!
z;51XB>(u}?2<J2k<H71luabxlXZ(WwN7~Uhk5XpVa>E}pFJXwzkwb1%$+3my4+OU$
z4Yg?^A;(!+=yN5yTw$O4X8x-TNu$axKES0?x`ewhwAnx<U&2jED(N9h=0E6rBcHaG
z?t<8O!$JoS(ROVKmaupgzg?z_Ht6pHuejb&qHvL$zZuzoSuL0~u8I4MGMs6=mi1OV
zcanE>C3JTOq}%_<LUau_^q8kYyYTrC9%)J-#sT-GN<koyt=5tuaiU%8`u&wNG}9c@
zaC~7`Q(PXj?!uX8I^1zjfMFn~m#Ushk%dskSS#tVAe_?@lWR1ayMU+r-ks>=i|eKV
zbzc`Z6|anH=sNOo+L2JwD+Aehq3?_PDBF53jK;BYX14DkFZFAuD?D;;k`~oTzsad9
zO+bxje73fJ$l>d9aWZ*ONr}c}pLw6CFxn{p&IiTMGmk*(xCysy@ROSnYgqM6wXyvi
zP>d>xaga5xL%P)h09}Y-H$Q*~=DcKps<4mNVR^(%hZkV9510enj<Q<nyG7}x)n9Ma
z2y%_MM$XE5%~Kfd0Nb0|;&oNcMP{2nxHdb#FDkb~Jj7T!GC@|*Q3%OU?d>$ivlL9D
zx+6aNvma*qDA@o*x^D5i9pqv&kiv-l_V%`zUTb?DgjE3Z{0?FjF~Cbq_Ce}(M1b_X
z`nv1k3Yx~lVjQC?HDcSLN;-N7+X$6ryfIy^*EThW4hA(CO@ecn<UF0M80#i1-|Su2
z%J!6!G4ZLzcBxz~j)(9`0)kZK4d5E78whedYf%JEax>TWS_Lg2(keKTH4oaXJHK+P
zjiUZnvXZ`C+^D2JrDcg1=^IKbIJ|h{UUOs^EVMI$sH0M81+I3<v9kk(T)QIC%7X{o
z{3#5lD2R{=Y8*8MApyNR<f5Mb(2L_8Kn!+PKM=r<8;hzdhlL4?i|0a{nkEhf!Ge4T
zmm&zG$(%NA))kRV()#D#aUpW(*k^0DO;3HP*0flO##jAPpb-yCg)@5;B)XoMmku+Z
zRG^G4a-M4kFUF^yI-ivGp5czd0kRwB<buUP3JvZxAfRpPEQd(`ADGrTn-;_l{_z+W
z5pWS{tXeb+DPaC4<9ZUb@F*FjZF0!Z8QzF*exdzj_t#16@#BwVbj!vO=wPLmw8wE2
zi#=kg6w@zpaXjz=G6Zm|zydqgsZp4+7$Zh8`xz!qxCINM??HlSBmA#YV;`vBDVh4f
QnZ;v|8T|h|SGDe*a3T{ni~s-t

literal 1090
zcmV-I1ikwJM@dveQdv+`04>h7mF`)KF!0IxXZ}SmTHN$)0zCynPSl9m)wDR$>aX3^
zV{d32dY(QTISx9Z2lo!7Uy&HcngNKrQIZO!uE<X~KD}qTSfd%RvsC3TRZ=D5G3NR$
z2}dPV8S7&t-JbGEi$@5n=7eYMJ9c}!Sei(@6Uu|~n!Z!G&OBJFmu=2+ZVV<La1FC8
zNoeJVu1{x|Cba!PP^mOf=@F(iAOdR$!uYHbnblqhmbx#P3qxHTRJj)29AoV}D6P7N
zw_^t&IQ%TtBe<susWUG2Ceet@TyajnyS_Hou%dYqbOs|d-(AH7YI0gEy1x}2ES0k|
zsTx5eJ}^)98fWKKDo->%KE$|S&_(_({pZfg$6kVy76`}IT-|Z4>s@zwcO^*uGo+R!
zRIXAF5Zl*a-&|aNb;5?cn8hf&04^3dbX5gTY<5deBC;@v_?1N_FlPzfp5My=BWJl5
zyHb{EKd#K_BgN>gOy2%?2(UBsW&;=@zbRT5)51VuaRR<6IO|g>?Hk<zt2HMIdRlkD
zaFHDJ^ErOLEa{?^Cn9VHHaO&_d+e>i`)~56Su0uo7t<9j1;JSz#h=3-Pn3MNaYI!r
zZNZFzfP)sL=fvAm79rVkcr3khkVG<i4i<>7qWpQq^&v~w*Tgfja@-&CCp6&4tktG(
zHYz1N2Wef^Ci&a&su2nj9S^zaGg<W~OjtlsNpaDl{_`^B^${wIH`1L#tWz1P!V$_&
zc1B>?2Fi633(AlE*4RyYcJwiV+8)4WxOz~0b9JF^svMiJ*J5Ot|4}&zRNHHy2-0dQ
zlOkvWsF3jOg7DCd%R_Nku@ihqN*c9cfFJ4b^kTIeSG-B(z>!OSTuF4lQfTJOm}0md
z`HhsIXoc6*n7+cOFL?!Vx#;U!I#+62KYdNi=H+`v69|ogkQr^m;I$eFyvU({Uusi9
zO(gfo-bkQ=O%z&s5K8%rBQh~D7RJJD3+?#|!0K^ElMF*GhMGqkIH<=vrL$h<_LmUb
ze)0UW;&U|uleQA09sqlE2TVD2?BtUPcvT8l-yfKfn2C+Jd-I6H0uUuU<l(I;;R|62
z#*t*U6HgcAJk2=C_^8Lm6V}!D2w}p5(lzYLGy#zrkE3<)U`}C7{-=$vw^J@I1h&XR
zS8V8nu5-@Fo;fHXaUhNXmup{%X2-X#zSk9$_~b|^`q8A->gB0tc?x~NL<oE!R9)pZ
zyLb&KPbqIR3swhNX%*`iRLD?*wpOXpCQY?&?sx`{0px`m(Po9zakl3;{X6ta8vuaL
z>7Okfw{-It8mBtnIObBe*8@g$s_uG!qzpOHm?f1gDI#yo7(H`s0F$keum3{(f)Dza
zKSB#_>+uQT3$Uq!2@$+3(4bNY(j98%UJT@+Xo2B`oni@H&Y$cqATBrrRHk|Nn21dZ
I9$yQ&tDQ*&h5!Hn

diff --git a/hosts/smaug/hardware-configuration.nix b/hosts/smaug/hardware-configuration.nix
index 7f6ef52..afc2b46 100644
--- a/hosts/smaug/hardware-configuration.nix
+++ b/hosts/smaug/hardware-configuration.nix
@@ -12,7 +12,13 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "uas" "sd_mod" "rtsx_pci_sdmmc"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "uas"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/vm/hardware-configuration.nix b/hosts/vm/hardware-configuration.nix
index 0d39708..0553f0b 100644
--- a/hosts/vm/hardware-configuration.nix
+++ b/hosts/vm/hardware-configuration.nix
@@ -12,7 +12,13 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/vm1/hardware-configuration.nix b/hosts/vm1/hardware-configuration.nix
index 0d39708..0553f0b 100644
--- a/hosts/vm1/hardware-configuration.nix
+++ b/hosts/vm1/hardware-configuration.nix
@@ -12,7 +12,13 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index aabf050..d38c9c5 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -19,10 +19,16 @@
 in {
   nix = {
     settings = {
-      experimental-features = ["nix-command" "flakes"];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
       warn-dirty = false;
       auto-optimise-store = true;
-      trusted-users = ["root" "don"];
+      trusted-users = [
+        "root"
+        "don"
+      ];
     };
     gc = {
       automatic = true;
@@ -89,7 +95,9 @@ in {
       enable = true;
     };
     kernel = {
-      sysctl = {"vm.swappiness" = 10;};
+      sysctl = {
+        "vm.swappiness" = 10;
+      };
     };
   };
 
@@ -233,7 +241,15 @@ in {
         isNormalUser = true;
         initialPassword = "changeme";
         description = "Don Harper";
-        extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
+        extraGroups = [
+          "networkmanager"
+          "wheel"
+          "scanner"
+          "lp"
+          "video"
+          "mlocate"
+          "disk"
+        ];
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
         ];
@@ -252,7 +268,6 @@ in {
   nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0"];
 
   environment.systemPackages = with pkgs; [
-    #(callPackage ../mypackages/kanshi-fix/default.nix {})
     python-with-my-packages
     acpi
     alejandra
@@ -315,7 +330,11 @@ in {
 
   nixpkgs.overlays = [
     (final: prev: {qutebrowser = prev.qutebrowser.override {enableWideVine = true;};})
-    (final: super: {khal = super.khal.overridePythonAttrs (_: {doCheck = false;});})
+    (final: super: {
+      khal = super.khal.overridePythonAttrs (_: {
+        doCheck = false;
+      });
+    })
   ];
 
   # Open ports in the firewall.
@@ -344,7 +363,11 @@ in {
     allowedTCPPorts = [22];
     interfaces = {
       "tailscale0" = {
-        allowedTCPPorts = [22 8080 8443];
+        allowedTCPPorts = [
+          22
+          8080
+          8443
+        ];
         allowedTCPPortRanges = [
           {
             from = 1714;
diff --git a/hosts/workstation/tailscale.nix b/hosts/workstation/tailscale.nix
index e4c1d206b4f19a09a6732854a999bdd015a1efc1..c95418725ded7d45b04a05267b0d508a0b6335d4 100644
GIT binary patch
literal 1155
zcmV-}1bq7dM@dveQdv+`03S~B6ivq}Z0_%hKo;D+?hFcH<F%NAdlak!nipR-g9>r8
zn7wO!`gjcbFEI|dJk>jt$)9R)DB7=!ZFPLqRrfrupuQjiJIVuMtdI~XC=<)Chwl~-
zZ*}owl6qV`MOJxV3ws)yrS>eQ8F@<3VI)+eFHHbnZOA=M7`MXy(x9jpjyGk{Z-~9R
zDVGM$Y&P`==G11N!C*-1u0i><JiHf&{7Dg({Y>lHAG@tPQuWU?fRfqlFEb3xe>1nE
zdT;Mrv7;^+I%ePQ8kj)IihJMkq9em*Z-}$jb_YLSxE(r!@Nu^N!haAWb2#)dQY=qu
zZ+}<GqwO_C#ve{%e%ljqK$-w^MYRrCy09t;bk*@)ma@UQ%(k0~NSe4pUGk|)Lvfz-
znfz2+Pf*aZa{<q?-QWWB%?*bL9(=OcGh~$ekfS^Eb-9B?{W5hJv~t{`!?~>ST`!*6
z_D-NjbtNJmv*y>|Bzxs0-PTWd6-lq6tgwXwlkL*6X&C^n=o$E1JZcfqWLmoxa5_m2
zVCQua6W<5mT+w=u!sv{r5vKwk<MphozdE0Bg3-v0iU?TuGCPR>7=WoRy@89$VsRyq
znVYrF;aUT{cmh?!Zmr8z_DLS{`RX32i6k|$jx$w97%YSga6sTD0Y;DSpQ$@|Zp-R4
zAryf<W`PG-9;2}Uc8-oe<5j&%SkzjPLbd8Rm(yGA6$CtRQrgLf9EOdn%k~RWXKM%W
z-Oyb^t<1e~+hKAj=4q38w}sO;A1CIE*mt8Dc3`NlU^{h19a4c~Y26W+=(WTTnTSYp
z!_A!aTyo9T6&PY)Fw-**!Ukt}(w~Bg3q6g%_9R68TlUh+b)bqUE|;*+d|=C*O9_Nb
zQQwbBs30)KO@+fW9bP=)(S;mJ>uOKv!MzgL>|ExS-mF_B-tQQyZuM#u{3dwKx3S!;
z0bF)lC=Mk|o~31Q<W@6#{4gzw245SBWO>e=Jj6$N+_V9){~(shC<YzDa2i%c@57>G
zy;Sh`(0p&byw4kOXdE0+_F1ph#APa+#l>CyAG}Xs&^$EP5zbDs-+Ws3QgEl;1m#<e
zKRSSp5pSUqzo^<M8o;ZYK5+e*bm^_<%UAFbZ&)Ef7!t~D)Esu>1vFua&^g!U6Fa=4
zN|oHCqbQdrF|;`1So9~44|qm$d6H@L2l~z4#(g7Rwc$T*QuG3_brR#>^}nTn+0anD
zIl(59^*gj72uoO}>6Snh*hr~Tvq_SuIe9E0RbvcUzXSx(&tY;dZ>CFouf*nl6K}nT
zCn6D3NX&)7kceizR$8<Q{%`(9)fhy1adfJP;Ts_v(e}1rv*}rtFF$B#QFQ7_%>Jj4
z*YKSnZPv8QYZsL;@ZA)0JyF5Sx<Jkd82grAljh}+7uE!L>UGm+s<8VXmfg1oQR8mN
z3&fSp6e3I9H%mjEzmiY~AwIWwA#U&JlxE?0bD5<pV;lE2DD!xTYFH#Vy7tTuo$x+!
VnEjC0e_i=gp4t)rDSyEZCN@avI}`u_

literal 1095
zcmV-N1i1SEM@dveQdv+`0I&?w`}nfEN%UNsDz3~n*ipYaoUJB=>9PM6x7fI~tJT8@
z-Q$EA{b@p?zQL33!_BQ4n-|oTDKk7qa^I_%lS(JJ<5MoY^wssHPXTEcP{X|Xn8Qn4
zF|4iUdU`|gqAv*^gCq&_-GJnJNw_;X4>p1UCOq@WL9bn+XGRoAwq+D|Kw389zsESE
zbR#07=Gfl*(Rou(_`DZ=MM>QbrQ3|KUoVbd#?}PIgtAoIYUK7kxCqB7f?wRpA(Xkw
z<?*0oN{ZvUNMzpNvQrOGTrXmMgAj)zHFoq@reQk{H=z^K8s)rdlR&P?G`aHZrp;s`
ziG9<sE)H*41Hz({UApAUQR|dPZ<Swtrzb_wd|$tFux+$1JA;{`%?6SK-N5;U;DB#k
zkX5qiI#R-{lMn%al}+=$QxB+ga!#%HPYzH6SGwpdE!lDVf9utCKDd)<I*7Hg8OlI&
zoZo`xB3kZ-*IY<M?s5g>yg0z1BZ6A`Nd2XBD;`roU9;ILC^mmx9mS+esCQdVys?oA
zJ0gOL20#m_L`}obWHH|+>Iq)ce-uxuaS09g#GJUVjihC?j1{3S8)kK13y36zB{=Ad
z8#LlaBSMDz8>Yuec$+GVSxv7ad8`s(DK_ARR=HVcZrN$+6dhtX+fM%>PBILs2D5A}
z0mJ1szN&LgcA)mOv<g26)=*yId%iP;kN$h&+!Va4H4lE=5^&r;tHbwzw+&%ntg!en
zK%Q>krgQm+Z>ZXBDFcBt$AP01aH`I8{+e>dxTu>jW_0%+^&1n7<gplN76tI=sCL$(
zP(Tv60pY`(3NY4X&cUa(#1Ev3KO<*PtAkJeC(q*dPa*v={wIf6YB!WMbpjW%hWRLu
z(W*Y7twISBI{trQJ@!}@Jb#3~HI#YZUb^8RcgcBodVa4(cWX5~6)#5FMIXA2!(3(^
zqh$O!djjqIk!b2HexN%rg$LHtk2~)xE~b%K66NuI32zeFc+D$n!_}>lNoN;Lp06lL
z7g5D&;HLGR#HttiW!>}+lsAaGhsc?s#m`@#Nj6d~nY<mh?A0HdJW51G&Qv>=QW=Xc
z%Tr*MLG1K9F_iUm>vJJrOQ6XS8NXh?46eIFQPjR}yv?`_x}%N|iDjbDZJRVwgQlZj
z1dl{76q-vOsOpcZB&6GOH`rnAW9tv?tn8J%dK^*TI&osR4zQ&gExr!rHd~*Gdg_F>
zr9cN>5T#vzkqi<R@_R7DciD2Hj=tgAEWA1{nI9MOXZ4s`9`$dfFI4lVdoxWaP5|zF
zt*qtT-42M}p(h+`Zo$+$BPIn;b+R@q$C>k6P2@Xb@C_T0gm48v9!X;dU@LAQIDgI#
z1M&?8(2A!e9HUo-nJ=X9BRJOH0L4xgR%hZW#<2hF@knlO1}Gj7f$Z$yO>*dvSqjoN
NB8j-ES1<a^44Uet7OVgO

diff --git a/hosts/www2/hardware-configuration.nix b/hosts/www2/hardware-configuration.nix
index 6e2bc2f..c2b5489 100644
--- a/hosts/www2/hardware-configuration.nix
+++ b/hosts/www2/hardware-configuration.nix
@@ -12,7 +12,15 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "ums_realtek" "sd_mod" "sr_mod"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "ums_realtek"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = ["dm-snapshot"];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
diff --git a/pkgs/.keepme b/pkgs/.keepme
new file mode 100644
index 0000000..e69de29
diff --git a/pkgs/kanshi-fix/99-kanshi-fix.rules b/pkgs/kanshi-fix/99-kanshi-fix.rules
deleted file mode 100644
index 8d17ad0..0000000
--- a/pkgs/kanshi-fix/99-kanshi-fix.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="card0", SUBSYSTEM=="drm", RUN+="$(pkgs.kanshi-fix}/bin/kanshi-fix"
-
diff --git a/pkgs/kanshi-fix/default.nix b/pkgs/kanshi-fix/default.nix
deleted file mode 100644
index dfb7691..0000000
--- a/pkgs/kanshi-fix/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{pkgs ? import <nixpkgs> {}}:
-pkgs.callPackage ./derivation.nix {}
diff --git a/pkgs/kanshi-fix/derivation.nix b/pkgs/kanshi-fix/derivation.nix
deleted file mode 100644
index f4c7422..0000000
--- a/pkgs/kanshi-fix/derivation.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv}:
-stdenv.mkDerivation rec {
-  name = "kanshi-fix-${version}";
-  version = "1.4";
-
-  src = ./.;
-
-  nativeBuildInputs = [];
-  buildInputs = [];
-
-  dontConfigure = true;
-  buildPhase = ''
-    chmod 0755 kanshi-fix
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp kanshi-fix $out/bin
-  '';
-}
diff --git a/pkgs/kanshi-fix/kanshi-fix b/pkgs/kanshi-fix/kanshi-fix
deleted file mode 100755
index d321ca1..0000000
--- a/pkgs/kanshi-fix/kanshi-fix
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-export SWAYSOCK=/run/user/1000/sway-ipc.1000.$(pgrep -x sway).sock
-export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1000/bus"
-swaymsg "output * dpms on"