flake update: nixpkgs 2023-02-01 -> 2023-02-09; nixpkgs-stable; sops-nix

``` • Updated input 'nixpkgs': 'path:/nix/store/8azr0ivnzf0y1sh2r7alxaxab3w49ggx-source/nixpatches?lastModified=1&narHash=sha256-rkVbviFmYYmbbVfvFRtOM95IjETbNu3I517Hrxp8EF4=' (1970-01-01) → 'path:/nix/store/3w6b87rfvnyg622z2dzhn7596wyyr4sr-source/nixpatches?lastModified=1&narHash=sha256-9oyw0fWhtUs%2fCV9QS8RgSwc2QgmvYecMlYVcdChbMxo=' (1970-01-01) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db' (2023-02-01) → 'github:nixos/nixpkgs/724bfc0892363087709bd3a5a1666296759154b1' (2023-02-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/a81ce6c961480b3b93498507074000c589bd9d60' (2023-02-01) → 'github:Mic92/sops-nix/8fec29b009c19538e68d5d814ec74e04f662fbd1' (2023-02-08) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/a3a1400571e3b9ccc270c2e8d36194cf05aab6ce' (2023-02-01) → 'github:NixOS/nixpkgs/e32c33811815ca4a535a16faf1c83eeb4493145b' (2023-02-05) ```
nit: remove trailing space
2023-02-12 08:54:02 +00:00 · 2023-02-05 19:35:34 +00:00 · 2023-02-05 19:34:32 +00:00 · 2023-02-05 07:18:20 +00:00 · 2023-02-04 10:00:10 +00:00 · 2023-02-04 00:50:47 +00:00
17 changed files with 556 additions and 533 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -39,22 +39,22 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=",
-        "path": "/nix/store/jblp2g67p3wid2qarcyd8bzrbs9wg5lb-source/nixpatches",
+        "narHash": "sha256-FTUAvxSeQToawyfVP9/S2143D5EgCbk88qI2PePLQQ8=",
+        "path": "/nix/store/s9v0l913m4drrddglbjqa384nxxwhxca-source/nixpatches",
        "type": "path"
      },
      "original": {
-        "path": "/nix/store/jblp2g67p3wid2qarcyd8bzrbs9wg5lb-source/nixpatches",
+        "path": "/nix/store/s9v0l913m4drrddglbjqa384nxxwhxca-source/nixpatches",
        "type": "path"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1674352297,
-        "narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=",
+        "lastModified": 1675556398,
+        "narHash": "sha256-5Gf5KlmFXfIGVQb2hmiiE7FQHoLd4UtEhIolLQvNB/A=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "918b760070bb8f48cb511300fcd7e02e13058a2e",
+        "rev": "e32c33811815ca4a535a16faf1c83eeb4493145b",
        "type": "github"
      },
      "original": {
@@ -66,11 +66,11 @@
    },
    "nixpkgs-unpatched": {
      "locked": {
-        "lastModified": 1674641431,
-        "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
+        "lastModified": 1675942811,
+        "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
+        "rev": "724bfc0892363087709bd3a5a1666296759154b1",
        "type": "github"
      },
      "original": {
@@ -97,11 +97,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1674546403,
-        "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=",
+        "lastModified": 1675872570,
+        "narHash": "sha256-RPH3CeTv7ixC2WcYiKyhmIgoH/9tur4Kr+3Vg/pleQk=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c",
+        "rev": "8fec29b009c19538e68d5d814ec74e04f662fbd1",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -111,6 +111,8 @@
      #   - `nixos-rebuild --flake './#<host>' switch`
      imgs = builtins.mapAttrs (_: host-dfn: host-dfn.config.system.build.img) self.nixosConfigurations;

+      host-pkgs = builtins.mapAttrs (_: host-dfn: host-dfn.config.system.build.pkgs) self.nixosConfigurations;
+
      overlays = rec {
        default = pkgs;
        pkgs = import ./overlays/pkgs.nix;
--- a/hosts/by-name/moby/default.nix
+++ b/hosts/by-name/moby/default.nix
@@ -41,13 +41,6 @@
    ".config/pulse"  # persist pulseaudio volume
  ];

-  sane.programs."pkgs.plasma5Packages.konsole" = {
-    # more reliable terminal
-    # TODO: move to gui/phosh
-    package = pkgs.plasma5Packages.konsole;
-    enableFor.user.colin = true;
-  };
-
  sane.nixcache.enable = true;
  sane.persist.enable = true;
  sane.gui.phosh.enable = true;
--- a/hosts/common/home/firefox.nix
+++ b/hosts/common/home/firefox.nix
@@ -125,16 +125,17 @@ in
        # `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'`
        # browserpass-ce.package = addon "browserpass-ce" "browserpass@maximbaz.com" "sha256-sXgUBbRvMnRpeIW1MTkmTcoqtW/8RDXAkxAq1evFkpc=";
        browserpass-extension.package = localAddon pkgs.browserpass-extension;
-        bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-JOj5P7c2JTTReHCRZXm4BscaGr3i+9Y4Ey/y621x8PI=";
+        # TODO: build bypass-paywalls from source? it's mysteriously disappeared from the Mozilla store.
+        # bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-oUwdqdAwV3DezaTtOMx7A/s4lzIws+t2f08mwk+324k=";
        ether-metamask.package = addon "ether-metamask" "webextension@metamask.io" "sha256-G+MwJDOcsaxYSUXjahHJmkWnjLeQ0Wven8DU/lGeMzA=";
        i2p-in-private-browsing.package = addon "i2p-in-private-browsing" "i2ppb@eyedeekay.github.io" "sha256-dJcJ3jxeAeAkRvhODeIVrCflvX+S4E0wT/PyYzQBQWs=";
        sidebery.package = addon "sidebery" "{3c078156-979c-498b-8990-85f7987dd929}" "sha256-YONfK/rIjlsrTgRHIt3km07Q7KnpIW89Z9r92ZSCc6w=";
-        sponsorblock.package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-d2K3ufvurWnYVzqLbyR//MgejybkY9exitAf9RdLNRo=";
+        sponsorblock.package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-hRsvLaAsVm3dALsTrJqHTNgRFAQcU7XSaGhr5G6+mFs=";
        ublacklist.package = addon "ublacklist" "@ublacklist" "sha256-RqY5iHzbL2qizth7aguyOKWPyINXmrwOlf/OsfqAS48=";
        ublock-origin.package = addon "ublock-origin" "uBlock0@raymondhill.net" "sha256-a/ivUmY1P6teq9x0dt4CbgHt+3kBsEMMXlOfZ5Hx7cg=";

        browserpass-extension.enable = lib.mkDefault true;
-        bypass-paywalls-clean.enable = lib.mkDefault true;
+        # bypass-paywalls-clean.enable = lib.mkDefault true;
        ether-metamask.enable = lib.mkDefault true;
        i2p-in-private-browsing.enable = lib.mkDefault config.services.i2p.enable;
        sidebery.enable = lib.mkDefault true;
--- a/hosts/common/ids.nix
+++ b/hosts/common/ids.nix
@@ -1,3 +1,4 @@
+# TODO: migrate to nixpkgs `config.ids.uids`
 { ... }:

 {
@@ -35,7 +36,7 @@
  sane.ids.sshd.uid = 2001;  # 997
  sane.ids.sshd.gid = 2001;  # 997
  sane.ids.polkituser.gid = 2002;  # 998
-  sane.ids.systemd-coredump.gid = 2003;  # 996
+  # sane.ids.systemd-coredump.gid = 2003;  # 996  # 2023/02/12: upstream now specifies this as 151
  sane.ids.nscd.uid = 2004;
  sane.ids.nscd.gid = 2004;
  sane.ids.systemd-oom.uid = 2005;
--- a/hosts/common/persist.nix
+++ b/hosts/common/persist.nix
@@ -12,5 +12,7 @@
    "/var/lib/alsa"                # preserve output levels, default devices
    "/var/lib/colord"              # preserve color calibrations (?)
    "/var/lib/machines"            # maybe not needed, but would be painful to add a VM and forget.
+    "/var/lib/systemd/backlight"   # backlight brightness
+    "/var/lib/systemd/coredump"
  ];
 }
--- a/hosts/common/programs.nix
+++ b/hosts/common/programs.nix
@@ -181,8 +181,8 @@ let
      tdesktop  # broken on phosh
      tokodon
      vlc
-      # pleroma client (Electron). input is broken on phosh.
-      whalebird
+      # pleroma client (Electron). input is broken on phosh. TODO(2023/02/02): fix electron19 input (insecure)
+      # whalebird
      xdg-utils  # for xdg-open
      xterm  # broken on phosh
    ;
--- a/hosts/common/users.nix
+++ b/hosts/common/users.nix
@@ -89,8 +89,9 @@ in

      ".cache/nix"
      ".cache/nix-index"
-      ".cargo"
-      ".rustup"
+
+      # ".cargo"
+      # ".rustup"
    ];

    # convenience
--- a/hosts/instantiate.nix
+++ b/hosts/instantiate.nix
@@ -21,7 +21,7 @@
      # provide a `pkgs.cross.<pkg>` alias that consumers can use instead of `pkgs.<foo>`
      # to explicitly opt into non-emulated cross compilation for any specific package.
      # this is most beneficial for large packages with few pre-requisites -- like Linux.
-      cross = next.crossFrom."${localSystem}";
+      cross = prev.crossFrom."${localSystem}";
    })
  ];
 }
--- a/hosts/modules/gui/default.nix
+++ b/hosts/modules/gui/default.nix
@@ -12,24 +12,4 @@ in
    ./plasma-mobile.nix
    ./sway.nix
  ];
-
-  options = {
-    sane.gui.enable = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        enables config used by any GUI, like display management or select packages.
-        the user should prefer to interact with specific GUIs like `sane.gui.sway`
-        and let those modules auto-set this flag when necessary.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    sane.programs.guiApps.enableFor.user.colin = mkDefault true;
-
-    # preserve backlight brightness across power cycles
-    # see `man systemd-backlight`
-    sane.persist.sys.plaintext = [ "/var/lib/systemd/backlight" ];
-  };
 }
--- a/hosts/modules/gui/gnome.nix
+++ b/hosts/modules/gui/gnome.nix
@@ -13,7 +13,7 @@ in
  };

  config = mkIf cfg.enable {
-    sane.gui.enable = true;
+    sane.programs.guiApps.enableFor.user.colin = true;

    # start gnome/gdm on boot
    services.xserver.enable = true;
--- a/hosts/modules/gui/phosh.nix
+++ b/hosts/modules/gui/phosh.nix
@@ -20,9 +20,34 @@ in
    };
  };

-  config = mkIf cfg.enable (mkMerge [
+  config = mkMerge [
    {
-      sane.gui.enable = true;
+      sane.programs.phoshApps = {
+        package = null;
+        suggestedPrograms = [
+          "guiApps"
+          # TODO: see about removing gnome-bluetooth if the in-built gnome-settings bluetooth manager can work
+          "gnome.gnome-bluetooth"
+          "phosh-mobile-settings"
+          "plasma5Packages.konsole"  # more reliable terminal
+        ];
+      };
+    }
+    {
+      sane.programs = {
+        inherit (pkgs // {
+          "gnome.gnome-bluetooth" = pkgs.gnome.gnome-bluetooth;
+          "plasma5Packages.konsole" = pkgs.plasma5Packages.konsole;
+        })
+          phosh-mobile-settings
+          "plasma5Packages.konsole"
+          # "gnome.gnome-bluetooth"
+        ;
+      };
+    }
+
+    (mkIf cfg.enable {
+      sane.programs.phoshApps.enableFor.user.colin = true;

      # docs: https://github.com/NixOS/nixpkgs/blob/nixos-22.05/nixos/modules/services/x11/desktop-managers/phosh.nix
      services.xserver.desktopManager.phosh = {
@@ -76,16 +101,9 @@ in
          '';
        })
      ];
+    })

-      # TODO: refactor
-      sane.programs = {
-        phosh-mobile-settings.enableFor.user.colin = true;
-
-        # TODO: see about removing this if the in-built gnome-settings bluetooth manager can work
-        "gnome.gnome-bluetooth".enableFor.user.colin = true;
-      };
-    }
-    (mkIf cfg.useGreeter {
+    (mkIf (cfg.enable && cfg.useGreeter) {
      services.xserver.enable = true;
      # NB: setting defaultSession has the critical side-effect that it lets org.freedesktop.AccountsService
      # know that our user exists. this ensures lightdm succeeds when calling /org/freedesktop/AccountsServices ListCachedUsers
@@ -111,5 +129,5 @@ in

      systemd.services.phosh.wantedBy = lib.mkForce [];  # disable auto-start
    })
-  ]);
+  ];
 }
--- a/hosts/modules/gui/plasma-mobile.nix
+++ b/hosts/modules/gui/plasma-mobile.nix
@@ -13,7 +13,8 @@ in
  };

  config = mkIf cfg.enable {
-    sane.gui.enable = true;
+    sane.programs.guiApps.enableFor.user.colin = true;
+
    # start plasma-mobile on boot
    services.xserver.enable = true;
    services.xserver.desktopManager.plasma5.mobile.enable = true;
--- a/hosts/modules/gui/plasma.nix
+++ b/hosts/modules/gui/plasma.nix
@@ -13,7 +13,7 @@ in
  };

  config = mkIf cfg.enable {
-    sane.gui.enable = true;
+    sane.programs.guiApps.enableFor.user.colin = true;

    # start plasma on boot
    services.xserver.enable = true;
--- a/hosts/modules/gui/sway.nix
+++ b/hosts/modules/gui/sway.nix
@@ -120,524 +120,543 @@ in
      type = types.bool;
    };
  };
-  config = mkIf cfg.enable {
-    sane.gui.enable = true;
-
-    # swap in these lines to use SDDM instead of `services.greetd`.
-    # services.xserver.displayManager.sddm.enable = true;
-    # services.xserver.enable = true;
-    services.greetd = {
-      # greetd source/docs:
-      # - <https://git.sr.ht/~kennylevinsen/greetd>
-      enable = true;
-      settings = {
-        default_session = if cfg.useGreeter then greeter-session else greeterless-session;
+  config = mkMerge [
+    {
+      sane.programs.swayApps = {
+        package = null;
+        suggestedPrograms = [
+          "guiApps"
+          "swaylock"
+          "swayidle"
+          "wl-clipboard"
+          "mako"  # notification daemon
+          # # "pavucontrol"
+          "gnome.gnome-bluetooth"
+          "gnome.gnome-control-center"
+        ];
      };
-    };
-    # we need the greeter's command to be on our PATH
-    users.users.colin.packages = [ sway-launcher ];
+    }
+    {
+      sane.programs = {
+        inherit (pkgs // {
+          "gnome.gnome-bluetooth" = pkgs.gnome.gnome-bluetooth;
+          "gnome.gnome-control-center" = pkgs.gnome.gnome-control-center;
+        })
+          swaylock
+          swayidle
+          wl-clipboard
+          mako
+          "gnome.gnome-bluetooth"
+          "gnome.gnome-control-center"
+        ;
+      };
+    }

-    # some programs (e.g. fractal) **require** a "Secret Service Provider"
-    services.gnome.gnome-keyring.enable = true;
+    (mkIf cfg.enable {
+      sane.programs.swayApps.enableFor.user.colin = true;

-    # unlike other DEs, sway configures no audio stack
-    # administer with pw-cli, pw-mon, pw-top commands
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;  # ??
-      pulse.enable = true;
-    };
+      # swap in these lines to use SDDM instead of `services.greetd`.
+      # services.xserver.displayManager.sddm.enable = true;
+      # services.xserver.enable = true;
+      services.greetd = {
+        # greetd source/docs:
+        # - <https://git.sr.ht/~kennylevinsen/greetd>
+        enable = true;
+        settings = {
+          default_session = if cfg.useGreeter then greeter-session else greeterless-session;
+        };
+      };
+      # we need the greeter's command to be on our PATH
+      users.users.colin.packages = [ sway-launcher ];

-    networking.useDHCP = false;
-    networking.networkmanager.enable = true;
-    networking.wireless.enable = lib.mkForce false;
+      # some programs (e.g. fractal) **require** a "Secret Service Provider"
+      services.gnome.gnome-keyring.enable = true;

-    hardware.bluetooth.enable = true;
-    services.blueman.enable = true;
-    # gsd provides Rfkill, which is required for the bluetooth pane in gnome-control-center to work
-    services.gnome.gnome-settings-daemon.enable = true;
-    # start the components of gsd we need at login
-    systemd.user.targets."org.gnome.SettingsDaemon.Rfkill".wantedBy = [ "graphical-session.target" ];
-    # go ahead and `systemctl --user cat gnome-session-initialized.target`. i dare you.
-    # the only way i can figure out how to get Rfkill to actually load is to just disable all the shit it depends on.
-    # it doesn't actually seem to need ANY of them in the first place T_T
-    systemd.user.targets."gnome-session-initialized".enable = false;
-    # bluez can't connect to audio devices unless pipewire is running.
-    # a system service can't depend on a user service, so just launch it at graphical-session
-    systemd.user.services."pipewire".wantedBy = [ "graphical-session.target" ];
+      # unlike other DEs, sway configures no audio stack
+      # administer with pw-cli, pw-mon, pw-top commands
+      services.pipewire = {
+        enable = true;
+        alsa.enable = true;
+        alsa.support32Bit = true;  # ??
+        pulse.enable = true;
+      };

-    programs.sway = {
-      enable = true;
-      wrapperFeatures.gtk = true;
-    };
-    sane.user.fs.".config/sway/config" =
-      let
-        fuzzel = "${pkgs.fuzzel}/bin/fuzzel";
-        sed = "${pkgs.gnused}/bin/sed";
-        wtype = "${pkgs.wtype}/bin/wtype";
-        kitty = "${pkgs.kitty}/bin/kitty";
-        launcher-cmd = fuzzel;
-        terminal-cmd = kitty;
-        lock-cmd = "${pkgs.swaylock}/bin/swaylock --indicator-idle-visible --indicator-radius 100 --indicator-thickness 30";
-        vol-up-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --change-volume +5";
-        vol-down-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --change-volume -5";
-        mute-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --toggle-mute";
-        brightness-up-cmd = "${pkgs.brightnessctl}/bin/brightnessctl set +2%";
-        brightness-down-cmd = "${pkgs.brightnessctl}/bin/brightnessctl set 2%-";
-        screenshot-cmd = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
-        # "bookmarking"/snippets inspired by Luke Smith:
-        # - <https://www.youtube.com/watch?v=d_11QaTlf1I>
-        snip-file = ./snippets.txt;
-        # TODO: querying sops here breaks encapsulation
-        list-snips = "cat ${snip-file} ${config.sops.secrets.snippets.path}";
-        strip-comments = "${sed} 's/ #.*$//'";
-        snip-cmd = "${wtype} $(${list-snips} | ${fuzzel} -d -i -w 60 | ${strip-comments})";
-        # TODO: next splatmoji release should allow `-s none` to disable skin tones
-        emoji-cmd = "${pkgs.splatmoji}/bin/splatmoji -s medium-light type";
-      in sane-lib.fs.wantedText ''
-        ### default font
-        font pango:monospace 8
+      networking.useDHCP = false;
+      networking.networkmanager.enable = true;
+      networking.wireless.enable = lib.mkForce false;

-        ### pixel boundary between windows
-        default_border pixel 3
-        default_floating_border pixel 2
-        hide_edge_borders smart
+      hardware.bluetooth.enable = true;
+      services.blueman.enable = true;
+      # gsd provides Rfkill, which is required for the bluetooth pane in gnome-control-center to work
+      services.gnome.gnome-settings-daemon.enable = true;
+      # start the components of gsd we need at login
+      systemd.user.targets."org.gnome.SettingsDaemon.Rfkill".wantedBy = [ "graphical-session.target" ];
+      # go ahead and `systemctl --user cat gnome-session-initialized.target`. i dare you.
+      # the only way i can figure out how to get Rfkill to actually load is to just disable all the shit it depends on.
+      # it doesn't actually seem to need ANY of them in the first place T_T
+      systemd.user.targets."gnome-session-initialized".enable = false;
+      # bluez can't connect to audio devices unless pipewire is running.
+      # a system service can't depend on a user service, so just launch it at graphical-session
+      systemd.user.services."pipewire".wantedBy = [ "graphical-session.target" ];

-        ### defaults
-        focus_wrapping no
-        focus_follows_mouse yes
-        focus_on_window_activation smart
-        mouse_warping output
-        workspace_layout default
-        workspace_auto_back_and_forth no
+      programs.sway = {
+        enable = true;
+        wrapperFeatures.gtk = true;
+      };
+      sane.user.fs.".config/sway/config" =
+        let
+          fuzzel = "${pkgs.fuzzel}/bin/fuzzel";
+          sed = "${pkgs.gnused}/bin/sed";
+          wtype = "${pkgs.wtype}/bin/wtype";
+          kitty = "${pkgs.kitty}/bin/kitty";
+          launcher-cmd = fuzzel;
+          terminal-cmd = kitty;
+          lock-cmd = "${pkgs.swaylock}/bin/swaylock --indicator-idle-visible --indicator-radius 100 --indicator-thickness 30";
+          vol-up-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --change-volume +5";
+          vol-down-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --change-volume -5";
+          mute-cmd = "${pkgs.pulsemixer}/bin/pulsemixer --toggle-mute";
+          brightness-up-cmd = "${pkgs.brightnessctl}/bin/brightnessctl set +2%";
+          brightness-down-cmd = "${pkgs.brightnessctl}/bin/brightnessctl set 2%-";
+          screenshot-cmd = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
+          # "bookmarking"/snippets inspired by Luke Smith:
+          # - <https://www.youtube.com/watch?v=d_11QaTlf1I>
+          snip-file = ./snippets.txt;
+          # TODO: querying sops here breaks encapsulation
+          list-snips = "cat ${snip-file} ${config.sops.secrets.snippets.path}";
+          strip-comments = "${sed} 's/ #.*$//'";
+          snip-cmd = "${wtype} $(${list-snips} | ${fuzzel} -d -i -w 60 | ${strip-comments})";
+          # TODO: next splatmoji release should allow `-s none` to disable skin tones
+          emoji-cmd = "${pkgs.splatmoji}/bin/splatmoji -s medium-light type";
+        in sane-lib.fs.wantedText ''
+          ### default font
+          font pango:monospace 8

-        ### default colors (#border #background #text #indicator #childBorder)
-        client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
-        client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
-        client.unfocused #333333 #222222 #888888 #292d2e #222222
-        client.urgent #2f343a #900000 #ffffff #900000 #900000
-        client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
-        client.background #ffffff
+          ### pixel boundary between windows
+          default_border pixel 3
+          default_floating_border pixel 2
+          hide_edge_borders smart

-        ### key bindings
-        floating_modifier Mod1
-        ## media keys
-        bindsym XF86AudioRaiseVolume exec ${vol-up-cmd}
-        bindsym XF86AudioLowerVolume exec ${vol-down-cmd}
-        bindsym Mod1+Page_Up exec ${vol-up-cmd}
-        bindsym Mod1+Page_Down exec ${vol-down-cmd}
-        bindsym XF86AudioMute exec ${mute-cmd}
-        bindsym XF86MonBrightnessUp exec ${brightness-up-cmd}
-        bindsym XF86MonBrightnessDown exec ${brightness-down-cmd}
-        ## special functions
-        bindsym Mod1+Print exec ${screenshot-cmd}
-        bindsym Mod1+l exec ${lock-cmd}
-        bindsym Mod1+s exec ${snip-cmd}
-        bindsym Mod1+slash exec ${emoji-cmd}
-        bindsym Mod1+d exec ${launcher-cmd}
-        bindsym Mod1+Return exec ${terminal-cmd}
-        bindsym Mod1+Shift+q kill
-        bindsym Mod1+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
-        bindsym Mod1+Shift+c reload
-        ## layout
-        bindsym Mod1+b splith
-        bindsym Mod1+v splitv
-        bindsym Mod1+f fullscreen toggle
-        bindsym Mod1+a focus parent
-        bindsym Mod1+w layout tabbed
-        bindsym Mod1+e layout toggle split
-        bindsym Mod1+Shift+space floating toggle
-        bindsym Mod1+space focus mode_toggle
-        bindsym Mod1+r mode resize
-        ## movement
-        bindsym Mod1+Up focus up
-        bindsym Mod1+Down focus down
-        bindsym Mod1+Left focus left
-        bindsym Mod1+Right focus right
-        bindsym Mod1+Shift+Up move up
-        bindsym Mod1+Shift+Down move down
-        bindsym Mod1+Shift+Left move left
-        bindsym Mod1+Shift+Right move right
-        ## workspaces
-        bindsym Mod1+1 workspace number 1
-        bindsym Mod1+2 workspace number 2
-        bindsym Mod1+3 workspace number 3
-        bindsym Mod1+4 workspace number 4
-        bindsym Mod1+5 workspace number 5
-        bindsym Mod1+6 workspace number 6
-        bindsym Mod1+7 workspace number 7
-        bindsym Mod1+8 workspace number 8
-        bindsym Mod1+9 workspace number 9
-        bindsym Mod1+Shift+1 move container to workspace number 1
-        bindsym Mod1+Shift+2 move container to workspace number 2
-        bindsym Mod1+Shift+3 move container to workspace number 3
-        bindsym Mod1+Shift+4 move container to workspace number 4
-        bindsym Mod1+Shift+5 move container to workspace number 5
-        bindsym Mod1+Shift+6 move container to workspace number 6
-        bindsym Mod1+Shift+7 move container to workspace number 7
-        bindsym Mod1+Shift+8 move container to workspace number 8
-        bindsym Mod1+Shift+9 move container to workspace number 9
-        ## "scratchpad" = ??
-        bindsym Mod1+Shift+minus move scratchpad
-        bindsym Mod1+minus scratchpad show
+          ### defaults
+          focus_wrapping no
+          focus_follows_mouse yes
+          focus_on_window_activation smart
+          mouse_warping output
+          workspace_layout default
+          workspace_auto_back_and_forth no

-        ### defaults
-        mode "resize" {
-          bindsym Down resize grow height 10 px
-          bindsym Escape mode default
-          bindsym Left resize shrink width 10 px
-          bindsym Return mode default
-          bindsym Right resize grow width 10 px
-          bindsym Up resize shrink height 10 px
-          bindsym h resize shrink width 10 px
-          bindsym j resize grow height 10 px
-          bindsym k resize shrink height 10 px
-          bindsym l resize grow width 10 px
+          ### default colors (#border #background #text #indicator #childBorder)
+          client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
+          client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
+          client.unfocused #333333 #222222 #888888 #292d2e #222222
+          client.urgent #2f343a #900000 #ffffff #900000 #900000
+          client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
+          client.background #ffffff
+
+          ### key bindings
+          floating_modifier Mod1
+          ## media keys
+          bindsym XF86AudioRaiseVolume exec ${vol-up-cmd}
+          bindsym XF86AudioLowerVolume exec ${vol-down-cmd}
+          bindsym Mod1+Page_Up exec ${vol-up-cmd}
+          bindsym Mod1+Page_Down exec ${vol-down-cmd}
+          bindsym XF86AudioMute exec ${mute-cmd}
+          bindsym XF86MonBrightnessUp exec ${brightness-up-cmd}
+          bindsym XF86MonBrightnessDown exec ${brightness-down-cmd}
+          ## special functions
+          bindsym Mod1+Print exec ${screenshot-cmd}
+          bindsym Mod1+l exec ${lock-cmd}
+          bindsym Mod1+s exec ${snip-cmd}
+          bindsym Mod1+slash exec ${emoji-cmd}
+          bindsym Mod1+d exec ${launcher-cmd}
+          bindsym Mod1+Return exec ${terminal-cmd}
+          bindsym Mod1+Shift+q kill
+          bindsym Mod1+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+          bindsym Mod1+Shift+c reload
+          ## layout
+          bindsym Mod1+b splith
+          bindsym Mod1+v splitv
+          bindsym Mod1+f fullscreen toggle
+          bindsym Mod1+a focus parent
+          bindsym Mod1+w layout tabbed
+          bindsym Mod1+e layout toggle split
+          bindsym Mod1+Shift+space floating toggle
+          bindsym Mod1+space focus mode_toggle
+          bindsym Mod1+r mode resize
+          ## movement
+          bindsym Mod1+Up focus up
+          bindsym Mod1+Down focus down
+          bindsym Mod1+Left focus left
+          bindsym Mod1+Right focus right
+          bindsym Mod1+Shift+Up move up
+          bindsym Mod1+Shift+Down move down
+          bindsym Mod1+Shift+Left move left
+          bindsym Mod1+Shift+Right move right
+          ## workspaces
+          bindsym Mod1+1 workspace number 1
+          bindsym Mod1+2 workspace number 2
+          bindsym Mod1+3 workspace number 3
+          bindsym Mod1+4 workspace number 4
+          bindsym Mod1+5 workspace number 5
+          bindsym Mod1+6 workspace number 6
+          bindsym Mod1+7 workspace number 7
+          bindsym Mod1+8 workspace number 8
+          bindsym Mod1+9 workspace number 9
+          bindsym Mod1+Shift+1 move container to workspace number 1
+          bindsym Mod1+Shift+2 move container to workspace number 2
+          bindsym Mod1+Shift+3 move container to workspace number 3
+          bindsym Mod1+Shift+4 move container to workspace number 4
+          bindsym Mod1+Shift+5 move container to workspace number 5
+          bindsym Mod1+Shift+6 move container to workspace number 6
+          bindsym Mod1+Shift+7 move container to workspace number 7
+          bindsym Mod1+Shift+8 move container to workspace number 8
+          bindsym Mod1+Shift+9 move container to workspace number 9
+          ## "scratchpad" = ??
+          bindsym Mod1+Shift+minus move scratchpad
+          bindsym Mod1+minus scratchpad show
+
+          ### defaults
+          mode "resize" {
+            bindsym Down resize grow height 10 px
+            bindsym Escape mode default
+            bindsym Left resize shrink width 10 px
+            bindsym Return mode default
+            bindsym Right resize grow width 10 px
+            bindsym Up resize shrink height 10 px
+            bindsym h resize shrink width 10 px
+            bindsym j resize grow height 10 px
+            bindsym k resize shrink height 10 px
+            bindsym l resize grow width 10 px
+          }
+
+          ### lightly modified bars
+          bar {
+            # TODO: fonts was:
+            #   config.fonts.fontconfig.defaultFonts; (monospace ++ emoji)
+            font pango:Hack, Font Awesome 6 Free, Twitter Color Emoji 24.000000
+            mode dock
+            hidden_state hide
+            position top
+            status_command ${pkgs.i3status}/bin/i3status
+            swaybar_command ${pkgs.waybar}/bin/waybar
+            workspace_buttons yes
+            strip_workspace_numbers no
+            tray_output primary
+            colors {
+              background #000000
+              statusline #ffffff
+              separator #666666
+              #  #border #background #text
+              focused_workspace #4c7899 #285577 #ffffff
+              active_workspace #333333 #5f676a #ffffff
+              inactive_workspace #333333 #222222 #888888
+              urgent_workspace #2f343a #900000 #ffffff
+              binding_mode #2f343a #900000 #ffffff
+          }
+          }
+
+          ### displays
+          ## DESKTOP
+          output "Samsung Electric Company S22C300 0x00007F35" {
+          pos 0,0
+          res 1920x1080
+          }
+          output "Goldstar Company Ltd LG ULTRAWIDE 0x00004E94" {
+          pos 1920,0
+          res 3440x1440
+          }
+
+          ## LAPTOP
+          # sh/en TV
+          output "Pioneer Electronic Corporation VSX-524 0x00000101" {
+          pos 0,0
+          res 1920x1080
+          }
+          # internal display
+          output "Unknown 0x0637 0x00000000" {
+          pos 1920,0
+          res 1920x1080
+          }
+        '';
+
+      sane.user.fs.".config/waybar/config" = sane-lib.fs.wantedSymlinkTo waybar-config-text;
+
+      # style docs: https://github.com/Alexays/Waybar/wiki/Styling
+      sane.user.fs.".config/waybar/style.css" = sane-lib.fs.wantedText ''
+        * {
+          font-family: monospace;
        }

-        ### lightly modified bars
-        bar {
-          # TODO: fonts was:
-          #   config.fonts.fontconfig.defaultFonts; (monospace ++ emoji)
-          font pango:Hack, Font Awesome 6 Free, Twitter Color Emoji 24.000000
-          mode dock
-          hidden_state hide
-          position top
-          status_command ${pkgs.i3status}/bin/i3status
-          swaybar_command ${pkgs.waybar}/bin/waybar
-          workspace_buttons yes
-          strip_workspace_numbers no
-          tray_output primary
-          colors {
-            background #000000
-            statusline #ffffff
-            separator #666666
-            #  #border #background #text
-            focused_workspace #4c7899 #285577 #ffffff
-            active_workspace #333333 #5f676a #ffffff
-            inactive_workspace #333333 #222222 #888888
-            urgent_workspace #2f343a #900000 #ffffff
-            binding_mode #2f343a #900000 #ffffff
-        }
+        /* defaults below: https://github.com/Alexays/Waybar/blob/master/resources/style.css */
+        window#waybar {
+          background-color: rgba(43, 48, 59, 0.5);
+          border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+          color: #ffffff;
+          transition-property: background-color;
+          transition-duration: .5s;
        }

-        ### displays
-        ## DESKTOP
-        output "Samsung Electric Company S22C300 0x00007F35" {
-        pos 0,0
-        res 1920x1080
-        }
-        output "Goldstar Company Ltd LG ULTRAWIDE 0x00004E94" {
-        pos 1920,0
-        res 3440x1440
+        window#waybar.hidden {
+          opacity: 0.2;
        }

-        ## LAPTOP
-        # sh/en TV
-        output "Pioneer Electronic Corporation VSX-524 0x00000101" {
-        pos 0,0
-        res 1920x1080
+        /*
+        window#waybar.empty {
+          background-color: transparent;
        }
-        # internal display
-        output "Unknown 0x0637 0x00000000" {
-        pos 1920,0
-        res 1920x1080
+        window#waybar.solo {
+          background-color: #FFFFFF;
        }
-      '';
+        */

-    sane.user.fs.".config/waybar/config" = sane-lib.fs.wantedSymlinkTo waybar-config-text;
+        window#waybar.termite {
+          background-color: #3F3F3F;
+        }

-    # style docs: https://github.com/Alexays/Waybar/wiki/Styling
-    sane.user.fs.".config/waybar/style.css" = sane-lib.fs.wantedText ''
-      * {
-        font-family: monospace;
-      }
+        window#waybar.chromium {
+          background-color: #000000;
+          border: none;
+        }

-      /* defaults below: https://github.com/Alexays/Waybar/blob/master/resources/style.css */
-      window#waybar {
-        background-color: rgba(43, 48, 59, 0.5);
-        border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-        color: #ffffff;
-        transition-property: background-color;
-        transition-duration: .5s;
-      }
+        #workspaces button {
+          padding: 0 5px;
+          background-color: transparent;
+          color: #ffffff;
+          /* Use box-shadow instead of border so the text isn't offset */
+          box-shadow: inset 0 -3px transparent;
+          /* Avoid rounded borders under each workspace name */
+          border: none;
+          border-radius: 0;
+        }

-      window#waybar.hidden {
-        opacity: 0.2;
-      }
+        /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+        #workspaces button:hover {
+          background: rgba(0, 0, 0, 0.2);
+          box-shadow: inset 0 -3px #ffffff;
+        }

-      /*
-      window#waybar.empty {
-        background-color: transparent;
-      }
-      window#waybar.solo {
-        background-color: #FFFFFF;
-      }
-      */
+        #workspaces button.focused {
+          background-color: #64727D;
+          box-shadow: inset 0 -3px #ffffff;
+        }

-      window#waybar.termite {
-        background-color: #3F3F3F;
-      }
+        #workspaces button.urgent {
+          background-color: #eb4d4b;
+        }

-      window#waybar.chromium {
-        background-color: #000000;
-        border: none;
-      }
+        #mode {
+          background-color: #64727D;
+          border-bottom: 3px solid #ffffff;
+        }

-      #workspaces button {
-        padding: 0 5px;
-        background-color: transparent;
-        color: #ffffff;
-        /* Use box-shadow instead of border so the text isn't offset */
-        box-shadow: inset 0 -3px transparent;
-        /* Avoid rounded borders under each workspace name */
-        border: none;
-        border-radius: 0;
-      }
+        #clock,
+        #battery,
+        #cpu,
+        #memory,
+        #disk,
+        #temperature,
+        #backlight,
+        #network,
+        #pulseaudio,
+        #custom-media,
+        #tray,
+        #mode,
+        #idle_inhibitor,
+        #mpd {
+          padding: 0 10px;
+          color: #ffffff;
+        }

-      /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-      #workspaces button:hover {
-        background: rgba(0, 0, 0, 0.2);
-        box-shadow: inset 0 -3px #ffffff;
-      }
+        #window,
+        #workspaces {
+          margin: 0 4px;
+        }

-      #workspaces button.focused {
-        background-color: #64727D;
-        box-shadow: inset 0 -3px #ffffff;
-      }
+        /* If workspaces is the leftmost module, omit left margin */
+        .modules-left > widget:first-child > #workspaces {
+          margin-left: 0;
+        }

-      #workspaces button.urgent {
-        background-color: #eb4d4b;
-      }
+        /* If workspaces is the rightmost module, omit right margin */
+        .modules-right > widget:last-child > #workspaces {
+          margin-right: 0;
+        }

-      #mode {
-        background-color: #64727D;
-        border-bottom: 3px solid #ffffff;
-      }
+        #clock {
+          background-color: #64727D;
+        }

-      #clock,
-      #battery,
-      #cpu,
-      #memory,
-      #disk,
-      #temperature,
-      #backlight,
-      #network,
-      #pulseaudio,
-      #custom-media,
-      #tray,
-      #mode,
-      #idle_inhibitor,
-      #mpd {
-        padding: 0 10px;
-        color: #ffffff;
-      }
-
-      #window,
-      #workspaces {
-        margin: 0 4px;
-      }
-
-      /* If workspaces is the leftmost module, omit left margin */
-      .modules-left > widget:first-child > #workspaces {
-        margin-left: 0;
-      }
-
-      /* If workspaces is the rightmost module, omit right margin */
-      .modules-right > widget:last-child > #workspaces {
-        margin-right: 0;
-      }
-
-      #clock {
-        background-color: #64727D;
-      }
-
-      #battery {
-        background-color: #ffffff;
-        color: #000000;
-      }
-
-      #battery.charging, #battery.plugged {
-        color: #ffffff;
-        background-color: #26A65B;
-      }
-
-      @keyframes blink {
-        to {
+        #battery {
          background-color: #ffffff;
          color: #000000;
        }
-      }

-      #battery.critical:not(.charging) {
-        background-color: #f53c3c;
-        color: #ffffff;
-        animation-name: blink;
-        animation-duration: 0.5s;
-        animation-timing-function: linear;
-        animation-iteration-count: infinite;
-        animation-direction: alternate;
-      }
+        #battery.charging, #battery.plugged {
+          color: #ffffff;
+          background-color: #26A65B;
+        }

-      label:focus {
-        background-color: #000000;
-      }
+        @keyframes blink {
+          to {
+            background-color: #ffffff;
+            color: #000000;
+          }
+        }

-      #cpu {
-        background-color: #2ecc71;
-        color: #000000;
-      }
+        #battery.critical:not(.charging) {
+          background-color: #f53c3c;
+          color: #ffffff;
+          animation-name: blink;
+          animation-duration: 0.5s;
+          animation-timing-function: linear;
+          animation-iteration-count: infinite;
+          animation-direction: alternate;
+        }

-      #memory {
-        background-color: #9b59b6;
-      }
+        label:focus {
+          background-color: #000000;
+        }

-      #disk {
-        background-color: #964B00;
-      }
+        #cpu {
+          background-color: #2ecc71;
+          color: #000000;
+        }

-      #backlight {
-        background-color: #90b1b1;
-      }
+        #memory {
+          background-color: #9b59b6;
+        }

-      #network {
-        background-color: #2980b9;
-      }
+        #disk {
+          background-color: #964B00;
+        }

-      #network.disconnected {
-        background-color: #f53c3c;
-      }
+        #backlight {
+          background-color: #90b1b1;
+        }

-      #pulseaudio {
-        background-color: #f1c40f;
-        color: #000000;
-      }
+        #network {
+          background-color: #2980b9;
+        }

-      #pulseaudio.muted {
-        background-color: #90b1b1;
-        color: #2a5c45;
-      }
+        #network.disconnected {
+          background-color: #f53c3c;
+        }

-      #custom-media {
-        background-color: #66cc99;
-        color: #2a5c45;
-        min-width: 100px;
-      }
+        #pulseaudio {
+          background-color: #f1c40f;
+          color: #000000;
+        }

-      #custom-media.custom-spotify {
-        background-color: #66cc99;
-      }
+        #pulseaudio.muted {
+          background-color: #90b1b1;
+          color: #2a5c45;
+        }

-      #custom-media.custom-vlc {
-        background-color: #ffa000;
-      }
+        #custom-media {
+          background-color: #66cc99;
+          color: #2a5c45;
+          min-width: 100px;
+        }

-      #temperature {
-        background-color: #f0932b;
-      }
+        #custom-media.custom-spotify {
+          background-color: #66cc99;
+        }

-      #temperature.critical {
-        background-color: #eb4d4b;
-      }
+        #custom-media.custom-vlc {
+          background-color: #ffa000;
+        }

-      #tray {
-        background-color: #2980b9;
-      }
+        #temperature {
+          background-color: #f0932b;
+        }

-      #tray > .passive {
-        -gtk-icon-effect: dim;
-      }
+        #temperature.critical {
+          background-color: #eb4d4b;
+        }

-      #tray > .needs-attention {
-        -gtk-icon-effect: highlight;
-        background-color: #eb4d4b;
-      }
+        #tray {
+          background-color: #2980b9;
+        }

-      #idle_inhibitor {
-        background-color: #2d3436;
-      }
+        #tray > .passive {
+          -gtk-icon-effect: dim;
+        }

-      #idle_inhibitor.activated {
-        background-color: #ecf0f1;
-        color: #2d3436;
-      }
+        #tray > .needs-attention {
+          -gtk-icon-effect: highlight;
+          background-color: #eb4d4b;
+        }

-      #mpd {
-        background-color: #66cc99;
-        color: #2a5c45;
-      }
+        #idle_inhibitor {
+          background-color: #2d3436;
+        }

-      #mpd.disconnected {
-        background-color: #f53c3c;
-      }
+        #idle_inhibitor.activated {
+          background-color: #ecf0f1;
+          color: #2d3436;
+        }

-      #mpd.stopped {
-        background-color: #90b1b1;
-      }
+        #mpd {
+          background-color: #66cc99;
+          color: #2a5c45;
+        }

-      #mpd.paused {
-        background-color: #51a37a;
-      }
+        #mpd.disconnected {
+          background-color: #f53c3c;
+        }

-      #language {
-        background: #00b093;
-        color: #740864;
-        padding: 0 5px;
-        margin: 0 5px;
-        min-width: 16px;
-      }
+        #mpd.stopped {
+          background-color: #90b1b1;
+        }

-      #keyboard-state {
-        background: #97e1ad;
-        color: #000000;
-        padding: 0 0px;
-        margin: 0 5px;
-        min-width: 16px;
-      }
+        #mpd.paused {
+          background-color: #51a37a;
+        }

-      #keyboard-state > label {
-        padding: 0 5px;
-      }
+        #language {
+          background: #00b093;
+          color: #740864;
+          padding: 0 5px;
+          margin: 0 5px;
+          min-width: 16px;
+        }

-      #keyboard-state > label.locked {
-        background: rgba(0, 0, 0, 0.2);
-      }
-    '';
-    # style = ''
-    #   * {
-    #     border: none;
-    #     border-radius: 0;
-    #     font-family: Source Code Pro;
-    #   }
-    #   window#waybar {
-    #     background: #16191C;
-    #     color: #AAB2BF;
-    #   }
-    #   #workspaces button {
-    #     padding: 0 5px;
-    #   }
-    #   .custom-spotify {
-    #     padding: 0 10px;
-    #     margin: 0 4px;
-    #     background-color: #1DB954;
-    #     color: black;
-    #   }
-    # '';
+        #keyboard-state {
+          background: #97e1ad;
+          color: #000000;
+          padding: 0 0px;
+          margin: 0 5px;
+          min-width: 16px;
+        }

-    # TODO: refactor
-    sane.programs = {
-      swaylock.enableFor.user.colin = true;
-      swayidle.enableFor.user.colin = true;  # (unused)
-      wl-clipboard.enableFor.user.colin = true;
-      mako.enableFor.user.colin = true; # notification daemon
-      xdg-utils.enableFor.user.colin = true;  # for xdg-open
-      # user stuff
-      # pavucontrol
-      "sway-contrib.grimshot".enableFor.user.colin = true;
-      "gnome.gnome-bluetooth".enableFor.user.colin = true;
-      "gnome.gnome-control-center".enableFor.user.colin = true;
-    };
-  };
+        #keyboard-state > label {
+          padding: 0 5px;
+        }
+
+        #keyboard-state > label.locked {
+          background: rgba(0, 0, 0, 0.2);
+        }
+      '';
+      # style = ''
+      #   * {
+      #     border: none;
+      #     border-radius: 0;
+      #     font-family: Source Code Pro;
+      #   }
+      #   window#waybar {
+      #     background: #16191C;
+      #     color: #AAB2BF;
+      #   }
+      #   #workspaces button {
+      #     padding: 0 5px;
+      #   }
+      #   .custom-spotify {
+      #     padding: 0 10px;
+      #     margin: 0 4px;
+      #     background-color: #1DB954;
+      #     color: black;
+      #   }
+      # '';
+    })
+  ];
 }

--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -9,6 +9,7 @@ let
    mapAttrsToList
    mkDefault
    mkIf
+    mkMerge
    mkOption
    optional
    optionalAttrs
@@ -85,7 +86,12 @@ let
  });
  toPkgSpec = types.coercedTo types.package (p: { package = p; }) pkgSpec;

-  configs = mapAttrsToList (_name: p: {
+  configs = mapAttrsToList (name: p: {
+    assertions = map (sug: {
+      assertion = cfg ? "${sug}";
+      message = ''program "${sug}" referenced by "${name}", but not defined'';
+    }) p.suggestedPrograms;
+
    # conditionally add to system PATH
    environment.systemPackages = optional
      (p.package != null && p.enableFor.system)
@@ -112,10 +118,16 @@ in
  config =
    let
      take = f: {
+        assertions = f.assertions;
        environment.systemPackages = f.environment.systemPackages;
        users.users = f.users.users;
        sane.users = f.sane.users;
      };
-    in
-      take (sane-lib.mkTypedMerge take configs);
+    in mkMerge [
+      (take (sane-lib.mkTypedMerge take configs))
+      {
+        # expose the pkgs -- as available to the system -- as a build target.
+        system.build.pkgs = pkgs;
+      }
+    ];
 }
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -13,20 +13,13 @@
    hash = "sha256-IvsIcd2wPdz4b/7FMrDrcVlIZjFecCQ9uiL0Umprbx0=";
  })

-  # fix libreoffice build by: Revert "mdds: 2.0.3 -> 2.1.0"
-  # merged 2023/01/25
-  (fetchpatch {
-    url = "https://github.com/NixOS/nixpkgs/pull/212583.diff";
-    hash = "sha256-nkXgwQUtxYkJT2OzG6Jc72snizW5wHvR1nmh2KDnaPc=";
-  })
-
  # fix handbrake build by: handbrake: 1.5.1 -> 1.6.1
  # PR opened 2023/01/23
-  (fetchpatch {
-    # see alternate fix: <https://github.com/NixOS/nixpkgs/pull/211834>
-    url = "https://github.com/NixOS/nixpkgs/pull/212306.diff";
-    hash = "sha256-iQX2NaZaCzZVRlCM0pgXt0gecNwhXGeh3kXEiY38ZIM=";
-  })
+  # (fetchpatch {
+  #   # see alternate fix: <https://github.com/NixOS/nixpkgs/pull/211834>
+  #   url = "https://github.com/NixOS/nixpkgs/pull/212306.diff";
+  #   hash = "sha256-PnPzvJymafa+zjkauQW0LzFsJC7S+7D9JRszTE3in+w=";
+  # })

  ./2022-12-19-i2p-aarch64.patch
Author	SHA1	Message	Date
Colin	b048b47d54	flake update: nixpkgs 2023-02-01 -> 2023-02-09; nixpkgs-stable; sops-nix ``` • Updated input 'nixpkgs': 'path:/nix/store/8azr0ivnzf0y1sh2r7alxaxab3w49ggx-source/nixpatches?lastModified=1&narHash=sha256-rkVbviFmYYmbbVfvFRtOM95IjETbNu3I517Hrxp8EF4=' (1970-01-01) → 'path:/nix/store/3w6b87rfvnyg622z2dzhn7596wyyr4sr-source/nixpatches?lastModified=1&narHash=sha256-9oyw0fWhtUs%2fCV9QS8RgSwc2QgmvYecMlYVcdChbMxo=' (1970-01-01) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db' (2023-02-01) → 'github:nixos/nixpkgs/724bfc0892363087709bd3a5a1666296759154b1' (2023-02-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/a81ce6c961480b3b93498507074000c589bd9d60' (2023-02-01) → 'github:Mic92/sops-nix/8fec29b009c19538e68d5d814ec74e04f662fbd1' (2023-02-08) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/a3a1400571e3b9ccc270c2e8d36194cf05aab6ce' (2023-02-01) → 'github:NixOS/nixpkgs/e32c33811815ca4a535a16faf1c83eeb4493145b' (2023-02-05) ```	2023-02-12 08:54:02 +00:00
Colin	bcfd8e1725	nit: remove trailing space	2023-02-05 19:35:34 +00:00
Colin	e0a6f8ea4a	flake: add `host-pkgs.<host>.<pkg>` output this builds packages precisely as they are defined by the given host. significant for testing whether a cross-compiled host builds things correctly, for example.	2023-02-05 19:34:32 +00:00
Colin	80f3d0472b	handbrake patch: fix hash (updated upstream)	2023-02-05 07:18:20 +00:00
Colin	b6685c9e6c	refactor: move `konsole` from moby/default.nix -> gui/phosh.nix	2023-02-04 10:00:10 +00:00
Colin	0c2d8af448	remove sane.gui.enable option	2023-02-04 00:50:47 +00:00
Colin	7ce0c34f43	sway: specify dependent packages more idiomatically, and fix bug where phosh wasn't actually shipping its dependents	2023-02-04 00:43:00 +00:00
Colin	f2e8be3bd1	phosh: specify dependent packages more idiomatically	2023-02-03 22:55:39 +00:00
Colin	9b2e7b02cc	Merge branch 'staging/nixpkgs-2023-02-01'	2023-02-03 22:14:47 +00:00
Colin	1b3e0b95be	persist: remove rust/cargo	2023-02-03 18:18:10 +00:00
Colin	f78968c73a	persist /var/lib/systemd/coredump	2023-02-03 18:17:22 +00:00
Colin	d5d755a4b2	flake update: nixpkgs 2023-01-25 -> 2023-02-01; sops-nix ``` • Updated input 'nixpkgs': 'path:/nix/store/760ff23zl95q4jza8mkg47vs9ff20hq3-source/nixpatches?lastModified=1&narHash=sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=' (1970-01-01) → 'path:/nix/store/pr622dac2xv2fzxvkfdfzl3sba1m7xkm-source/nixpatches?lastModified=1&narHash=sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=' (1970-01-01) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/9b97ad7b4330aacda9b2343396eb3df8a853b4fc' (2023-01-25) → 'github:nixos/nixpkgs/4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db' (2023-02-01) • Updated input 'sops-nix': 'github:Mic92/sops-nix/b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c' (2023-01-24) → 'github:Mic92/sops-nix/a81ce6c961480b3b93498507074000c589bd9d60' (2023-02-01) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/918b760070bb8f48cb511300fcd7e02e13058a2e' (2023-01-22) → 'github:NixOS/nixpkgs/a3a1400571e3b9ccc270c2e8d36194cf05aab6ce' (2023-02-01) ```	2023-02-03 09:46:26 +00:00