chore: reformat codebase

This commit is contained in:
Gabriel Arazas 2023-07-19 17:27:33 +08:00
parent 3c60989da4
commit 28faf41a1c
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
8 changed files with 175 additions and 174 deletions

View File

@ -2,7 +2,8 @@
{ {
sops.secrets = sops.secrets =
lib.getSecrets ./sops.yaml { lib.getSecrets ./sops.yaml
{
ssh-key = { }; ssh-key = { };
"borg/ssh-key" = { }; "borg/ssh-key" = { };
} // } //

View File

@ -1,307 +1,307 @@
{ {
asciidoctor = { asciidoctor = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0yblqlbix3is5ihiqrpbfazb44in7ichfkjzdbsqibp48paanpl3"; sha256 = "0yblqlbix3is5ihiqrpbfazb44in7ichfkjzdbsqibp48paanpl3";
type = "gem"; type = "gem";
}; };
version = "2.0.20"; version = "2.0.20";
}; };
asciidoctor-diagram = { asciidoctor-diagram = {
dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"]; dependencies = [ "asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0dln5m99ahgdbw7kncbg3lbq58qjcijjja1991nbkjmcsbmvadwj"; sha256 = "0dln5m99ahgdbw7kncbg3lbq58qjcijjja1991nbkjmcsbmvadwj";
type = "gem"; type = "gem";
}; };
version = "2.2.9"; version = "2.2.9";
}; };
asciidoctor-diagram-ditaamini = { asciidoctor-diagram-ditaamini = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "13h65bfbq7hc7z3kqn0m28w9c6ap7fikpjcvsdga6jg01slb4c56"; sha256 = "13h65bfbq7hc7z3kqn0m28w9c6ap7fikpjcvsdga6jg01slb4c56";
type = "gem"; type = "gem";
}; };
version = "1.0.3"; version = "1.0.3";
}; };
asciidoctor-diagram-plantuml = { asciidoctor-diagram-plantuml = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1firh66ig61ibailzvrmvnwn5n099v2wlzlfzpg0qilqs6nl9s9w"; sha256 = "1firh66ig61ibailzvrmvnwn5n099v2wlzlfzpg0qilqs6nl9s9w";
type = "gem"; type = "gem";
}; };
version = "1.2023.5"; version = "1.2023.5";
}; };
asciidoctor-foodogsquared-extensions = { asciidoctor-foodogsquared-extensions = {
dependencies = ["asciidoctor" "rugged"]; dependencies = [ "asciidoctor" "rugged" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "12qgr84flqm7dnbykw1cz87b62k6akc2z1y35qkb5jx1q8rrsn2c"; sha256 = "12qgr84flqm7dnbykw1cz87b62k6akc2z1y35qkb5jx1q8rrsn2c";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.0.1";
}; };
ast = { ast = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem"; type = "gem";
}; };
version = "2.4.2"; version = "2.4.2";
}; };
concurrent-ruby = { concurrent-ruby = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem"; type = "gem";
}; };
version = "1.2.2"; version = "1.2.2";
}; };
json = { json = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
type = "gem"; type = "gem";
}; };
version = "2.6.3"; version = "2.6.3";
}; };
language_server-protocol = { language_server-protocol = {
groups = ["default" "development" "lint"]; groups = [ "default" "development" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
type = "gem"; type = "gem";
}; };
version = "3.17.0.3"; version = "3.17.0.3";
}; };
open-uri-cached = { open-uri-cached = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "03v0if3jlvbclnd6jgjk94fbhf0h2fq1wxr0mbx7018sxzm0biwr"; sha256 = "03v0if3jlvbclnd6jgjk94fbhf0h2fq1wxr0mbx7018sxzm0biwr";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.0";
}; };
parallel = { parallel = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597";
type = "gem"; type = "gem";
}; };
version = "1.23.0"; version = "1.23.0";
}; };
parser = { parser = {
dependencies = ["ast" "racc"]; dependencies = [ "ast" "racc" ];
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h";
type = "gem"; type = "gem";
}; };
version = "3.2.2.3"; version = "3.2.2.3";
}; };
prettier_print = { prettier_print = {
groups = ["default" "development"]; groups = [ "default" "development" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1ybgks9862zmlx71zd4j20ky86fsrp6j6m0az4hzzb1zyaskha57"; sha256 = "1ybgks9862zmlx71zd4j20ky86fsrp6j6m0az4hzzb1zyaskha57";
type = "gem"; type = "gem";
}; };
version = "1.2.1"; version = "1.2.1";
}; };
racc = { racc = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
type = "gem"; type = "gem";
}; };
version = "1.7.1"; version = "1.7.1";
}; };
rainbow = { rainbow = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.1";
}; };
rake = { rake = {
groups = ["development"]; groups = [ "development" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem"; type = "gem";
}; };
version = "13.0.6"; version = "13.0.6";
}; };
regexp_parser = { regexp_parser = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3";
type = "gem"; type = "gem";
}; };
version = "2.8.1"; version = "2.8.1";
}; };
rexml = { rexml = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem"; type = "gem";
}; };
version = "3.2.5"; version = "3.2.5";
}; };
rouge = { rouge = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v";
type = "gem"; type = "gem";
}; };
version = "4.1.2"; version = "4.1.2";
}; };
rubocop = { rubocop = {
dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; dependencies = [ "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width" ];
groups = ["lint"]; groups = [ "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1vklabd0510isqhikx4bfx5qn9g8pyj8h9jxryayp2wj8mx4kg74"; sha256 = "1vklabd0510isqhikx4bfx5qn9g8pyj8h9jxryayp2wj8mx4kg74";
type = "gem"; type = "gem";
}; };
version = "1.54.1"; version = "1.54.1";
}; };
rubocop-ast = { rubocop-ast = {
dependencies = ["parser"]; dependencies = [ "parser" ];
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni";
type = "gem"; type = "gem";
}; };
version = "1.29.0"; version = "1.29.0";
}; };
ruby-lsp = { ruby-lsp = {
dependencies = ["language_server-protocol" "sorbet-runtime" "syntax_tree"]; dependencies = [ "language_server-protocol" "sorbet-runtime" "syntax_tree" ];
groups = ["development"]; groups = [ "development" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "03jx0157jpfrnww5ww6hnkprgzfv4m7ahiqzpjdjjrcb67jp5nh1"; sha256 = "03jx0157jpfrnww5ww6hnkprgzfv4m7ahiqzpjdjjrcb67jp5nh1";
type = "gem"; type = "gem";
}; };
version = "0.6.2"; version = "0.6.2";
}; };
ruby-progressbar = { ruby-progressbar = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
type = "gem"; type = "gem";
}; };
version = "1.13.0"; version = "1.13.0";
}; };
rugged = { rugged = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in";
type = "gem"; type = "gem";
}; };
version = "1.6.3"; version = "1.6.3";
}; };
slim = { slim = {
dependencies = ["temple" "tilt"]; dependencies = [ "temple" "tilt" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0np6jr8apbyvr20ylb6n4m27y4d4vkdm7h41qrf5mdxw00x5irjl"; sha256 = "0np6jr8apbyvr20ylb6n4m27y4d4vkdm7h41qrf5mdxw00x5irjl";
type = "gem"; type = "gem";
}; };
version = "5.1.1"; version = "5.1.1";
}; };
sorbet-runtime = { sorbet-runtime = {
groups = ["default" "development"]; groups = [ "default" "development" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1bwnc5shy8zi2lpza53qihdmaf45flj4w1qnpclv3ykjjyy7x3xf"; sha256 = "1bwnc5shy8zi2lpza53qihdmaf45flj4w1qnpclv3ykjjyy7x3xf";
type = "gem"; type = "gem";
}; };
version = "0.5.10908"; version = "0.5.10908";
}; };
syntax_tree = { syntax_tree = {
dependencies = ["prettier_print"]; dependencies = [ "prettier_print" ];
groups = ["default" "development"]; groups = [ "default" "development" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "162m5xhbiq315bncp49ziddws537dv09pqsgrzsrmhhsymhgy0zb"; sha256 = "162m5xhbiq315bncp49ziddws537dv09pqsgrzsrmhhsymhgy0zb";
type = "gem"; type = "gem";
}; };
version = "6.1.1"; version = "6.1.1";
}; };
temple = { temple = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "09p32vp94sa1mbr0if0adf02yzc4ns00lsmpwns2xbkncwpzrqm4"; sha256 = "09p32vp94sa1mbr0if0adf02yzc4ns00lsmpwns2xbkncwpzrqm4";
type = "gem"; type = "gem";
}; };
version = "0.10.2"; version = "0.10.2";
}; };
tilt = { tilt = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7";
type = "gem"; type = "gem";
}; };
version = "2.2.0"; version = "2.2.0";
}; };
unicode-display_width = { unicode-display_width = {
groups = ["default" "lint"]; groups = [ "default" "lint" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a";
type = "gem"; type = "gem";
}; };

View File

@ -1,6 +1,6 @@
{ lib { lib
# Import the private modules # Import the private modules
, isInternal ? false , isInternal ? false
}: }:
@ -23,5 +23,5 @@ let
./profiles/research.nix ./profiles/research.nix
]; ];
in in
modules modules
++ (lib.optionals isInternal privateModules) ++ (lib.optionals isInternal privateModules)

View File

@ -3,7 +3,7 @@
let let
cfg = config.services.distant; cfg = config.services.distant;
settingsFormat = pkgs.formats.toml {}; settingsFormat = pkgs.formats.toml { };
settingsFile = settingsFormat.generate "distant-settings-${config.home.username}" cfg.settings; settingsFile = settingsFormat.generate "distant-settings-${config.home.username}" cfg.settings;
hasCustomSocketPath = cfg.settings.manager.unix_socket != null; hasCustomSocketPath = cfg.settings.manager.unix_socket != null;

View File

@ -1,6 +1,6 @@
{ lib { lib
# Include the private modules. # Include the private modules.
, isInternal ? false , isInternal ? false
}: }:
@ -28,5 +28,5 @@ let
./tasks/multimedia-archive ./tasks/multimedia-archive
]; ];
in in
modules modules
++ (lib.optionals isInternal privateModules) ++ (lib.optionals isInternal privateModules)

View File

@ -1,5 +1,5 @@
{ buildFirefoxXpiAddon, fetchurl, lib, stdenv }: { buildFirefoxXpiAddon, fetchurl, lib, stdenv }:
{ {
"get-rss-feed-url" = buildFirefoxXpiAddon { "get-rss-feed-url" = buildFirefoxXpiAddon {
pname = "get-rss-feed-url"; pname = "get-rss-feed-url";
version = "2.2"; version = "2.2";
@ -83,4 +83,4 @@
platforms = platforms.all; platforms = platforms.all;
}; };
}; };
} }

View File

@ -35,7 +35,7 @@
, jackSupport ? true , jackSupport ? true
, jack2 , jack2
# Ruby support requires compiling mruby so we'll skip it for now. # Ruby support requires compiling mruby so we'll skip it for now.
, rubySupport ? false , rubySupport ? false
, ruby , ruby
, rake , rake