Format with alejandra

flake.nix

@@ -63,8 +63,8 @@
           extraModules = [./home/docker.nix ./home/aws.nix];
         };
         zinc = lib.mkHome {
-          profile = profiles.laptop;
           system = "aarch64-darwin";
+          profile = profiles.laptop;
         };
       };
     }
@@ -81,9 +81,7 @@
       #   `overrideDerivation`) so we filter out anything that isn't a derivation
       # - We also filter out any packages that aren't supported on the current
       #   platform.
-      packages = with pkgs; (lib.filterAttrs (_: v: (lib.isDerivation v
+      packages = with pkgs.lib; (filterAttrs (_: v: (isDerivation v && meta.availableOn platform v)) pkgs.mypkgs);
-        && lib.meta.availableOn platform v))
-      pkgs.mypkgs);
       formatter = pkgs.alejandra;
       # A devshell with useful utils
       devShells.default = pkgs.devshell.mkShell {

home/default.nix

@@ -1,6 +1,9 @@
-{ pkgs, lib, ... }:
+{
-
+  pkgs,
- let packages  = pkgs.callPackage ./packages.nix {};
+  lib,
+  ...
+}: let
+  packages = pkgs.callPackage ./packages.nix {};
 in {
   home.packages = packages.all;
   home.sessionVariables = {
@@ -74,8 +77,7 @@ in {
       enable = true;
       settings = {
         add_newline = false;
-        format =
+        format = "$username$hostname$shlvl$directory$git_branch$git_commit$git_state$git_metrics$git_status$hg_branch$docker_context$golang$kotlin$nodejs$python$rust$terraform$nix_shell$memory_usage$aws$gcloud$openstack$azure$env_var$crystal$custom$sudo$cmd_duration$line_break$jobs$status$shell$character";
-          "$username$hostname$shlvl$directory$git_branch$git_commit$git_state$git_metrics$git_status$hg_branch$docker_context$golang$kotlin$nodejs$python$rust$terraform$nix_shell$memory_usage$aws$gcloud$openstack$azure$env_var$crystal$custom$sudo$cmd_duration$line_break$jobs$status$shell$character";
         username.format = "[$user]($style) ";
         hostname.format = "[$hostname]($style) ";
         directory = {truncation_length = -1;};
@@ -101,6 +103,5 @@ in {
       includes = ["~/.ssh/config.local"];
       matchBlocks."*".user = "samw";
     };
-
   };
 }

home/git.nix

@@ -4,7 +4,8 @@
     userName = "Sam Willcocks";
     userEmail = "sam@wlcx.cc";
 
-    delta = { # Better diffs
+    delta = {
+      # Better diffs
       enable = true;
       options = {line-numbers = true;};
     };

home/macs.nix

@@ -1,12 +1,15 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   # Mac specific packages.
   # TODO: have this in a central packages place rather than here
   home.packages = with pkgs; [pngpaste mypkgs.qrclip];
   # Use secretive for SSH agent
   programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin {
     host = "*";
-    extraOptions."IdentityAgent" =
+    extraOptions."IdentityAgent" = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
-      "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
   };
   programs.zsh.initExtra = "eval $(/opt/homebrew/bin/brew shellenv)";
 }

home/packages.nix

@@ -20,5 +20,5 @@ with pkgs; rec {
   # development tools
   dev = [jq nixfmt gh glab hexyl];
 
-  all = (base ++ net ++ dev);
+  all = base ++ net ++ dev;
 }

home/vim-dev/default.nix

@@ -1,5 +1,9 @@
-{ pkgs, lib, system, ... }:
+{
-let
+  pkgs,
+  lib,
+  system,
+  ...
+}: let
   vim-vue-plugin = pkgs.vimUtils.buildVimPlugin {
     name = "vim-vue-plugin";
     src = pkgs.fetchFromGitHub {

home/vim.nix

@@ -1,6 +1,11 @@
 # This module sets up a "full" neovim install with plugins and unicorns. It
 # also makes neovim the default editor and aliases vim to nvim.
-{ pkgs, lib, strings, ... }: {
+{
+  pkgs,
+  lib,
+  strings,
+  ...
+}: {
   home.sessionVariables = {"EDITOR" = "nvim";};
   home.packages = with pkgs; [rnix-lsp ripgrep];
   programs.neovim = {

me.nix

@@ -8,4 +8,3 @@
     "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG97EFzrTE5jI0P5CP5/y/thCzGNHt74u2mpXpdrB25URrn3ABDJcbmO/tGtNR8uhM3n/kUpr6Ax27orjmIOQtA= boron-se-main@secretive.boron.local"
   ];
 }
-

pkgs/yubikey-manager/default.nix

@@ -1,5 +1,12 @@
-{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps }:
+{
-
+  python3Packages,
+  fetchFromGitHub,
+  lib,
+  yubikey-personalization,
+  libu2f-host,
+  libusb1,
+  procps,
+}:
 python3Packages.buildPythonPackage rec {
   pname = "yubikey-manager";
   version = "4.0.8";
@@ -24,22 +31,25 @@ python3Packages.buildPythonPackage rec {
 
   nativeBuildInputs = with python3Packages; [poetry-core];
 
-  propagatedBuildInputs =
+  propagatedBuildInputs = with python3Packages;
-    with python3Packages; [
+    [
       click
       cryptography
       pyscard
       pyusb
       six
       fido2
-    ] ++ [
+    ]
+    ++ [
       libu2f-host
       libusb1
       yubikey-personalization
     ];
 
   makeWrapperArgs = [
-    "--prefix" "LD_LIBRARY_PATH" ":"
+    "--prefix"
+    "LD_LIBRARY_PATH"
+    ":"
     (lib.makeLibraryPath [libu2f-host libusb1 yubikey-personalization])
   ];
 

pkgs/zbar/default.nix

@@ -1,30 +1,30 @@
-{ stdenv
+{
-, lib
+  stdenv,
-, fetchFromGitHub
+  lib,
-, imagemagickBig
+  fetchFromGitHub,
-, pkg-config
+  imagemagickBig,
-, libX11
+  pkg-config,
-, libv4l
+  libX11,
-, libiconv
+  libv4l,
-, qtbase ? null
+  libiconv,
-, darwin
+  qtbase ? null,
-, qtx11extras ? null
+  darwin,
-, wrapQtAppsHook ? null
+  qtx11extras ? null,
-, wrapGAppsHook
+  wrapQtAppsHook ? null,
-, gtk3
+  wrapGAppsHook,
-, xmlto
+  gtk3,
-, docbook_xsl
+  xmlto,
-, autoreconfHook
+  docbook_xsl,
-, dbus
+  autoreconfHook,
-, enableVideo ? stdenv.isLinux
+  dbus,
+  enableVideo ? stdenv.isLinux,
   # The implementation is buggy and produces an error like
   # Name Error (Connection ":1.4380" is not allowed to own the service "org.linuxtv.Zbar" due to security policies in the configuration file)
   # for every scanned code.
   # see https://github.com/mchehab/zbar/issues/104
-, enableDbus ? false
+  enableDbus ? false,
-, libintl
+  libintl,
 }:
-
 stdenv.mkDerivation rec {
   pname = "zbar";
   version = "0.23.90";
@@ -41,23 +41,31 @@ stdenv.mkDerivation rec {
   nativeBuildInputs =
     [pkg-config xmlto autoreconfHook docbook_xsl] ++ lib.optionals enableVideo [wrapQtAppsHook wrapGAppsHook];
 
-  buildInputs = [ imagemagickBig libX11 libintl ] ++ lib.optionals enableDbus [ dbus ]
+  buildInputs =
+    [imagemagickBig libX11 libintl]
+    ++ lib.optionals enableDbus [dbus]
     ++ lib.optionals enableVideo [libv4l gtk3 qtbase qtx11extras]
     ++ lib.optionals stdenv.isDarwin [libiconv darwin.apple_sdk.frameworks.Foundation];
 
   # Disable assertions which include -dev QtBase file paths.
   NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG";
 
-  configureFlags = [ "--without-python" ] ++ (if enableDbus then
+  configureFlags =
-    [ "--with-dbusconfdir=${placeholder "out"}/share" ]
+    ["--without-python"]
-  else
+    ++ (
-    [ "--without-dbus" ]) ++ (if enableVideo then
+      if enableDbus
-    [ "--with-gtk=gtk3" ]
+      then ["--with-dbusconfdir=${placeholder "out"}/share"]
+      else ["--without-dbus"]
+    )
+    ++ (
+      if enableVideo
+      then ["--with-gtk=gtk3"]
       else [
         "--disable-video"
         "--without-gtk"
         "--without-qt"
-  ]);
+      ]
+    );
 
   dontWrapQtApps = true;
   dontWrapGApps = true;