Run nixpkgs-fmt
This commit is contained in:
parent
fbc1f9235f
commit
aed1e3f2bf
7 changed files with 30 additions and 18 deletions
10
flake.nix
10
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;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -34,4 +34,4 @@
|
|||
let g:airline_powerline_fonts = 1
|
||||
'';
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
};
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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 { };
|
||||
}
|
||||
|
|
|
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
maintainers = [ maintainers.bdesham ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
hydraPlatforms = [];
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue