diff --git a/docs/content/en-US/03-project-specific-setup/03-secrets-management/assets/attach-sops-prefix.nix b/docs/content/en-US/03-project-specific-setup/03-secrets-management/assets/attach-sops-prefix.nix index 956feffb..95588d8b 100644 --- a/docs/content/en-US/03-project-specific-setup/03-secrets-management/assets/attach-sops-prefix.nix +++ b/docs/content/en-US/03-project-specific-setup/03-secrets-management/assets/attach-sops-prefix.nix @@ -2,10 +2,11 @@ { sops.secrets = - lib.getSecrets ./sops.yaml { - ssh-key = { }; - "borg/ssh-key" = { }; - } // + lib.getSecrets ./sops.yaml + { + ssh-key = { }; + "borg/ssh-key" = { }; + } // (lib.getSecrets ./wireguard.yaml (lib.attachSopsPathPrefix "wireguard" { "private-key" = { diff --git a/docs/gemset.nix b/docs/gemset.nix index fb70e27d..541e984c 100644 --- a/docs/gemset.nix +++ b/docs/gemset.nix @@ -1,307 +1,307 @@ { asciidoctor = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0yblqlbix3is5ihiqrpbfazb44in7ichfkjzdbsqibp48paanpl3"; type = "gem"; }; version = "2.0.20"; }; asciidoctor-diagram = { - dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"]; - groups = ["default"]; - platforms = []; + dependencies = [ "asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0dln5m99ahgdbw7kncbg3lbq58qjcijjja1991nbkjmcsbmvadwj"; type = "gem"; }; version = "2.2.9"; }; asciidoctor-diagram-ditaamini = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "13h65bfbq7hc7z3kqn0m28w9c6ap7fikpjcvsdga6jg01slb4c56"; type = "gem"; }; version = "1.0.3"; }; asciidoctor-diagram-plantuml = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1firh66ig61ibailzvrmvnwn5n099v2wlzlfzpg0qilqs6nl9s9w"; type = "gem"; }; version = "1.2023.5"; }; asciidoctor-foodogsquared-extensions = { - dependencies = ["asciidoctor" "rugged"]; - groups = ["default"]; - platforms = []; + dependencies = [ "asciidoctor" "rugged" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "12qgr84flqm7dnbykw1cz87b62k6akc2z1y35qkb5jx1q8rrsn2c"; type = "gem"; }; version = "1.0.1"; }; ast = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; version = "2.4.2"; }; concurrent-ruby = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; version = "1.2.2"; }; json = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; version = "2.6.3"; }; language_server-protocol = { - groups = ["default" "development" "lint"]; - platforms = []; + groups = [ "default" "development" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; type = "gem"; }; version = "3.17.0.3"; }; open-uri-cached = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "03v0if3jlvbclnd6jgjk94fbhf0h2fq1wxr0mbx7018sxzm0biwr"; type = "gem"; }; version = "1.0.0"; }; parallel = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; version = "1.23.0"; }; parser = { - dependencies = ["ast" "racc"]; - groups = ["default" "lint"]; - platforms = []; + dependencies = [ "ast" "racc" ]; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; type = "gem"; }; version = "3.2.2.3"; }; prettier_print = { - groups = ["default" "development"]; - platforms = []; + groups = [ "default" "development" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1ybgks9862zmlx71zd4j20ky86fsrp6j6m0az4hzzb1zyaskha57"; type = "gem"; }; version = "1.2.1"; }; racc = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; type = "gem"; }; version = "1.7.1"; }; rainbow = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; version = "3.1.1"; }; rake = { - groups = ["development"]; - platforms = []; + groups = [ "development" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; version = "13.0.6"; }; regexp_parser = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; type = "gem"; }; version = "2.8.1"; }; rexml = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; version = "3.2.5"; }; rouge = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; type = "gem"; }; version = "4.1.2"; }; rubocop = { - dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["lint"]; - platforms = []; + dependencies = [ "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width" ]; + groups = [ "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1vklabd0510isqhikx4bfx5qn9g8pyj8h9jxryayp2wj8mx4kg74"; type = "gem"; }; version = "1.54.1"; }; rubocop-ast = { - dependencies = ["parser"]; - groups = ["default" "lint"]; - platforms = []; + dependencies = [ "parser" ]; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; type = "gem"; }; version = "1.29.0"; }; ruby-lsp = { - dependencies = ["language_server-protocol" "sorbet-runtime" "syntax_tree"]; - groups = ["development"]; - platforms = []; + dependencies = [ "language_server-protocol" "sorbet-runtime" "syntax_tree" ]; + groups = [ "development" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "03jx0157jpfrnww5ww6hnkprgzfv4m7ahiqzpjdjjrcb67jp5nh1"; type = "gem"; }; version = "0.6.2"; }; ruby-progressbar = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; version = "1.13.0"; }; rugged = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; type = "gem"; }; version = "1.6.3"; }; slim = { - dependencies = ["temple" "tilt"]; - groups = ["default"]; - platforms = []; + dependencies = [ "temple" "tilt" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0np6jr8apbyvr20ylb6n4m27y4d4vkdm7h41qrf5mdxw00x5irjl"; type = "gem"; }; version = "5.1.1"; }; sorbet-runtime = { - groups = ["default" "development"]; - platforms = []; + groups = [ "default" "development" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1bwnc5shy8zi2lpza53qihdmaf45flj4w1qnpclv3ykjjyy7x3xf"; type = "gem"; }; version = "0.5.10908"; }; syntax_tree = { - dependencies = ["prettier_print"]; - groups = ["default" "development"]; - platforms = []; + dependencies = [ "prettier_print" ]; + groups = [ "default" "development" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "162m5xhbiq315bncp49ziddws537dv09pqsgrzsrmhhsymhgy0zb"; type = "gem"; }; version = "6.1.1"; }; temple = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "09p32vp94sa1mbr0if0adf02yzc4ns00lsmpwns2xbkncwpzrqm4"; type = "gem"; }; version = "0.10.2"; }; tilt = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; version = "2.2.0"; }; unicode-display_width = { - groups = ["default" "lint"]; - platforms = []; + groups = [ "default" "lint" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; diff --git a/flake.nix b/flake.nix index 3fe40932..e68185bd 100644 --- a/flake.nix +++ b/flake.nix @@ -389,21 +389,21 @@ pkgs = import inputs."${nixpkgs-channel}" { inherit system overlays; }; format = metadata.format or "iso"; in - mkImage { - inherit format system pkgs extraArgs; - extraModules = [ - ({ lib, ... }: { - config = lib.mkMerge [ - { networking.hostName = lib.mkForce metadata.hostname or host; } + mkImage { + inherit format system pkgs extraArgs; + extraModules = [ + ({ lib, ... }: { + config = lib.mkMerge [ + { networking.hostName = lib.mkForce metadata.hostname or host; } - (lib.mkIf (metadata ? domain) - { networking.domain = lib.mkForce metadata.domain; }) - ]; - }) - hostSharedConfig - ./hosts/${host} - ]; - }) + (lib.mkIf (metadata ? domain) + { networking.domain = lib.mkForce metadata.domain; }) + ]; + }) + hostSharedConfig + ./hosts/${host} + ]; + }) images; # My several development shells for usual type of projects. This is much diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 7f1de8ae..874a3b41 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,6 +1,6 @@ { lib -# Import the private modules + # Import the private modules , isInternal ? false }: @@ -23,5 +23,5 @@ let ./profiles/research.nix ]; in - modules - ++ (lib.optionals isInternal privateModules) +modules +++ (lib.optionals isInternal privateModules) diff --git a/modules/home-manager/services/distant.nix b/modules/home-manager/services/distant.nix index a9e87718..138c2926 100644 --- a/modules/home-manager/services/distant.nix +++ b/modules/home-manager/services/distant.nix @@ -3,7 +3,7 @@ let cfg = config.services.distant; - settingsFormat = pkgs.formats.toml {}; + settingsFormat = pkgs.formats.toml { }; settingsFile = settingsFormat.generate "distant-settings-${config.home.username}" cfg.settings; hasCustomSocketPath = cfg.settings.manager.unix_socket != null; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 39145bbf..d425d228 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,6 +1,6 @@ { lib -# Include the private modules. + # Include the private modules. , isInternal ? false }: @@ -28,5 +28,5 @@ let ./tasks/multimedia-archive ]; in - modules - ++ (lib.optionals isInternal privateModules) +modules +++ (lib.optionals isInternal privateModules) diff --git a/pkgs/firefox-addons/default.nix b/pkgs/firefox-addons/default.nix index 3fe94ce0..09c63283 100644 --- a/pkgs/firefox-addons/default.nix +++ b/pkgs/firefox-addons/default.nix @@ -1,86 +1,86 @@ { buildFirefoxXpiAddon, fetchurl, lib, stdenv }: - { - "get-rss-feed-url" = buildFirefoxXpiAddon { - pname = "get-rss-feed-url"; - version = "2.2"; - addonId = "{15bdb1ce-fa9d-4a00-b859-66c214263ac0}"; - url = "https://addons.mozilla.org/firefox/downloads/file/3990496/get_rss_feed_url-2.2.xpi"; - sha256 = "c332726405c6e976b19fc41bfb3ce70fa4380aaf33f179f324b67cb6fc13b7d0"; - meta = with lib; +{ + "get-rss-feed-url" = buildFirefoxXpiAddon { + pname = "get-rss-feed-url"; + version = "2.2"; + addonId = "{15bdb1ce-fa9d-4a00-b859-66c214263ac0}"; + url = "https://addons.mozilla.org/firefox/downloads/file/3990496/get_rss_feed_url-2.2.xpi"; + sha256 = "c332726405c6e976b19fc41bfb3ce70fa4380aaf33f179f324b67cb6fc13b7d0"; + meta = with lib; { homepage = "https://github.com/shevabam/get-rss-feed-url-extension"; description = "Retrieve RSS feeds URLs from a WebSite. Now in Firefox!"; license = licenses.mit; platforms = platforms.all; - }; }; - "regretsreporter" = buildFirefoxXpiAddon { - pname = "regretsreporter"; - version = "2.1.2"; - addonId = "regrets-reporter@mozillafoundation.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4049907/regretsreporter-2.1.2.xpi"; - sha256 = "6916bcba2c479b209510509aca304f35cf68bafbdde852511a98e501c99e77e0"; - meta = with lib; + }; + "regretsreporter" = buildFirefoxXpiAddon { + pname = "regretsreporter"; + version = "2.1.2"; + addonId = "regrets-reporter@mozillafoundation.org"; + url = "https://addons.mozilla.org/firefox/downloads/file/4049907/regretsreporter-2.1.2.xpi"; + sha256 = "6916bcba2c479b209510509aca304f35cf68bafbdde852511a98e501c99e77e0"; + meta = with lib; { homepage = "https://foundation.mozilla.org/regrets-reporter"; description = "The RegretsReporter browser extension, built by the nonprofit Mozilla, helps you take control of your YouTube recommendations."; license = licenses.mpl20; platforms = platforms.all; - }; }; - "simple-translate" = buildFirefoxXpiAddon { - pname = "simple-translate"; - version = "2.8.1"; - addonId = "simple-translate@sienori"; - url = "https://addons.mozilla.org/firefox/downloads/file/4072586/simple_translate-2.8.1.xpi"; - sha256 = "23f1953d588d5d9943ab43845407b84a51bbcc1824b8c010ed56caa119711a27"; - meta = with lib; + }; + "simple-translate" = buildFirefoxXpiAddon { + pname = "simple-translate"; + version = "2.8.1"; + addonId = "simple-translate@sienori"; + url = "https://addons.mozilla.org/firefox/downloads/file/4072586/simple_translate-2.8.1.xpi"; + sha256 = "23f1953d588d5d9943ab43845407b84a51bbcc1824b8c010ed56caa119711a27"; + meta = with lib; { homepage = "https://simple-translate.sienori.com"; description = "Quickly translate selected or typed text on web pages. Supports Google Translate and DeepL API."; license = licenses.mpl20; platforms = platforms.all; - }; }; - "tineye-reverse-image-search" = buildFirefoxXpiAddon { - pname = "tineye-reverse-image-search"; - version = "2.0.4"; - addonId = "tineye@ideeinc.com"; - url = "https://addons.mozilla.org/firefox/downloads/file/4074627/tineye_reverse_image_search-2.0.4.xpi"; - sha256 = "cece89c89f4480c6b69336b43c0dd2970058f2658e6cfd0160d05ba3c0cfc1b0"; - meta = with lib; + }; + "tineye-reverse-image-search" = buildFirefoxXpiAddon { + pname = "tineye-reverse-image-search"; + version = "2.0.4"; + addonId = "tineye@ideeinc.com"; + url = "https://addons.mozilla.org/firefox/downloads/file/4074627/tineye_reverse_image_search-2.0.4.xpi"; + sha256 = "cece89c89f4480c6b69336b43c0dd2970058f2658e6cfd0160d05ba3c0cfc1b0"; + meta = with lib; { homepage = "https://tineye.com/"; description = "Click on any image on the web to search for it on TinEye. Recommended by Firefox! \nDiscover where an image came from, see how it is being used, check if modified versions exist or locate high resolution versions. Made with love by the TinEye team."; license = licenses.mit; platforms = platforms.all; - }; }; - "updateswh" = buildFirefoxXpiAddon { - pname = "updateswh"; - version = "0.6.6"; - addonId = "{157eb9f0-9814-4fcc-b0b7-586b3093c641}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4058285/updateswh-0.6.6.xpi"; - sha256 = "281f866eedec730859f65ed43ae913f140feb423dfe3c303c0a5cb7def872eaa"; - meta = with lib; + }; + "updateswh" = buildFirefoxXpiAddon { + pname = "updateswh"; + version = "0.6.6"; + addonId = "{157eb9f0-9814-4fcc-b0b7-586b3093c641}"; + url = "https://addons.mozilla.org/firefox/downloads/file/4058285/updateswh-0.6.6.xpi"; + sha256 = "281f866eedec730859f65ed43ae913f140feb423dfe3c303c0a5cb7def872eaa"; + meta = with lib; { description = "Check archival state of a source code repository and propose to update it if needed."; license = licenses.mit; platforms = platforms.all; - }; }; - "zhongwen" = buildFirefoxXpiAddon { - pname = "zhongwen"; - version = "5.14.1"; - addonId = "{dedb3663-6f13-4c6c-bf0f-5bd111cb2c79}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4060172/zhongwen-5.14.1.xpi"; - sha256 = "108a358040bfb096b600337f6699d46ce7f48f2f88f51be7e8bd3d308c59c70b"; - meta = with lib; + }; + "zhongwen" = buildFirefoxXpiAddon { + pname = "zhongwen"; + version = "5.14.1"; + addonId = "{dedb3663-6f13-4c6c-bf0f-5bd111cb2c79}"; + url = "https://addons.mozilla.org/firefox/downloads/file/4060172/zhongwen-5.14.1.xpi"; + sha256 = "108a358040bfb096b600337f6699d46ce7f48f2f88f51be7e8bd3d308c59c70b"; + meta = with lib; { homepage = "https://github.com/cschiller/zhongwen"; description = "Official Firefox port of the Zhongwen Chrome extension (http://github.com/cschiller/zhongwen). Translate Chinese characters by hovering over them with the mouse. Includes internal word list, links to Chinese Grammar Wiki, tone colors, and more."; license = licenses.gpl2; platforms = platforms.all; - }; }; - } \ No newline at end of file + }; +} diff --git a/pkgs/tic-80/default.nix b/pkgs/tic-80/default.nix index de52bff3..dee01760 100644 --- a/pkgs/tic-80/default.nix +++ b/pkgs/tic-80/default.nix @@ -35,7 +35,7 @@ , jackSupport ? true , 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 , ruby , rake