From b3c0bc9cb0ce3cffa1fe784087f9a773474e1be4 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 26 May 2024 04:57:59 -0400 Subject: [PATCH] flake: apply nixpkgs-fmt treewide --- hosts/Infini-DL360/default.nix | 4 +- hosts/Infini-DL360/postgresql.nix | 2 +- hosts/Infini-DL360/web.nix | 3 +- hosts/Infini-OPTIPLEX/default.nix | 4 +- lib/default.nix | 115 +++++------ lib/disko.nix | 2 +- modules/modules/backup.nix | 4 +- modules/modules/desktop/gaming.nix | 3 +- modules/vendored/conduit.nix | 304 ++++++++++++++--------------- modules/vendored/jellyfin.nix | 4 +- pkgs/neocities/gemset.nix | 106 +++++----- secrets/secrets.nix | 2 +- users/root/default.nix | 2 +- 13 files changed, 279 insertions(+), 276 deletions(-) diff --git a/hosts/Infini-DL360/default.nix b/hosts/Infini-DL360/default.nix index 64def3e..89e69cc 100644 --- a/hosts/Infini-DL360/default.nix +++ b/hosts/Infini-DL360/default.nix @@ -54,8 +54,8 @@ services.fail2ban.enable = true; environment.etc."fail2ban/filter.d/nginx-url-probe.local".text = lib.mkDefault (lib.mkAfter '' - [Definition] - failregex = ^.*(GET /(wp-|admin|boaform|phpmyadmin|\.env|\.git|notifications)|\.(dll|so|cfm|asp)|(\?|&)(=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000|=PHPE9568F36-D428-11d2-A769-00AA001ACF42|=PHPE9568F35-D428-11d2-A769-00AA001ACF42|=PHPE9568F34-D428-11d2-A769-00AA001ACF42)|\\x[0-9a-zA-Z]{2}) + [Definition] + failregex = ^.*(GET /(wp-|admin|boaform|phpmyadmin|\.env|\.git|notifications)|\.(dll|so|cfm|asp)|(\?|&)(=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000|=PHPE9568F36-D428-11d2-A769-00AA001ACF42|=PHPE9568F35-D428-11d2-A769-00AA001ACF42|=PHPE9568F34-D428-11d2-A769-00AA001ACF42)|\\x[0-9a-zA-Z]{2}) ''); services.fail2ban.jails.nginx-url-probe.settings = { diff --git a/hosts/Infini-DL360/postgresql.nix b/hosts/Infini-DL360/postgresql.nix index efe9f5d..a757390 100644 --- a/hosts/Infini-DL360/postgresql.nix +++ b/hosts/Infini-DL360/postgresql.nix @@ -3,7 +3,7 @@ let directory = "/srv/postgresql"; in { - persist.directories = [ { inherit directory; user = "postgres"; group = "postgresl"; } ]; + persist.directories = [{ inherit directory; user = "postgres"; group = "postgresl"; }]; services.postgresql = { enable = true; diff --git a/hosts/Infini-DL360/web.nix b/hosts/Infini-DL360/web.nix index fa141bb..b92e572 100644 --- a/hosts/Infini-DL360/web.nix +++ b/hosts/Infini-DL360/web.nix @@ -27,7 +27,8 @@ let websites = lib.genAttrs [ "inx.moe" "stickers.inx.moe" - ] mkWebsite; + ] + mkWebsite; redirects = lib.mapAttrs mkRedirect { "nitter.inx.moe" = "twitter.com"; diff --git a/hosts/Infini-OPTIPLEX/default.nix b/hosts/Infini-OPTIPLEX/default.nix index 3cb22c7..833d3f4 100644 --- a/hosts/Infini-OPTIPLEX/default.nix +++ b/hosts/Infini-OPTIPLEX/default.nix @@ -36,8 +36,8 @@ services.fail2ban.enable = true; environment.etc."fail2ban/filter.d/nginx-url-probe.local".text = pkgs.lib.mkDefault (pkgs.lib.mkAfter '' - [Definition] - failregex = ^.*(GET /(wp-|admin|boaform|phpmyadmin|\.env|\.git|notifications)|\.(dll|so|cfm|asp)|(\?|&)(=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000|=PHPE9568F36-D428-11d2-A769-00AA001ACF42|=PHPE9568F35-D428-11d2-A769-00AA001ACF42|=PHPE9568F34-D428-11d2-A769-00AA001ACF42)|\\x[0-9a-zA-Z]{2}) + [Definition] + failregex = ^.*(GET /(wp-|admin|boaform|phpmyadmin|\.env|\.git|notifications)|\.(dll|so|cfm|asp)|(\?|&)(=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000|=PHPE9568F36-D428-11d2-A769-00AA001ACF42|=PHPE9568F35-D428-11d2-A769-00AA001ACF42|=PHPE9568F34-D428-11d2-A769-00AA001ACF42)|\\x[0-9a-zA-Z]{2}) ''); services.fail2ban.jails.nginx-url-probe.settings = { diff --git a/lib/default.nix b/lib/default.nix index 4273baa..24cd73f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,70 +1,71 @@ { lib }: -lib.makeExtensible (self: -with lib; -rec { - flattenListSet = imports: (flatten (concatLists (attrValues imports))); - flattenSetList = attrSet: (mapAttrs (name: value: flatten value) attrSet); +lib.makeExtensible + (self: + with lib; + rec { + flattenListSet = imports: (flatten (concatLists (attrValues imports))); + flattenSetList = attrSet: (mapAttrs (name: value: flatten value) attrSet); - # ["/home/user/" "/.screenrc"] -> ["home" "user" ".screenrc"] - splitPath = paths: - (filter - (s: builtins.typeOf s == "string" && s != "") - (concatMap (builtins.split "/") paths) - ); + # ["/home/user/" "/.screenrc"] -> ["home" "user" ".screenrc"] + splitPath = paths: + (filter + (s: builtins.typeOf s == "string" && s != "") + (concatMap (builtins.split "/") paths) + ); - # ["home" "user" ".screenrc"] -> "home/user/.screenrc" - dirListToPath = dirList: (concatStringsSep "/" dirList); + # ["home" "user" ".screenrc"] -> "home/user/.screenrc" + dirListToPath = dirList: (concatStringsSep "/" dirList); - # ["/home/user/" "/.screenrc"] -> "/home/user/.screenrc" - concatPaths = paths: - let - prefix = optionalString (hasPrefix "/" (head paths)) "/"; - path = dirListToPath (splitPath paths); - in - prefix + path; + # ["/home/user/" "/.screenrc"] -> "/home/user/.screenrc" + concatPaths = paths: + let + prefix = optionalString (hasPrefix "/" (head paths)) "/"; + path = dirListToPath (splitPath paths); + in + prefix + path; - sanitizeName = name: - replaceStrings - [ "." ] [ "" ] - (sanitizeDerivationName (removePrefix "/" name)); + sanitizeName = name: + replaceStrings + [ "." ] [ "" ] + (sanitizeDerivationName (removePrefix "/" name)); - mapGenAttrs = list: func: attrs: - lib.genAttrs list (name: func (if builtins.typeOf attrs == "lambda" then attrs name else attrs)); + mapGenAttrs = list: func: attrs: + lib.genAttrs list (name: func (if builtins.typeOf attrs == "lambda" then attrs name else attrs)); - dirsOf = dir: lib.attrNames (lib.filterAttrs (file: type: type == "directory") (builtins.readDir dir)); + dirsOf = dir: lib.attrNames (lib.filterAttrs (file: type: type == "directory") (builtins.readDir dir)); - # Only useful for functors - recMap = f: list: - if list == [ ] then f - else recMap (f (head list)) (tail list) - ; + # Only useful for functors + recMap = f: list: + if list == [ ] then f + else recMap (f (head list)) (tail list) + ; - chain = { - func = id; - __functor = self: input: - if (typeOf input) == "lambda" - then self // { func = e: input (self.func e); } - else self.func input; - }; + chain = { + func = id; + __functor = self: input: + if (typeOf input) == "lambda" + then self // { func = e: input (self.func e); } + else self.func input; + }; - spread = function: list: if list == [ ] then function else spread (function (head list)) (tail list); + spread = function: list: if list == [ ] then function else spread (function (head list)) (tail list); - # Takes a function and makes it lazy, by consuming arguments and applying it to the inner function first - # before calling the original function - lazy = func: inner: { - inherit func; - app = inner; - __functor = self: input: - let app = self.app input; in - if (typeOf app) == "lambda" then self // { inherit app; } - else self.func app; - }; -} // ( - import ./digga.nix { inherit lib; } -) // ( - import ./hosts.nix { inherit lib; } -) // ( - import ./options.nix { inherit lib; } -)) // { + # Takes a function and makes it lazy, by consuming arguments and applying it to the inner function first + # before calling the original function + lazy = func: inner: { + inherit func; + app = inner; + __functor = self: input: + let app = self.app input; in + if (typeOf app) == "lambda" then self // { inherit app; } + else self.func app; + }; + } // ( + import ./digga.nix { inherit lib; } + ) // ( + import ./hosts.nix { inherit lib; } + ) // ( + import ./options.nix { inherit lib; } + )) // { disko = import ./disko.nix { inherit lib; }; } diff --git a/lib/disko.nix b/lib/disko.nix index 975714e..820d743 100644 --- a/lib/disko.nix +++ b/lib/disko.nix @@ -51,7 +51,7 @@ rec { mkBtrfsSubvols' = mountOptions: mapAttrs (n: v: { mountpoint = n; mountOptions = mountOptions ++ (optionals (v ? mountOptions) v.mountOptions); - } // (removeAttrs v ["mountOptions"])); + } // (removeAttrs v [ "mountOptions" ])); mkBtrfsSubvols = mkBtrfsSubvols' defaultMountOptions; # ZFS diff --git a/modules/modules/backup.nix b/modules/modules/backup.nix index 7be8a04..557f9ef 100644 --- a/modules/modules/backup.nix +++ b/modules/modules/backup.nix @@ -32,7 +32,7 @@ let within = "1d"; # Keep all archives from the last day daily = 7; weekly = 4; - monthly = -1; # Keep at least one archive for each month + monthly = -1; # Keep at least one archive for each month }; }; @@ -50,7 +50,7 @@ in enable = mkBoolOpt true; userEnvironment = mkBoolOpt true; repo = mkOpt str "rsync.net:backups/hosts"; - excludes = mkOpt (attrsOf (listOf str)) {}; + excludes = mkOpt (attrsOf (listOf str)) { }; extraExcludes = mkOpt (listOf str) [ ]; backupTimes = mkOpt (attrsOf str) { }; jobs = mkOpt (attrsOf str) { }; diff --git a/modules/modules/desktop/gaming.nix b/modules/modules/desktop/gaming.nix index a36cf83..c338a35 100644 --- a/modules/modules/desktop/gaming.nix +++ b/modules/modules/desktop/gaming.nix @@ -33,7 +33,8 @@ in config = mkMerge [ { 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.olympus.enable cfg.olympus.package) (mkIf cfg.puzzles.enable cfg.puzzles.package) diff --git a/modules/vendored/conduit.nix b/modules/vendored/conduit.nix index 2ec38e8..1d4ddd8 100644 --- a/modules/vendored/conduit.nix +++ b/modules/vendored/conduit.nix @@ -5,171 +5,171 @@ with lib; let cfg = config.services.matrix-conduit; - format = pkgs.formats.toml {}; + format = pkgs.formats.toml { }; configFile = format.generate "conduit.toml" cfg.settings; in - { - disabledModules = [ "services/matrix/conduit.nix" ]; +{ + disabledModules = [ "services/matrix/conduit.nix" ]; - options.services.matrix-conduit = { - enable = mkEnableOption "matrix-conduit"; + options.services.matrix-conduit = { + enable = mkEnableOption "matrix-conduit"; - dataDir = mkOption { - type = types.path; - description = "The directory to store conduit data in"; - default = "/var/lib/matrix-conduit/"; - }; + dataDir = mkOption { + type = types.path; + description = "The directory to store conduit data in"; + default = "/var/lib/matrix-conduit/"; + }; - extraEnvironment = mkOption { - type = types.attrsOf types.str; - description = "Extra Environment variables to pass to the conduit server."; - default = {}; - example = { RUST_BACKTRACE="yes"; }; - }; + extraEnvironment = mkOption { + type = types.attrsOf types.str; + description = "Extra Environment variables to pass to the conduit server."; + default = { }; + example = { RUST_BACKTRACE = "yes"; }; + }; - package = mkPackageOption pkgs "matrix-conduit" { }; + package = mkPackageOption pkgs "matrix-conduit" { }; - settings = mkOption { - type = types.submodule { - freeformType = format.type; - options = { - global.server_name = mkOption { - type = types.str; - example = "example.com"; - description = "The server_name is the name of this server. It is used as a suffix for user # and room ids."; - }; - global.port = mkOption { - type = types.port; - default = 6167; - description = "The port Conduit will be running on. You need to set up a reverse proxy in your web server (e.g. apache or nginx), so all requests to /_matrix on port 443 and 8448 will be forwarded to the Conduit instance running on this port"; - }; - global.max_request_size = mkOption { - type = types.ints.positive; - default = 20000000; - description = "Max request size in bytes. Don't forget to also change it in the proxy."; - }; - global.allow_registration = mkOption { - type = types.bool; - default = false; - description = "Whether new users can register on this server."; - }; - global.allow_encryption = mkOption { - type = types.bool; - default = true; - description = "Whether new encrypted rooms can be created. Note: existing rooms will continue to work."; - }; - global.allow_federation = mkOption { - type = types.bool; - default = true; - description = '' - Whether this server federates with other servers. - ''; - }; - global.trusted_servers = mkOption { - type = types.listOf types.str; - default = [ "matrix.org" ]; - description = "Servers trusted with signing server keys."; - }; - global.address = mkOption { - type = types.str; - default = "::1"; - description = "Address to listen on for connections by the reverse proxy/tls terminator."; - }; - global.database_path = mkOption { - type = types.str; - default = cfg.dataDir; - readOnly = true; - description = '' - Path to the conduit database, the directory where conduit will save its data. - Note that due to using the DynamicUser feature of systemd, this value should not be changed - and is set to be read only. - ''; - }; - global.database_backend = mkOption { - type = types.enum [ "sqlite" "rocksdb" ]; - default = "sqlite"; - example = "rocksdb"; - description = '' - The database backend for the service. Switching it on an existing - instance will require manual migration of data. - ''; - }; - global.allow_check_for_updates = mkOption { - type = types.bool; - default = false; - description = '' - Whether to allow Conduit to automatically contact - hourly to check for important Conduit news. + settings = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + global.server_name = mkOption { + type = types.str; + example = "example.com"; + description = "The server_name is the name of this server. It is used as a suffix for user # and room ids."; + }; + global.port = mkOption { + type = types.port; + default = 6167; + description = "The port Conduit will be running on. You need to set up a reverse proxy in your web server (e.g. apache or nginx), so all requests to /_matrix on port 443 and 8448 will be forwarded to the Conduit instance running on this port"; + }; + global.max_request_size = mkOption { + type = types.ints.positive; + default = 20000000; + description = "Max request size in bytes. Don't forget to also change it in the proxy."; + }; + global.allow_registration = mkOption { + type = types.bool; + default = false; + description = "Whether new users can register on this server."; + }; + global.allow_encryption = mkOption { + type = types.bool; + default = true; + description = "Whether new encrypted rooms can be created. Note: existing rooms will continue to work."; + }; + global.allow_federation = mkOption { + type = types.bool; + default = true; + description = '' + Whether this server federates with other servers. + ''; + }; + global.trusted_servers = mkOption { + type = types.listOf types.str; + default = [ "matrix.org" ]; + description = "Servers trusted with signing server keys."; + }; + global.address = mkOption { + type = types.str; + default = "::1"; + description = "Address to listen on for connections by the reverse proxy/tls terminator."; + }; + global.database_path = mkOption { + type = types.str; + default = cfg.dataDir; + readOnly = true; + description = '' + Path to the conduit database, the directory where conduit will save its data. + Note that due to using the DynamicUser feature of systemd, this value should not be changed + and is set to be read only. + ''; + }; + global.database_backend = mkOption { + type = types.enum [ "sqlite" "rocksdb" ]; + default = "sqlite"; + example = "rocksdb"; + description = '' + The database backend for the service. Switching it on an existing + instance will require manual migration of data. + ''; + }; + global.allow_check_for_updates = mkOption { + type = types.bool; + default = false; + description = '' + Whether to allow Conduit to automatically contact + hourly to check for important Conduit news. - Disabled by default because nixpkgs handles updates. - ''; - }; + Disabled by default because nixpkgs handles updates. + ''; }; }; - default = {}; - description = '' - Generates the conduit.toml configuration file. Refer to - - for details on supported values. - Note that database_path can not be edited because the service's reliance on systemd StateDir. - ''; }; + default = { }; + description = '' + Generates the conduit.toml configuration file. Refer to + + for details on supported values. + Note that database_path can not be edited because the service's reliance on systemd StateDir. + ''; + }; + }; + + config = mkIf cfg.enable { + users.users.conduit = { + group = "conduit"; + isSystemUser = true; }; - config = mkIf cfg.enable { - users.users.conduit = { + users.groups.conduit = { }; + + systemd.tmpfiles.settings."10-conduit" = { + ${cfg.dataDir}.d = { + user = "conduit"; group = "conduit"; - isSystemUser = true; - }; - - users.groups.conduit = {}; - - systemd.tmpfiles.settings."10-conduit" = { - ${cfg.dataDir}.d = { - user = "conduit"; - group = "conduit"; - mode = "0700"; - }; - }; - - systemd.services.conduit = { - description = "Conduit Matrix Server"; - documentation = [ "https://gitlab.com/famedly/conduit/" ]; - wantedBy = [ "multi-user.target" ]; - environment = lib.mkMerge ([ - { CONDUIT_CONFIG = configFile; } - cfg.extraEnvironment - ]); - serviceConfig = { - User = "conduit"; - Group = "conduit"; - LockPersonality = true; - MemoryDenyWriteExecute = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - PrivateDevices = true; - PrivateMounts = true; - PrivateUsers = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; - RestrictNamespaces = true; - RestrictRealtime = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - ]; - WorkingDirectory = cfg.dataDir; - ReadWritePaths = cfg.dataDir; - ExecStart = lib.getExe' cfg.package "conduit"; - Restart = "on-failure"; - RestartSec = 10; - StartLimitBurst = 5; - UMask = "077"; - }; + mode = "0700"; }; }; - } + + systemd.services.conduit = { + description = "Conduit Matrix Server"; + documentation = [ "https://gitlab.com/famedly/conduit/" ]; + wantedBy = [ "multi-user.target" ]; + environment = lib.mkMerge ([ + { CONDUIT_CONFIG = configFile; } + cfg.extraEnvironment + ]); + serviceConfig = { + User = "conduit"; + Group = "conduit"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + WorkingDirectory = cfg.dataDir; + ReadWritePaths = cfg.dataDir; + ExecStart = lib.getExe' cfg.package "conduit"; + Restart = "on-failure"; + RestartSec = 10; + StartLimitBurst = 5; + UMask = "077"; + }; + }; + }; +} diff --git a/modules/vendored/jellyfin.nix b/modules/vendored/jellyfin.nix index 39794ca..ae22a51 100644 --- a/modules/vendored/jellyfin.nix +++ b/modules/vendored/jellyfin.nix @@ -77,7 +77,7 @@ in ExecStart = "${cfg.package}/bin/jellyfin --datadir '${cfg.dataDir}' --cachedir '${cfg.cacheDir}' --logdir '${cfg.logDir}'"; Restart = "on-failure"; TimeoutSec = 15; - SuccessExitStatus = ["0" "143"]; + SuccessExitStatus = [ "0" "143" ]; # Security options: NoNewPrivileges = true; @@ -128,7 +128,7 @@ in }; users.groups = mkIf (cfg.group == "jellyfin") { - jellyfin = {}; + jellyfin = { }; }; networking.firewall = mkIf cfg.openFirewall { diff --git a/pkgs/neocities/gemset.nix b/pkgs/neocities/gemset.nix index bb5b696..756558c 100644 --- a/pkgs/neocities/gemset.nix +++ b/pkgs/neocities/gemset.nix @@ -1,164 +1,164 @@ { equatable = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x"; type = "gem"; }; version = "0.5.0"; }; httpclient-fixcerts = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1zfszylh51y8ic8sbff3mwf30jb0gj270r5nxkcm1ydxad19w6sl"; type = "gem"; }; version = "2.8.5"; }; necromancer = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; type = "gem"; }; version = "0.4.0"; }; neocities = { - dependencies = ["httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table"]; - groups = ["default"]; - platforms = []; + dependencies = [ "httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1hfvy4gc7rzxkgl2dbrjs2fqzi5mphmr22rjfhk6n0i3bd0wazbw"; type = "gem"; }; version = "0.0.18"; }; pastel = { - dependencies = ["equatable" "tty-color"]; - groups = ["default"]; - platforms = []; + dependencies = [ "equatable" "tty-color" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1"; type = "gem"; }; version = "0.7.2"; }; rake = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; type = "gem"; }; version = "12.3.3"; }; strings = { - dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; - groups = ["default"]; - platforms = []; + dependencies = [ "strings-ansi" "unicode-display_width" "unicode_utils" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; type = "gem"; }; version = "0.1.8"; }; strings-ansi = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; type = "gem"; }; version = "0.2.0"; }; tty-color = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk"; type = "gem"; }; version = "0.4.3"; }; tty-cursor = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a"; type = "gem"; }; version = "0.4.0"; }; tty-prompt = { - dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"]; - groups = ["default"]; - platforms = []; + dependencies = [ "necromancer" "pastel" "tty-cursor" "wisper" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0"; type = "gem"; }; version = "0.12.0"; }; tty-screen = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; type = "gem"; }; version = "0.6.5"; }; tty-table = { - dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"]; - groups = ["default"]; - platforms = []; + dependencies = [ "equatable" "necromancer" "pastel" "strings" "tty-screen" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg"; type = "gem"; }; version = "0.10.0"; }; unicode-display_width = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; version = "1.8.0"; }; unicode_utils = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; type = "gem"; }; version = "1.4.0"; }; wisper = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s"; type = "gem"; }; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 830b507..3434e18 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -13,7 +13,7 @@ let Infini-OPTIPLEX = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEG8fY684SPKeOUsJqaV6LJwwztWxztaU9nAHPBxBtyU root@Infini-OPTIPLEX"; Infini-STICK = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCg81G/oysjFkHXo1E9XPGoULpv9rR0HyWoR2wIcl6C root@Infini-STICK"; Infini-SD = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8oViHNz64NG51uyll/q/hrSGwoHRgvYI3luD/IWTUT root@Infini-SD"; - Infini-DL360 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjmvE76BcPwZSjeNGzlguDQC67Yxa3uyOf5ZmVDWNys root@Infini-DL360"; + Infini-DL360 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjmvE76BcPwZSjeNGzlguDQC67Yxa3uyOf5ZmVDWNys root@Infini-DL360"; }; users = { infinidoge = import ../users/infinidoge/ssh-keys.nix; diff --git a/users/root/default.nix b/users/root/default.nix index 0c29df8..d5eeceb 100644 --- a/users/root/default.nix +++ b/users/root/default.nix @@ -5,5 +5,5 @@ openssh.authorizedKeys.keys = import ./ssh-keys.nix; }; - home-manager.users.root = { ... }: {}; + home-manager.users.root = { ... }: { }; }