spotlight/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Run nixpkgs-fmt

Browse source
This commit is contained in:
Spotlight 2023-09-17 09:38:02 -05:00
parent fbc1f9235f
commit aed1e3f2bf
Signed by: spotlight
GPG key ID: 874AA355B3209BDC
7 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -20,7 +20,8 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
}; };
in { in
{
packages = { packages = {
# We currently assume that all x86_64-linux devices only # We currently assume that all x86_64-linux devices only
# require dotfiles. For now, this is mostly true :) # 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;
};
}; };
} }

2
home/editor.nix
View file

@ -34,4 +34,4 @@
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
''; '';
}; };
} }

2
home/gpg.nix
View file

@ -12,7 +12,7 @@
# password-store # password-store
programs.password-store = { programs.password-store = {
enable = true; enable = true;
package = pkgs.pass.withExtensions (exts: [exts.pass-otp]); package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
settings = { settings = {
PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
}; };

23
home/home.nix
View file

@ -8,25 +8,28 @@ let
# Whether to configure various programs to leverage GPG. # Whether to configure various programs to leverage GPG.
gpg = specialArgs.gpg or false; gpg = specialArgs.gpg or false;
in { in
{
# It's standard convention that Darwin has the username # It's standard convention that Darwin has the username
# "spot" - "spotlight" was reserved by the system at some point. # "spot" - "spotlight" was reserved by the system at some point.
# (Sigh... the downsides of sharing a namesake.) # (Sigh... the downsides of sharing a namesake.)
home.username = if pkgs.stdenv.isDarwin then home.username =
"spot" if pkgs.stdenv.isDarwin then
else "spot"
"spotlight"; else
"spotlight";
home.homeDirectory = if pkgs.stdenv.isDarwin then home.homeDirectory =
"/Users/spot" if pkgs.stdenv.isDarwin then
else "/Users/spot"
"/home/spotlight"; else
"/home/spotlight";
# Git # Git
programs.git = { programs.git = {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
userName = "Spotlight"; userName = "Spotlight";
userEmail = "spotlight@joscomputing.space"; userEmail = "spotlight@joscomputing.space";
extraConfig = { extraConfig = {

5
home/prompt.nix
View file

@ -9,7 +9,8 @@ let
rev = "6554045b1184b213fdc9d731a45e8a75858291de"; rev = "6554045b1184b213fdc9d731a45e8a75858291de";
sha256 = "yhgowvJfxVdJE1yVYPWnJYvzhMsPc+HgkmDa++CcTDo="; sha256 = "yhgowvJfxVdJE1yVYPWnJYvzhMsPc+HgkmDa++CcTDo=";
}; };
in { in
{
# Very opinionated :) # Very opinionated :)
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@ -62,4 +63,4 @@ in {
# We'd like to have the iTerm2 shell integration utilities in ~/.iterm2. # We'd like to have the iTerm2 shell integration utilities in ~/.iterm2.
home.file.".iterm2".source = "${iterm2_shell_integration}/utilities"; home.file.".iterm2".source = "${iterm2_shell_integration}/utilities";
} }

4
pkgs/default.nix
View file

@ -1,5 +1,5 @@
self: super: self: super:
{ {
monaco-powerline = super.callPackage ./monaco-powerline/default.nix {}; monaco-powerline = super.callPackage ./monaco-powerline/default.nix { };
swiftformat = super.callPackage ./swiftformat.nix {}; swiftformat = super.callPackage ./swiftformat.nix { };
} }

2
pkgs/swiftformat.nix
View file

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.bdesham ]; maintainers = [ maintainers.bdesham ];
platforms = with lib.platforms; linux ++ darwin; platforms = with lib.platforms; linux ++ darwin;
hydraPlatforms = []; hydraPlatforms = [ ];
}; };
} }