chore: reformat Nix files · hauleth.dev/dotfiles@2ee0eb6

+23 -21

flake.nix

··· 77 77 }: { 78 78 formatter = pkgs.alejandra; 79 79 80 - packages = (pkgs.callPackage ./pkgs {}) // { 81 - default = pkgs.writeScriptBin "activate" '' 82 - echo ========= System ========= 83 - ${pkgs.lib.getExe self'.packages.system} switch 84 - echo 85 - echo ========= Home ========= 86 - ${pkgs.lib.getExe self'.packages.home} switch 87 - ''; 88 - 89 - home = pkgs.writeScriptBin "activate-home" '' 90 - ${pkgs.lib.getExe inputs'.home-manager.packages.default} --flake "${self}" "$@" 91 - ''; 80 + packages = 81 + (pkgs.callPackage ./pkgs {}) 82 + // { 83 + default = pkgs.writeScriptBin "activate" '' 84 + echo ========= System ========= 85 + ${pkgs.lib.getExe self'.packages.system} switch 86 + echo 87 + echo ========= Home ========= 88 + ${pkgs.lib.getExe self'.packages.home} switch 89 + ''; 92 90 93 - system = let 94 - builder = 95 - if pkgs.stdenv.isDarwin 96 - then pkgs.lib.getExe' inputs'.darwin.packages.darwin-rebuild "darwin-rebuild" 97 - else pkgs.lib.getExe pkgs.nixos-rebuid; 98 - in 99 - pkgs.writeScriptBin "activate-system" '' 100 - ${builder} --flake "${self}" "$@" 91 + home = pkgs.writeScriptBin "activate-home" '' 92 + ${pkgs.lib.getExe inputs'.home-manager.packages.default} --flake "${self}" "$@" 101 93 ''; 102 - }; 94 + 95 + system = let 96 + builder = 97 + if pkgs.stdenv.isDarwin 98 + then pkgs.lib.getExe' inputs'.darwin.packages.darwin-rebuild "darwin-rebuild" 99 + else pkgs.lib.getExe pkgs.nixos-rebuid; 100 + in 101 + pkgs.writeScriptBin "activate-system" '' 102 + ${builder} --flake "${self}" "$@" 103 + ''; 104 + }; 103 105 104 106 devShells = let 105 107 globalShells = pkgs.callPackage ./dev_shells.nix {

+1 -4

hosts/niuniobook.nix

··· 1 - { 2 - inputs, 3 - ... 4 - }: { 1 + {inputs, ...}: { 5 2 type = "darwin"; 6 3 7 4 hostname = "NiunioBook";

+1 -1

modules/git.nix

··· 38 38 cargoHash = "sha256-Qw7ZHLWPgIKqCmjhHwJ4QEz/WQMxrR8eG3tAgAKN7v0="; 39 39 40 40 buildNoDefaultFeatures = true; 41 - buildFeatures = [ "github" ]; 41 + buildFeatures = ["github"]; 42 42 43 43 # attempts to run the program on .git in src which is not deterministic 44 44 doCheck = false;

+2 -2

modules/pijul.nix

··· 1 - { pkgs, ... }: { 2 - home.packages = [ pkgs.pijul ]; 1 + {pkgs, ...}: { 2 + home.packages = [pkgs.pijul]; 3 3 }

+7 -3

modules/swiftbar.nix

··· 1 - {pkgs, lib, ...}: { 1 + { 2 + pkgs, 3 + lib, 4 + ... 5 + }: { 2 6 # WIP 3 7 options.swiftbar = let 4 8 inherit (lib) mkOption types; ··· 15 19 type = types.string; 16 20 example = "1m"; 17 21 description = '' 18 - How often should SwiftBar run script in the background. 22 + How often should SwiftBar run script in the background. 19 23 ''; 20 24 }; 21 25 ··· 37 41 }; 38 42 }; 39 43 }; 40 - } 44 + }

+6 -1

modules/tools.nix

··· 1 - {pkgs, inputs, config, ...}: let 1 + { 2 + pkgs, 3 + inputs, 4 + config, 5 + ... 6 + }: let 2 7 pkgs-self = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}; 3 8 in { 4 9 home.packages = with pkgs; [

+6 -1

pkgs/default.nix

··· 1 - {callPackage, entr, ripgrep, writeShellApplication}: { 1 + { 2 + callPackage, 3 + entr, 4 + ripgrep, 5 + writeShellApplication, 6 + }: { 2 7 prr = callPackage ./prr.nix {}; 3 8 imbox = callPackage ./imbox.nix {}; 4 9 ubin-client = callPackage ./ubin-client.nix {};

+15 -8

pkgs/imbox.nix

··· 1 - { libressl, stdenv, fetchgit, lib, pkg-config }: stdenv.mkDerivation (self: { 2 - pname = "imbox"; 3 - version = "1.4"; 1 + { 2 + libressl, 3 + stdenv, 4 + fetchgit, 5 + lib, 6 + pkg-config, 7 + }: 8 + stdenv.mkDerivation (self: { 9 + pname = "imbox"; 10 + version = "1.4"; 4 11 5 - src = fetchgit { 12 + src = fetchgit { 6 13 url = "https://git.causal.agency/imbox"; 7 14 rev = self.version; 8 15 hash = "sha256-y5GCH3miimOWSCvS+Kh/nOpNrIEpcoc9p8jlQqYuh7Q="; 9 - }; 16 + }; 10 17 11 - nativeBuildInputs = [ pkg-config ]; 18 + nativeBuildInputs = [pkg-config]; 12 19 13 - buildInputs = [ libressl ]; 14 - }) 20 + buildInputs = [libressl]; 21 + })

+36 -29

pkgs/prr.nix

··· 1 - { stdenv, rustPlatform, openssl, darwin, fetchFromGitHub, lib, pkg-config }: 2 - 1 + { 2 + stdenv, 3 + rustPlatform, 4 + openssl, 5 + darwin, 6 + fetchFromGitHub, 7 + lib, 8 + pkg-config, 9 + }: 3 10 rustPlatform.buildRustPackage rec { 4 - pname = "prr"; 5 - version = "0.16.0"; 11 + pname = "prr"; 12 + version = "0.16.0"; 6 13 7 - nativeBuildInputs = [ 8 - pkg-config 9 - ]; 14 + nativeBuildInputs = [ 15 + pkg-config 16 + ]; 10 17 11 - buildInputs = 12 - [ 13 - openssl 14 - ] 15 - ++ lib.optional stdenv.isDarwin (with darwin.apple_sdk; [ 16 - frameworks.Security 17 - frameworks.SystemConfiguration 18 - ]); 18 + buildInputs = 19 + [ 20 + openssl 21 + ] 22 + ++ lib.optional stdenv.isDarwin (with darwin.apple_sdk; [ 23 + frameworks.Security 24 + frameworks.SystemConfiguration 25 + ]); 19 26 20 - src = fetchFromGitHub { 21 - owner = "danobi"; 22 - repo = pname; 23 - rev = "v${version}"; 24 - hash = lib.fakeHash; 25 - }; 27 + src = fetchFromGitHub { 28 + owner = "danobi"; 29 + repo = pname; 30 + rev = "v${version}"; 31 + hash = lib.fakeHash; 32 + }; 26 33 27 - cargoHash = lib.fakeHash; 34 + cargoHash = lib.fakeHash; 28 35 29 - meta = with lib; { 30 - description = "Mailing list style code reviews for GitHub"; 31 - homepage = "https://github.com/danobi/prr"; 32 - license = licenses.gpl2; 33 - maintainers = []; 34 - }; 35 - } 36 + meta = with lib; { 37 + description = "Mailing list style code reviews for GitHub"; 38 + homepage = "https://github.com/danobi/prr"; 39 + license = licenses.gpl2; 40 + maintainers = []; 41 + }; 42 + }

+5 -1

pkgs/ubin-client.nix

··· 1 - {writeShellApplication, curl}: writeShellApplication { 1 + { 2 + writeShellApplication, 3 + curl, 4 + }: 5 + writeShellApplication { 2 6 name = "ubin"; 3 7 4 8 runtimeInputs = [curl];

+1 -4

users/hauleth.nix

··· 1 - { 2 - inputs, 3 - ... 4 - }: { 1 + {inputs, ...}: { 5 2 username = "hauleth"; 6 3 7 4 home = inputs.home-manager.lib.homeManagerConfiguration {

Configure Feed

Configure Feed