Add some packages, format with nixpkgs-fmt

darwin/bootstrap.nix

@@ -4,9 +4,13 @@
 
   nix.binaryCaches = [
     "https://cache.nixos.org/"
+    "https://hydra.iohk.io"
+    "https://nix-community.cachix.org"
   ];
   nix.binaryCachePublicKeys = [
     "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+    "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
+    "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
   ];
   nix.trustedUsers = [
     "@admin"

darwin/default.nix

@@ -1,4 +1,4 @@
-{pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 {
   imports = [

darwin/homebrew.nix

@@ -37,6 +37,7 @@ in
     "homebrew/core"
     "homebrew/services"
     "nrlquaker/createzap"
+    "unisonweb/unison"
   ];
 
   # Prefer installing application from the Mac App Store
@@ -48,6 +49,7 @@ in
   # If an app isn't available in the Mac App Store, or the version in the App Store has
   # limitiations, e.g., Transmit, install the Homebrew Cask.
   homebrew.casks = [
+    "aerial"
     "alfred"
     "discord"
     "element"
@@ -59,6 +61,7 @@ in
     "rectangle"
     "signal"
     "steam"
+    "unison-language"
     "vscodium"
   ];
 
@@ -68,5 +71,5 @@ in
 
   # For cli packages that aren't currently available for macOS in `nixpkgs`.Packages should be
   # installed in `../home/default.nix` whenever possible.
-  homebrew.brews = [];
+  homebrew.brews = [ ];
 }

default.nix

@@ -1,10 +1,14 @@
 # See https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
-(import (
+(import
+  (
     let
       lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  in fetchTarball {
+    in
+    fetchTarball {
       url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash; }
+      sha256 = lock.nodes.flake-compat.locked.narHash;
-) {
+    }
+  )
+  {
     src = ./.;
-}).defaultNix
+  }).defaultNix

home/default.nix

@@ -18,7 +18,7 @@
     # https://rycee.gitlab.io/home-manager/options.html#opt-programs.atuin.enable
     atuin = {
       enable = true;
-      settings = {};
+      settings = { };
     };
     # a nicer cat
     # https://rycee.gitlab.io/home-manager/options.html#opt-programs.bat.enable
@@ -100,7 +100,7 @@
     cachix # adding/managing alternative binary caches hosted by Cachix
     comma # run software from without installing it
     niv # easy dependency management for nix projects
-    nixfmt
+    nixpkgs-fmt
     nix-prefetch-git
     # nodePackages.node2nix
 

home/kitty.nix

@@ -19,7 +19,7 @@ let
     inactive_tab_background = "#${strong}";
   };
 in
-  # }}}
+# }}}
 {
   # Kitty terminal
   # https://sw.kovidgoyal.net/kitty/conf.html

home/shells.nix

@@ -130,7 +130,8 @@
   programs.fish.shellAliases =
     let
       nixConfigDir = "${config.home.homeDirectory}/dotfiles.nix";
-  in with pkgs; {
+    in
+    with pkgs; {
       # My additions
       code = "codium";
       # OG

modules/darwin/security/pam.nix

@@ -20,7 +20,8 @@ let
     let
       file = "/etc/pam.d/sudo";
       option = "security.pam.enableSudoTouchIdAuth";
-  in ''
+    in
+    ''
       ${if isEnabled then ''
         # Enable sudo Touch ID authentication, if not already enabled
         if ! grep 'pam_tid.so' ${file} > /dev/null; then

modules/home/programs/kitty/extras.nix

@@ -7,7 +7,7 @@ let
   cfg = config.programs.kitty.extras;
 
   # Create a Kitty config string from a Nix set
-  setToKittyConfig = with generators; toKeyValue { mkKeyValue = mkKeyValueDefault {} " "; };
+  setToKittyConfig = with generators; toKeyValue { mkKeyValue = mkKeyValueDefault { } " "; };
 
   # Write a Nix set representing a kitty config into the Nix store
   writeKittyConfig = fileName: config: pkgs.writeTextDir "${fileName}" (setToKittyConfig config);
@@ -36,7 +36,8 @@ let
     ${term-background}/bin/term-background dark
   '';
 
-in {
+in
+{
 
   options.programs.kitty.extras = {
     colors = {
@@ -55,7 +56,7 @@ in {
 
       dark = mkOption {
         type = with types; attrsOf str;
-        default = {};
+        default = { };
         description = ''
           Kitty color settings for dark background colorscheme.
         '';
@@ -63,7 +64,7 @@ in {
 
       light = mkOption {
         type = with types; attrsOf str;
-        default = {};
+        default = { };
         description = ''
           Kitty color settings for light background colorscheme.
         '';
@@ -71,7 +72,7 @@ in {
 
       common = mkOption {
         type = with types; attrsOf str;
-        default = {};
+        default = { };
         description = ''
           Kitty color settings that the light and dark background colorschemes share.
         '';
@@ -109,7 +110,8 @@ in {
       term-background
     ];
 
-    programs.kitty.settings = optionalAttrs cfg.colors.enable (
+    programs.kitty.settings = optionalAttrs cfg.colors.enable
+      (
 
         cfg.colors.common // cfg.colors.${cfg.colors.default} // {
           allow_remote_control = "yes";

modules/home/programs/neovim/extras.nix

@@ -109,7 +109,7 @@ in
 
     luaPackages = mkOption {
       type = with types; listOf package;
-      default = [];
+      default = [ ];
       example = [ pkgs.luajitPackages.busted pkgs.luajitPackages.luafilesystem ];
       description = ''
         Lua packages to make available in Neovim Lua environment.
@@ -151,7 +151,8 @@ in
     '';
 
     programs.fish.interactiveShellInit = mkIf
-      (cfg.termBufferAutoChangeDir || cfg.nvrAliases.enable) shellConfig;
+      (cfg.termBufferAutoChangeDir || cfg.nvrAliases.enable)
+      shellConfig;
 
     programs.neovim.plugins = lib.singleton (
       pkgs.vimUtils.buildVimPluginFrom2Nix {

nixpkgs.nix

@@ -1,7 +1,6 @@
-{
+{ system ? builtins.currentSystem
-  system ? builtins.currentSystem,
+, config ? { }
-  config ? {},
+, overlays ? [ ]
-  overlays ? [],
+, ...
-  ...
 }@args:
-  import (import ./default.nix).inputs.nixpkgs-unstable args
+import (import ./default.nix).inputs.nixpkgs-unstable args