From aed1e3f2bf86dfc4a2cf585a167a8a366a1ebc52 Mon Sep 17 00:00:00 2001 From: Spotlight Date: Sun, 17 Sep 2023 09:38:02 -0500 Subject: [PATCH] Run nixpkgs-fmt --- flake.nix | 10 +++++++++- home/editor.nix | 2 +- home/gpg.nix | 2 +- home/home.nix | 23 +++++++++++++---------- home/prompt.nix | 5 +++-- pkgs/default.nix | 4 ++-- pkgs/swiftformat.nix | 2 +- 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index ddf4423..1fec44d 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,8 @@ pkgs = nixpkgs.legacyPackages.${system}; extraSpecialArgs = specialArgs; }; - in { + in + { packages = { # We currently assume that all x86_64-linux devices only # require dotfiles. For now, this is mostly true :) @@ -51,5 +52,12 @@ }; }; }; + + formatter = { + aarch64-darwin = nixpkgs.legacyPackages.x86_64-darwin.nixpkgs-fmt; + x86_64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixpkgs-fmt; + aarch64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; + x86_64-linux = nixpkgs.legacyPackages.aarch64-linux.nixpkgs-fmt; + }; }; } diff --git a/home/editor.nix b/home/editor.nix index 8d708a3..05a0678 100644 --- a/home/editor.nix +++ b/home/editor.nix @@ -34,4 +34,4 @@ let g:airline_powerline_fonts = 1 ''; }; -} \ No newline at end of file +} diff --git a/home/gpg.nix b/home/gpg.nix index bdd3278..10823b5 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -12,7 +12,7 @@ # password-store programs.password-store = { enable = true; - package = pkgs.pass.withExtensions (exts: [exts.pass-otp]); + package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]); settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; }; diff --git a/home/home.nix b/home/home.nix index f375ad9..74c52d3 100644 --- a/home/home.nix +++ b/home/home.nix @@ -8,25 +8,28 @@ let # Whether to configure various programs to leverage GPG. gpg = specialArgs.gpg or false; -in { +in +{ # It's standard convention that Darwin has the username # "spot" - "spotlight" was reserved by the system at some point. # (Sigh... the downsides of sharing a namesake.) - home.username = if pkgs.stdenv.isDarwin then - "spot" - else - "spotlight"; + home.username = + if pkgs.stdenv.isDarwin then + "spot" + else + "spotlight"; - home.homeDirectory = if pkgs.stdenv.isDarwin then - "/Users/spot" - else - "/home/spotlight"; + home.homeDirectory = + if pkgs.stdenv.isDarwin then + "/Users/spot" + else + "/home/spotlight"; # Git programs.git = { enable = true; lfs.enable = true; - + userName = "Spotlight"; userEmail = "spotlight@joscomputing.space"; extraConfig = { diff --git a/home/prompt.nix b/home/prompt.nix index 87aec7c..04961a6 100644 --- a/home/prompt.nix +++ b/home/prompt.nix @@ -9,7 +9,8 @@ let rev = "6554045b1184b213fdc9d731a45e8a75858291de"; sha256 = "yhgowvJfxVdJE1yVYPWnJYvzhMsPc+HgkmDa++CcTDo="; }; -in { +in +{ # Very opinionated :) programs.zsh = { enable = true; @@ -62,4 +63,4 @@ in { # We'd like to have the iTerm2 shell integration utilities in ~/.iterm2. home.file.".iterm2".source = "${iterm2_shell_integration}/utilities"; -} \ No newline at end of file +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 32ce3ef..e3403d7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,5 @@ self: super: { - monaco-powerline = super.callPackage ./monaco-powerline/default.nix {}; - swiftformat = super.callPackage ./swiftformat.nix {}; + monaco-powerline = super.callPackage ./monaco-powerline/default.nix { }; + swiftformat = super.callPackage ./swiftformat.nix { }; } diff --git a/pkgs/swiftformat.nix b/pkgs/swiftformat.nix index 9690684..10685b0 100644 --- a/pkgs/swiftformat.nix +++ b/pkgs/swiftformat.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.bdesham ]; platforms = with lib.platforms; linux ++ darwin; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; }