From a8df20b4cb00271f66887df054d2f445b561d240 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Wed, 24 Sep 2025 13:39:24 -0500
Subject: [PATCH] formating

---
 flake.nix            | 232 +++++++++++++++++++++----------------------
 home/gui/default.nix |  65 ++++++------
 2 files changed, 146 insertions(+), 151 deletions(-)

diff --git a/flake.nix b/flake.nix
index db2c1e4..6ac9dc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,126 +38,118 @@
     nvf.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs @ {
-    self,
-    nixpkgs,
-    nix,
-    nixpkgs-stable,
-    nixos-hardware,
-    home-manager,
-    catppuccin,
-    colmena,
-    ...
-  }: let
-    inherit (self) outputs;
-    lib = nixpkgs.lib // home-manager.lib;
-  in {
-    inherit lib;
-    nixpkgs.config.allowUnfree = true;
-    config.allowUnfree = true;
-    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) ["widevine-cdm"];
-    colmena = {
-      meta = {
-        nixpkgs = import nixpkgs {system = "x86_64-linux";};
-        specialArgs = {inherit inputs outputs;};
+  outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware
+    , home-manager, catppuccin, colmena, ... }:
+    let
+      inherit (self) outputs;
+      lib = nixpkgs.lib // home-manager.lib;
+    in {
+      inherit lib;
+      nixpkgs.config.allowUnfree = true;
+      config.allowUnfree = true;
+      nixpkgs.config.allowUnfreePredicate = pkg:
+        builtins.elem (lib.getName pkg) [ "widevine-cdm" ];
+      colmena = {
+        meta = {
+          nixpkgs = import nixpkgs { system = "x86_64-linux"; };
+          specialArgs = { inherit inputs outputs; };
+        };
+        # ace = import ./hosts/ace/colmena.nix;          # Acer C720
+        book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
+        display = import ./hosts/display/colmena.nix; # Pi4
+        # eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC.
+        fred = import ./hosts/fred/colmena.nix; # acer server
+        loki = import ./hosts/loki/colmena.nix; # Dell XPS 13
+        # pi1 = import ./hosts/pi1/colmena.nix;
+        # pocket2 = import ./hosts/pocket2/colmena.nix;
+        smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260
+        w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS
+        # w2 = import ./hosts/w2/colmena.nix;
+      };
+
+      nixosConfigurations = {
+        # clients
+        ace = lib.nixosSystem {
+          modules = [ ./hosts/ace ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        dragon = lib.nixosSystem {
+          modules = [ ./hosts/dragon ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        book = lib.nixosSystem {
+          modules = [ ./hosts/book ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        loki = lib.nixosSystem {
+          modules = [ ./hosts/loki ];
+          specialArgs = { inherit inputs outputs; };
+        };
+
+        pocket2 = lib.nixosSystem {
+          modules = [ ./hosts/pocket2 ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        smaug = lib.nixosSystem {
+          modules = [ ./hosts/smaug ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        t2 = lib.nixosSystem {
+          modules = [ ./hosts/t2 ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        pi1 = lib.nixosSystem {
+          modules = [ ./hosts/pi1 ];
+          specialArgs = { inherit inputs outputs; };
+        };
+
+        # servers
+        display = lib.nixosSystem {
+          modules = [ ./hosts/display ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        fred = lib.nixosSystem {
+          modules = [ ./hosts/fred ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        vm = lib.nixosSystem {
+          modules = [
+            "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
+            "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+            ./hosts/vm
+          ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        harper2 = lib.nixosSystem {
+          modules = [ ./hosts/harper2 ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        harper = lib.nixosSystem {
+          modules = [ ./hosts/harper ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        nuwww = lib.nixosSystem {
+          modules = [ ./hosts/nuwww ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        pihole = lib.nixosSystem {
+          modules = [ ./hosts/pihole ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        www2 = lib.nixosSystem {
+          modules = [ ./hosts/www2 ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        w1 = lib.nixosSystem {
+          modules = [ ./hosts/w1 ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        # w2 = lib.nixosSystem {
+        #   modules = [./hosts/w2];
+        #   specialArgs = {
+        #     inherit inputs outputs;
+        #   };
+        # };
       };
-      # ace = import ./hosts/ace/colmena.nix;          # Acer C720
-      book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
-      display = import ./hosts/display/colmena.nix; # Pi4
-      # eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC.
-      fred = import ./hosts/fred/colmena.nix; # acer server
-      loki = import ./hosts/loki/colmena.nix; # Dell XPS 13
-      # pi1 = import ./hosts/pi1/colmena.nix;
-      # pocket2 = import ./hosts/pocket2/colmena.nix;
-      smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260
-      w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS
-      # w2 = import ./hosts/w2/colmena.nix;
     };
-
-    nixosConfigurations = {
-      # clients
-      ace = lib.nixosSystem {
-        modules = [./hosts/ace];
-        specialArgs = {inherit inputs outputs;};
-      };
-      dragon = lib.nixosSystem {
-        modules = [./hosts/dragon];
-        specialArgs = {inherit inputs outputs;};
-      };
-      book = lib.nixosSystem {
-        modules = [./hosts/book];
-        specialArgs = {inherit inputs outputs;};
-      };
-      loki = lib.nixosSystem {
-        modules = [./hosts/loki];
-        specialArgs = {inherit inputs outputs;};
-      };
-
-      pocket2 = lib.nixosSystem {
-        modules = [./hosts/pocket2];
-        specialArgs = {inherit inputs outputs;};
-      };
-      smaug = lib.nixosSystem {
-        modules = [./hosts/smaug];
-        specialArgs = {inherit inputs outputs;};
-      };
-      t2 = lib.nixosSystem {
-        modules = [./hosts/t2];
-        specialArgs = {inherit inputs outputs;};
-      };
-      pi1 = lib.nixosSystem {
-        modules = [./hosts/pi1];
-        specialArgs = {inherit inputs outputs;};
-      };
-
-      # servers
-      display = lib.nixosSystem {
-        modules = [./hosts/display];
-        specialArgs = {inherit inputs outputs;};
-      };
-      fred = lib.nixosSystem {
-        modules = [./hosts/fred];
-        specialArgs = {inherit inputs outputs;};
-      };
-      vm = lib.nixosSystem {
-        modules = [
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-          ./hosts/vm
-        ];
-        specialArgs = {inherit inputs outputs;};
-      };
-      harper2 = lib.nixosSystem {
-        modules = [./hosts/harper2];
-        specialArgs = {inherit inputs outputs;};
-      };
-      harper = lib.nixosSystem {
-        modules = [./hosts/harper];
-        specialArgs = {inherit inputs outputs;};
-      };
-      nuwww = lib.nixosSystem {
-        modules = [./hosts/nuwww];
-        specialArgs = {inherit inputs outputs;};
-      };
-      pihole = lib.nixosSystem {
-        modules = [./hosts/pihole];
-        specialArgs = {inherit inputs outputs;};
-      };
-      www2 = lib.nixosSystem {
-        modules = [./hosts/www2];
-        specialArgs = {inherit inputs outputs;};
-      };
-      w1 = lib.nixosSystem {
-        modules = [./hosts/w1];
-        specialArgs = {inherit inputs outputs;};
-      };
-      # w2 = lib.nixosSystem {
-      #   modules = [./hosts/w2];
-      #   specialArgs = {
-      #     inherit inputs outputs;
-      #   };
-      # };
-    };
-  };
 }
diff --git a/home/gui/default.nix b/home/gui/default.nix
index f0c2843..230dc14 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -1,8 +1,14 @@
-{ pkgs, inputs, config, lib, ... }:
-with lib;
-let cfg = config.roles.gui;
+{
+  pkgs,
+  inputs,
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.roles.gui;
 in {
-  options.roles.gui = { enable = mkEnableOption "roles gui"; };
+  options.roles.gui = {enable = mkEnableOption "roles gui";};
   config = mkIf cfg.enable {
     home-manager.users.don = {
       imports = [
@@ -17,10 +23,10 @@ in {
         ./sway.nix
         ./terminals.nix
       ];
-      fonts = { fontconfig = { enable = true; }; };
+      fonts = {fontconfig = {enable = true;};};
       nixpkgs.overlays = [
         (final: prev: {
-          qutebrowser = prev.qutebrowser.override { enableWideVine = true; };
+          qutebrowser = prev.qutebrowser.override {enableWideVine = true;};
         })
       ];
       home.packages = with pkgs; [
@@ -31,7 +37,7 @@ in {
         inputs.bzmenu.packages.${pkgs.system}.default
         at-spi2-core
         blueberry
-        calibre
+        # calibre  # FIXME - TODO - Failing to build 2025.09.23
         clipman
         darktable
         # element-desktop
@@ -75,32 +81,29 @@ in {
         mimeApps = {
           enable = true;
           associations.added = {
-            "application/octet-stream" = [ "nvim-qt.desktop" ];
+            "application/octet-stream" = ["nvim-qt.desktop"];
             "application/pdf" = [
               "org.pwmt.zathura-pdf-mupdf.desktop;qpdfview.desktop;org.gnome.Evince.desktop"
             ];
-            "image/jpeg" = [ "imv.desktop;darktable.desktop;gimp.desktop" ];
-            "image/png" = [ "imv.desktop;darktable.desktop;gimp.desktop" ];
-            "image/x-adobe-dng" = [ "imv.desktop" ];
-            "inode/directory" = [ "thunar.desktop" ];
-            "text/plain" = [ "nvim-qt.desktop" ];
+            "image/jpeg" = ["imv.desktop;darktable.desktop;gimp.desktop"];
+            "image/png" = ["imv.desktop;darktable.desktop;gimp.desktop"];
+            "image/x-adobe-dng" = ["imv.desktop"];
+            "inode/directory" = ["thunar.desktop"];
+            "text/plain" = ["nvim-qt.desktop"];
             "x-scheme-handler/pdf" = [
               "org.pwmt.zathura-pdf-mupdf.desktop;qpdfview.desktop;org.gnome.Evince.desktop"
             ];
           };
           defaultApplications = {
-            "inode/directory" = [ "thunar.desktop" ];
-            "text/html" = [ "org.qutebrowser.qutebrowser.desktop" ];
-            "x-scheme-handler/about" =
-              [ "org.qutebrowser.qutebrowser.desktop" ];
-            "x-scheme-handler/http" = [ "org.qutebrowser.qutebrowser.desktop" ];
-            "x-scheme-handler/https" =
-              [ "org.qutebrowser.qutebrowser.desktop" ];
-            "x-scheme-handler/pdf" = [ "myweb.desktop" ];
-            "x-scheme-handler/unknown" =
-              [ "org.qutebrowser.qutebrowser.desktop" ];
-            "application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
-            "x-scheme-handler/mailto" = [ "neomutt.desktop" ];
+            "inode/directory" = ["thunar.desktop"];
+            "text/html" = ["org.qutebrowser.qutebrowser.desktop"];
+            "x-scheme-handler/about" = ["org.qutebrowser.qutebrowser.desktop"];
+            "x-scheme-handler/http" = ["org.qutebrowser.qutebrowser.desktop"];
+            "x-scheme-handler/https" = ["org.qutebrowser.qutebrowser.desktop"];
+            "x-scheme-handler/pdf" = ["myweb.desktop"];
+            "x-scheme-handler/unknown" = ["org.qutebrowser.qutebrowser.desktop"];
+            "application/pdf" = ["org.pwmt.zathura-pdf-mupdf.desktop"];
+            "x-scheme-handler/mailto" = ["neomutt.desktop"];
           };
         };
         desktopEntries = {
@@ -126,7 +129,7 @@ in {
             terminal = false;
             name = "myweb";
             exec = "/home/don/bin/myweb %u";
-            mimeType = [ "x-scheme-handler/pdf" ];
+            mimeType = ["x-scheme-handler/pdf"];
           };
           cooking-notebook = {
             type = "Application";
@@ -141,8 +144,8 @@ in {
             type = "Application";
             icon = "obsidian";
             comment = "Obsidian";
-            mimeType = [ "x-scheme-handler/obsidian" ];
-            categories = [ "Office" ];
+            mimeType = ["x-scheme-handler/obsidian"];
+            categories = ["Office"];
           };
           journal = {
             name = "Journal";
@@ -151,11 +154,11 @@ in {
             type = "Application";
             icon = "obsidian";
             comment = "Obsidian Journal";
-            mimeType = [ "x-scheme-handler/obsidian" ];
-            categories = [ "Office" ];
+            mimeType = ["x-scheme-handler/obsidian"];
+            categories = ["Office"];
           };
         };
-        configFile = { "shikane/config.toml".source = files/shikane.toml; };
+        configFile = {"shikane/config.toml".source = files/shikane.toml;};
       };
     };
   };