Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake: apply nixpkgs-fmt treewide

Browse source
This commit is contained in:
Infinidoge 2024-05-26 04:57:59 -04:00
parent 8c3d03e9cb
commit b3c0bc9cb0
Signed by: Infinidoge
SSH key fingerprint: SHA256:oAMyvotlNFraMmZmr+p6AxnNfW/GioTs1pOn3V4tQ7A
13 changed files with 279 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/Infini-DL360/postgresql.nix
View file

@ -3,7 +3,7 @@ let
directory = "/srv/postgresql"; directory = "/srv/postgresql";
in in
{ {
persist.directories = [ { inherit directory; user = "postgres"; group = "postgresl"; } ]; persist.directories = [{ inherit directory; user = "postgres"; group = "postgresl"; }];
services.postgresql = { services.postgresql = {
enable = true; enable = true;

3
hosts/Infini-DL360/web.nix
View file

@ -27,7 +27,8 @@ let
websites = lib.genAttrs [ websites = lib.genAttrs [
"inx.moe" "inx.moe"
"stickers.inx.moe" "stickers.inx.moe"
] mkWebsite; ]
mkWebsite;
redirects = lib.mapAttrs mkRedirect { redirects = lib.mapAttrs mkRedirect {
"nitter.inx.moe" = "twitter.com"; "nitter.inx.moe" = "twitter.com";

15
lib/default.nix
View file

@ -1,7 +1,8 @@
{ lib }: { lib }:
lib.makeExtensible (self: lib.makeExtensible
with lib; (self:
rec { with lib;
rec {
flattenListSet = imports: (flatten (concatLists (attrValues imports))); flattenListSet = imports: (flatten (concatLists (attrValues imports)));
flattenSetList = attrSet: (mapAttrs (name: value: flatten value) attrSet); flattenSetList = attrSet: (mapAttrs (name: value: flatten value) attrSet);
@ -59,12 +60,12 @@ rec {
if (typeOf app) == "lambda" then self // { inherit app; } if (typeOf app) == "lambda" then self // { inherit app; }
else self.func app; else self.func app;
}; };
} // ( } // (
import ./digga.nix { inherit lib; } import ./digga.nix { inherit lib; }
) // ( ) // (
import ./hosts.nix { inherit lib; } import ./hosts.nix { inherit lib; }
) // ( ) // (
import ./options.nix { inherit lib; } import ./options.nix { inherit lib; }
)) // { )) // {
disko = import ./disko.nix { inherit lib; }; disko = import ./disko.nix { inherit lib; };
} }

2
lib/disko.nix
View file

@ -51,7 +51,7 @@ rec {
mkBtrfsSubvols' = mountOptions: mapAttrs (n: v: { mkBtrfsSubvols' = mountOptions: mapAttrs (n: v: {
mountpoint = n; mountpoint = n;
mountOptions = mountOptions ++ (optionals (v ? mountOptions) v.mountOptions); mountOptions = mountOptions ++ (optionals (v ? mountOptions) v.mountOptions);
} // (removeAttrs v ["mountOptions"])); } // (removeAttrs v [ "mountOptions" ]));
mkBtrfsSubvols = mkBtrfsSubvols' defaultMountOptions; mkBtrfsSubvols = mkBtrfsSubvols' defaultMountOptions;
# ZFS # ZFS

2
modules/modules/backup.nix
View file

@ -50,7 +50,7 @@ in
enable = mkBoolOpt true; enable = mkBoolOpt true;
userEnvironment = mkBoolOpt true; userEnvironment = mkBoolOpt true;
repo = mkOpt str "rsync.net:backups/hosts"; repo = mkOpt str "rsync.net:backups/hosts";
excludes = mkOpt (attrsOf (listOf str)) {}; excludes = mkOpt (attrsOf (listOf str)) { };
extraExcludes = mkOpt (listOf str) [ ]; extraExcludes = mkOpt (listOf str) [ ];
backupTimes = mkOpt (attrsOf str) { }; backupTimes = mkOpt (attrsOf str) { };
jobs = mkOpt (attrsOf str) { }; jobs = mkOpt (attrsOf str) { };

3
modules/modules/desktop/gaming.nix
View file

@ -33,7 +33,8 @@ in
config = mkMerge [ config = mkMerge [
{ {
home.home.packages = with pkgs; [ home.home.packages = with pkgs; [
(mkIf cfg.prismlauncher.enable cfg.prismlauncher.package) alsa-oss (mkIf cfg.prismlauncher.enable cfg.prismlauncher.package)
alsa-oss
(mkIf cfg.lutris.enable cfg.lutris.package) (mkIf cfg.lutris.enable cfg.lutris.package)
(mkIf cfg.olympus.enable cfg.olympus.package) (mkIf cfg.olympus.enable cfg.olympus.package)
(mkIf cfg.puzzles.enable cfg.puzzles.package) (mkIf cfg.puzzles.enable cfg.puzzles.package)

14
modules/vendored/conduit.nix
View file

@ -5,10 +5,10 @@ with lib;
let let
cfg = config.services.matrix-conduit; cfg = config.services.matrix-conduit;
format = pkgs.formats.toml {}; format = pkgs.formats.toml { };
configFile = format.generate "conduit.toml" cfg.settings; configFile = format.generate "conduit.toml" cfg.settings;
in in
{ {
disabledModules = [ "services/matrix/conduit.nix" ]; disabledModules = [ "services/matrix/conduit.nix" ];
options.services.matrix-conduit = { options.services.matrix-conduit = {
@ -23,8 +23,8 @@ in
extraEnvironment = mkOption { extraEnvironment = mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.str;
description = "Extra Environment variables to pass to the conduit server."; description = "Extra Environment variables to pass to the conduit server.";
default = {}; default = { };
example = { RUST_BACKTRACE="yes"; }; example = { RUST_BACKTRACE = "yes"; };
}; };
package = mkPackageOption pkgs "matrix-conduit" { }; package = mkPackageOption pkgs "matrix-conduit" { };
@ -106,7 +106,7 @@ in
}; };
}; };
}; };
default = {}; default = { };
description = '' description = ''
Generates the conduit.toml configuration file. Refer to Generates the conduit.toml configuration file. Refer to
<https://docs.conduit.rs/configuration.html> <https://docs.conduit.rs/configuration.html>
@ -122,7 +122,7 @@ in
isSystemUser = true; isSystemUser = true;
}; };
users.groups.conduit = {}; users.groups.conduit = { };
systemd.tmpfiles.settings."10-conduit" = { systemd.tmpfiles.settings."10-conduit" = {
${cfg.dataDir}.d = { ${cfg.dataDir}.d = {
@ -172,4 +172,4 @@ in
}; };
}; };
}; };
} }

4
modules/vendored/jellyfin.nix
View file

@ -77,7 +77,7 @@ in
ExecStart = "${cfg.package}/bin/jellyfin --datadir '${cfg.dataDir}' --cachedir '${cfg.cacheDir}' --logdir '${cfg.logDir}'"; ExecStart = "${cfg.package}/bin/jellyfin --datadir '${cfg.dataDir}' --cachedir '${cfg.cacheDir}' --logdir '${cfg.logDir}'";
Restart = "on-failure"; Restart = "on-failure";
TimeoutSec = 15; TimeoutSec = 15;
SuccessExitStatus = ["0" "143"]; SuccessExitStatus = [ "0" "143" ];
# Security options: # Security options:
NoNewPrivileges = true; NoNewPrivileges = true;
@ -128,7 +128,7 @@ in
}; };
users.groups = mkIf (cfg.group == "jellyfin") { users.groups = mkIf (cfg.group == "jellyfin") {
jellyfin = {}; jellyfin = { };
}; };
networking.firewall = mkIf cfg.openFirewall { networking.firewall = mkIf cfg.openFirewall {

106
pkgs/neocities/gemset.nix
View file

@ -1,164 +1,164 @@
{ {
equatable = { equatable = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x"; sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x";
type = "gem"; type = "gem";
}; };
version = "0.5.0"; version = "0.5.0";
}; };
httpclient-fixcerts = { httpclient-fixcerts = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1zfszylh51y8ic8sbff3mwf30jb0gj270r5nxkcm1ydxad19w6sl"; sha256 = "1zfszylh51y8ic8sbff3mwf30jb0gj270r5nxkcm1ydxad19w6sl";
type = "gem"; type = "gem";
}; };
version = "2.8.5"; version = "2.8.5";
}; };
necromancer = { necromancer = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
type = "gem"; type = "gem";
}; };
version = "0.4.0"; version = "0.4.0";
}; };
neocities = { neocities = {
dependencies = ["httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table"]; dependencies = [ "httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1hfvy4gc7rzxkgl2dbrjs2fqzi5mphmr22rjfhk6n0i3bd0wazbw"; sha256 = "1hfvy4gc7rzxkgl2dbrjs2fqzi5mphmr22rjfhk6n0i3bd0wazbw";
type = "gem"; type = "gem";
}; };
version = "0.0.18"; version = "0.0.18";
}; };
pastel = { pastel = {
dependencies = ["equatable" "tty-color"]; dependencies = [ "equatable" "tty-color" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1"; sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1";
type = "gem"; type = "gem";
}; };
version = "0.7.2"; version = "0.7.2";
}; };
rake = { rake = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
type = "gem"; type = "gem";
}; };
version = "12.3.3"; version = "12.3.3";
}; };
strings = { strings = {
dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; dependencies = [ "strings-ansi" "unicode-display_width" "unicode_utils" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0";
type = "gem"; type = "gem";
}; };
version = "0.1.8"; version = "0.1.8";
}; };
strings-ansi = { strings-ansi = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh";
type = "gem"; type = "gem";
}; };
version = "0.2.0"; version = "0.2.0";
}; };
tty-color = { tty-color = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk"; sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk";
type = "gem"; type = "gem";
}; };
version = "0.4.3"; version = "0.4.3";
}; };
tty-cursor = { tty-cursor = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a"; sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
type = "gem"; type = "gem";
}; };
version = "0.4.0"; version = "0.4.0";
}; };
tty-prompt = { tty-prompt = {
dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"]; dependencies = [ "necromancer" "pastel" "tty-cursor" "wisper" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0"; sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
type = "gem"; type = "gem";
}; };
version = "0.12.0"; version = "0.12.0";
}; };
tty-screen = { tty-screen = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1";
type = "gem"; type = "gem";
}; };
version = "0.6.5"; version = "0.6.5";
}; };
tty-table = { tty-table = {
dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"]; dependencies = [ "equatable" "necromancer" "pastel" "strings" "tty-screen" ];
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg"; sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg";
type = "gem"; type = "gem";
}; };
version = "0.10.0"; version = "0.10.0";
}; };
unicode-display_width = { unicode-display_width = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
type = "gem"; type = "gem";
}; };
version = "1.8.0"; version = "1.8.0";
}; };
unicode_utils = { unicode_utils = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.4.0";
}; };
wisper = { wisper = {
groups = ["default"]; groups = [ "default" ];
platforms = []; platforms = [ ];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = [ "https://rubygems.org" ];
sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s"; sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
type = "gem"; type = "gem";
}; };

2
users/root/default.nix
View file

@ -5,5 +5,5 @@
openssh.authorizedKeys.keys = import ./ssh-keys.nix; openssh.authorizedKeys.keys = import ./ssh-keys.nix;
}; };
home-manager.users.root = { ... }: {}; home-manager.users.root = { ... }: { };
} }