diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 4173ca2..e39ed0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ host result .pre-commit-config.yaml +.direnv diff --git a/checks.nix b/checks.nix index 8f85128..53f2d84 100644 --- a/checks.nix +++ b/checks.nix @@ -4,6 +4,9 @@ pre-commit-check = hooks.lib.${system}.run { src = ./.; hooks = { + deadnix.enable = true; + # Needs https://github.com/DeterminateSystems/flake-checker/pull/130 + #flake-checker.enable = true; nixpkgs-fmt.enable = true; }; }; diff --git a/flake.nix b/flake.nix index 6f7f703..0e7abcd 100644 --- a/flake.nix +++ b/flake.nix @@ -96,6 +96,7 @@ gzip inject inject-darwin + self'.checks.pre-commit-check.enabledPackages tmux vim xonsh diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 64f11a1..cd6c064 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/home/hosts/exodus/default.nix b/home/hosts/exodus/default.nix index 2e2e34a..ff9ec07 100644 --- a/home/hosts/exodus/default.nix +++ b/home/hosts/exodus/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { greg = { diff --git a/home/modules/baseline/direnv.nix b/home/modules/baseline/direnv.nix index cb77a73..c27cb2c 100644 --- a/home/modules/baseline/direnv.nix +++ b/home/modules/baseline/direnv.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs.direnv = { diff --git a/home/modules/baseline/xonsh.nix b/home/modules/baseline/xonsh.nix index 5c3b0e2..b0fe629 100644 --- a/home/modules/baseline/xonsh.nix +++ b/home/modules/baseline/xonsh.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, ... }: { programs.xonsh = { diff --git a/home/modules/gnome.nix b/home/modules/gnome.nix index c1683d7..4b5eacf 100644 --- a/home/modules/gnome.nix +++ b/home/modules/gnome.nix @@ -1,9 +1,7 @@ { config, pkgs, lib, ... }: let - gv = lib.hm.gvariant; cfg = config.greg.gnome; - in { options.greg.gnome = lib.mkEnableOption "Enable Gnome support and settings"; diff --git a/home/modules/xonsh.nix b/home/modules/xonsh.nix index ea5162f..82126e7 100644 --- a/home/modules/xonsh.nix +++ b/home/modules/xonsh.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.programs.xonsh; diff --git a/hosts/default.nix b/hosts/default.nix index 97d3c79..28c41d2 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -19,10 +19,6 @@ let nixpkgs = import channel { inherit system; }; - # Use this to include modules directly from a repo - nurNoPkg = import inputs.nurpkgs { - nurpkgs = nixpkgs; - }; in channel.lib.nixosSystem { inherit system; diff --git a/hosts/exodus/default.nix b/hosts/exodus/default.nix index 5e28521..c3d0745 100644 --- a/hosts/exodus/default.nix +++ b/hosts/exodus/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ ... }: { imports = [ diff --git a/hosts/exodus/hardware-configuration.nix b/hosts/exodus/hardware-configuration.nix index 64f11a1..cd6c064 100644 --- a/hosts/exodus/hardware-configuration.nix +++ b/hosts/exodus/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/genesis/default.nix b/hosts/genesis/default.nix index fa408c0..2998ed1 100644 --- a/hosts/genesis/default.nix +++ b/hosts/genesis/default.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ diff --git a/hosts/genesis/hardware-configuration.nix b/hosts/genesis/hardware-configuration.nix index 8ae25d8..794a842 100644 --- a/hosts/genesis/hardware-configuration.nix +++ b/hosts/genesis/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = diff --git a/hosts/genesis/home-assistant.nix b/hosts/genesis/home-assistant.nix index 15592d5..9ab6aaa 100755 --- a/hosts/genesis/home-assistant.nix +++ b/hosts/genesis/home-assistant.nix @@ -1,8 +1,5 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: -let - service_list = [ "podman-home-assistant.service" ]; -in { virtualisation.podman.enable = true; diff --git a/hosts/genesis/networking.nix b/hosts/genesis/networking.nix index 72e52de..f26fdc3 100644 --- a/hosts/genesis/networking.nix +++ b/hosts/genesis/networking.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: let lan = "ens18"; lanIP = "10.42.1.5"; diff --git a/hosts/hosea/default.nix b/hosts/hosea/default.nix index fdab3a9..ee37611 100644 --- a/hosts/hosea/default.nix +++ b/hosts/hosea/default.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, inputs, overlays, ... }: +{ inputs, ... }: let wanInterface = "enp2s0"; lanInterface = "enp1s0"; diff --git a/hosts/hosea/hardware-configuration.nix b/hosts/hosea/hardware-configuration.nix index 6a36c10..2f43041 100644 --- a/hosts/hosea/hardware-configuration.nix +++ b/hosts/hosea/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/icdm-root/boot.nix b/hosts/icdm-root/boot.nix index f26b3c7..47810f3 100644 --- a/hosts/icdm-root/boot.nix +++ b/hosts/icdm-root/boot.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ ... }: { # Bootloader. diff --git a/hosts/icdm-root/default.nix b/hosts/icdm-root/default.nix index 80b064a..dea1755 100644 --- a/hosts/icdm-root/default.nix +++ b/hosts/icdm-root/default.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, agenix, ... }: +{ pkgs, ... }: { imports = [ diff --git a/hosts/icdm-root/hardware-configuration.nix b/hosts/icdm-root/hardware-configuration.nix index 14e988e..e4147fc 100644 --- a/hosts/icdm-root/hardware-configuration.nix +++ b/hosts/icdm-root/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/icdm-root/wiki.nix b/hosts/icdm-root/wiki.nix index 1a8601e..719f20a 100644 --- a/hosts/icdm-root/wiki.nix +++ b/hosts/icdm-root/wiki.nix @@ -1,6 +1,5 @@ { pkgs, ... }: let - wikiPasswordFile = "/var/mediawiki/passwordFile"; wikiHost = "wiki.icdm.lan"; kiwixport = 8080; dependents = with pkgs; [ diff --git a/hosts/jeremiah/hardware-configuration.nix b/hosts/jeremiah/hardware-configuration.nix index d673caf..9f4d0a7 100644 --- a/hosts/jeremiah/hardware-configuration.nix +++ b/hosts/jeremiah/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/jude/hardware-configuration.nix b/hosts/jude/hardware-configuration.nix index 96b9a71..41db3ff 100644 --- a/hosts/jude/hardware-configuration.nix +++ b/hosts/jude/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix index ab7341e..8d54b09 100644 --- a/hosts/linode/git.nix +++ b/hosts/linode/git.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: let srcDomain = "src.thehellings.com"; diff --git a/hosts/linode/hardware-configuration.nix b/hosts/linode/hardware-configuration.nix index 844ba26..34ec318 100644 --- a/hosts/linode/hardware-configuration.nix +++ b/hosts/linode/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by "nixos-generate-config" # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = [ diff --git a/hosts/linode/matrix.nix b/hosts/linode/matrix.nix index 2a991c7..487420f 100644 --- a/hosts/linode/matrix.nix +++ b/hosts/linode/matrix.nix @@ -2,11 +2,10 @@ # them by the following commands: # nix run nixpkgs.matrix-synapse # register_new_matrix_user -k "B9EoPr2WV9hzwc7uL2Sx1JmvCeKDEOGCpB0uginQcQtEH4wzRtkSIdo7lltrjSQa" http://localhost:8448 -{ config, pkgs, ... }: +{ config, ... }: let domain = "${config.networking.domain}"; fqdn = "matrix.${domain}"; - conn = "postgresql:///dendrite?sslmode=disable&host=/run/postgresql"; in { services.nginx = { diff --git a/hosts/linode/postgres.nix b/hosts/linode/postgres.nix index 5977235..99f30fe 100644 --- a/hosts/linode/postgres.nix +++ b/hosts/linode/postgres.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: { environment.systemPackages = [ diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix index 8b576a3..7c2edd3 100644 --- a/hosts/myself/default.nix +++ b/hosts/myself/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ lib, ... }: { imports = [ ./ceph.nix diff --git a/hosts/myself/hardware-configuration.nix b/hosts/myself/hardware-configuration.nix index 78331da..a45886d 100644 --- a/hosts/myself/hardware-configuration.nix +++ b/hosts/myself/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/myself/matrix.nix b/hosts/myself/matrix.nix index 6574759..1893655 100644 --- a/hosts/myself/matrix.nix +++ b/hosts/myself/matrix.nix @@ -1,7 +1,5 @@ -{ config, pkgs, inputs, lib, ... }: +{ pkgs, ... }: let - domain = "thehellings.com"; - fqdn = "matrix.${domain}"; conn = "postgresql:///dendrite?sslmode=disable&host=/run/postgresql"; in { @@ -10,7 +8,7 @@ in greg.containers.matrix = { tailscale = true; subnet = "204"; - builder = { pkgs, config, ... }: { + builder = { config, ... }: { networking.firewall.allowedTCPPorts = [ config.services.dendrite.httpPort ]; # Environment secrets diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix index 8fdaaa2..fb3a79e 100644 --- a/hosts/wsl/default.nix +++ b/hosts/wsl/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { wsl = { diff --git a/modules/baseline.nix b/modules/baseline.nix index b0c71f7..2fa9f3a 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -1,7 +1,4 @@ -{ pkgs, lib, ... }: -let - notDarwin = (! pkgs.stdenv.isDarwin); -in +{ pkgs, ... }: { # Enable flakes nix = { diff --git a/modules/nixos/backup.nix b/modules/nixos/backup.nix index 96f1a8c..8c9cfc4 100644 --- a/modules/nixos/backup.nix +++ b/modules/nixos/backup.nix @@ -5,7 +5,7 @@ let where = j: "${config.services.syncthing.dataDir}/${j.dest}"; - makeSyncFolders = name: job: { + makeSyncFolders = _: job: { devices = [ "chronicles" ]; enable = true; id = job.id; @@ -14,7 +14,7 @@ let type = "sendonly"; }; - makeRestic = name: job: + makeRestic = _: job: let who = "${config.services.syncthing.user}:${config.services.syncthing.group}"; in @@ -34,7 +34,7 @@ with lib; { default = { }; type = with types; attrsOf (submodule ( - { name, config, options, ... }: + { ... }: { options = { src = mkOption { diff --git a/modules/nixos/ceph.nix b/modules/nixos/ceph.nix index 62d82e1..7bd4cf1 100644 --- a/modules/nixos/ceph.nix +++ b/modules/nixos/ceph.nix @@ -10,7 +10,7 @@ let ensureUnitExists = c': name: let - unitName = (builtins.elemAt (builtins.split "\\." name) 0); + #unitName = (builtins.elemAt (builtins.split "\\." name) 0); in if c'.systemd.services ? unitName then name @@ -393,6 +393,8 @@ in "/run/wrappers" # `systemd.services..path` adds the `bin/` subdir of this ] ++ map ({ package, ... }: package) cephMonitoringSudoersCommandsAndPackages; + # Unused localOsdServiceName in the following line + # deadnix: skip makeCephOsdSetupSystemdService = localOsdServiceName: osdConfig: let osdExistenceFile = "/var/lib/ceph/osd/.${toString osdConfig.id}.${osdConfig.uuid}.nix-existence"; diff --git a/modules/nixos/container.nix b/modules/nixos/container.nix index 0ff5b8c..3ffa4c4 100644 --- a/modules/nixos/container.nix +++ b/modules/nixos/container.nix @@ -5,7 +5,7 @@ let # Create a container with all our default settings - makeContainer = name: container: + makeContainer = _: container: let agekey = "/etc/ssh/agenix_key"; in @@ -18,7 +18,7 @@ let "${agekey}".hostPath = "/etc/ssh/ssh_host_ed25519_key"; # This is needed for agenix to }; enableTun = container.tailscale; - config = { config, pkgs, ... }: { + config = { ... }: { imports = [ inputs.agenix.nixosModules.default inputs.self.modules.nixosModule diff --git a/modules/nixos/db.nix b/modules/nixos/db.nix index b9cd8ef..4142226 100644 --- a/modules/nixos/db.nix +++ b/modules/nixos/db.nix @@ -8,7 +8,7 @@ in options.greg.databases = lib.mkOption { default = { }; type = with lib.types; attrsOf (submodule ( - { name, config, options, ... }: { + { ... }: { # Options reserved for future expansion options = { }; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 15c5d9b..3d907eb 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, lib, ... }: +{ config, pkgs, lib, ... }: let x = diff --git a/modules/nixos/proxy.nix b/modules/nixos/proxy.nix index 2f56fb0..9aea945 100644 --- a/modules/nixos/proxy.nix +++ b/modules/nixos/proxy.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.greg.proxies; @@ -38,7 +38,7 @@ with lib; { ''; type = with types; attrsOf (submodule ( - { name, config, options, ... }: + { ... }: { options = { genAliases = mkOption { diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index 0776caf..bb26ab2 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.greg.sway; diff --git a/modules/nixos/syncthing.nix b/modules/nixos/syncthing.nix index 7b82aed..79fd0dc 100644 --- a/modules/nixos/syncthing.nix +++ b/modules/nixos/syncthing.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.greg.syncthing; diff --git a/overlays/default.nix b/overlays/default.nix index 46f34ed..7edee08 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,13 +16,6 @@ let ]; myPython = prev.python312.withPackages myPackages; - macOver = file: og: - if prev.stdenv.isDarwin then - (prev.callPackage file { }) else - prev."${og}"; - - buildFirefoxXpiAddon = final.nur.repos.rycee.lib.buildFirefoxXpiAddon; - is2405 = prev.lib.versionAtLeast prev.lib.version "24"; in @@ -31,7 +24,7 @@ rec { ## Testing adding python packages in the correct manner pythonPackagesExtensions = (prev.pythonPackagesExtensions or [ ]) ++ [ - (python-final: python-prev: + (python-final: _: let cp = python-final.callPackage; in { django-rapyd-modernauth = cp ./django-rapyd-modernauth.nix { }; graypy = cp ./graypy.nix { }; @@ -58,7 +51,7 @@ rec { brew = prev.callPackage ./homebrew.nix { }; copier = (if is2405 then prev.copier.overridePythonAttrs - (old: { + (_: { version = "9.1.0"; src = final.fetchFromGitHub { owner = "copier-org"; diff --git a/overlays/django-rapyd-modernauth.nix b/overlays/django-rapyd-modernauth.nix index 6dbfeb6..b9f2151 100644 --- a/overlays/django-rapyd-modernauth.nix +++ b/overlays/django-rapyd-modernauth.nix @@ -10,17 +10,6 @@ , zipp }: -let - pydeps = pypkgs: with pypkgs; [ - click - django - python-dotenv - pytz - setuptools - sqlparse - zipp - ]; -in buildPythonPackage rec { pname = "django-rapyd-modernauth"; version = "0.0.4"; diff --git a/overlays/packages.nix b/overlays/packages.nix index 522ae91..63bed4a 100644 --- a/overlays/packages.nix +++ b/overlays/packages.nix @@ -3,10 +3,6 @@ flake-utils.lib.eachDefaultSystemMap (system: let pkgs = (import nixunstable { inherit system; }); - lib = pkgs.lib; - callPackage = pkgs.lib.callPackageWith pkgs; - python = pkgs.packages.python3; - cp = pkgs.packages.python3.pkgs.callPackage; in { hms = pkgs.callPackage ./hms.nix { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index eaa21f4..ffa4907 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,11 +7,6 @@ let jeremiah = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0"; systems = [ genesis linode jude myself hosea jeremiah ]; - - user1 = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDLQRq55JKqLifX+31kEXyuoB8gfM+5thAlgR7XLPvvdu6g2a5cCWyozQ1I2oGbPRfJtzcJ5ifM7Ii2PuqAj3MdYFLHBEDOhIpBBWme9Ts2YB9HJ4NorBvB4zEfJd0Q7k2MmylyeBOwdwGz3bVqPRDcJbxWFMDHqr33FEs6SXdfyAQ5SvhWGARI84qz8zUUdOp6M4e3aIGO3cx1gA+YzYQ4FbUtL8+m1NFO8VoNFMZBMf5q0iF/SgEu5bmGWUCePia6DvfeBFQ2/y4Y7WmOj980WE+JmFTkIvmGruMYeGI8FuDQ2JIIIcehddy9bQbPF4VlGnTFsHqJYVRUUWc+vH1cPNMn01oB8s27ogf9e1lyhIN+cZOgp/jDt4eXcO4Wr04uwj7CI6m+d8iMQOa5Jv0hmNgqqiwOMVBlKeo0FCxlovzwvn/Lia9WZ74JqM6JwLCD8SZ0oFgiSIHOTHrQhr7iaCmj7X/0ey7VR8FnCrpeAJpG+ELTfWGshF1d9QR2zW7u4EsXTDLiuOmdJ+/KxwMvjMcWdlg2+Qch6SwulTQRxWaED2IWJo+YiAql8eaiVXu/eZJGLoiskGFZnONoLrzIT4pSjakPlrSpn/M/GkP1pDpaMkr24OhJsGpJNEU3F1ZcOMqy2iJzIxlPmU8Xg0I/OrnbJplpaXeRCqnmouJUJhWkaPzawaVyW7dtvprLWcpQtUgTRet18WLyOrLKlq1jwvNRMTPKUJ2IFJMpk2pNEP6bdiUxyMa4vrRIEU2p1zsYSUJpCRLtccZ/i/+yAqwnTA2L5TdAORi9nD2uCdM/Ljz52V3A14QapS6oqcoWx2soWKgnsbVXoG8DxmUTpll77Ze9t7Y5216SMInWuOu0vstP8ZcgFmWsiBgIYIuLA58abWHMxgD251phYidua6R3Gtkf8J/kYqTR1P6eJF1bt5efEg7FD2aL1QQZsYJo3CRNz7yVe1XqMdPbfe2mFXQVF9TDX5x6r9Ir3d0KiEmTlBdByz8nSyPJ8IQxC58NT4LNVQs3p2XH2Zcf6B4JOBSmV4NNBnLseFobsxniWjkWwZigED/D2iu3OXuuhmskCbw0hKy2rBcKffaSNMioVqYIiYNfKlMlSvAacQKqc/1HCpqgX8PwAcSgNSLy4K7/gIrTHmjY+g+CH7onzatWzkLo+0vsZRa/D/qwhhK2CU2FeU07mhnWxWuzqpJuqVaAwDTaEforK7nQUtAOFAZZP6qGhIoqsynYt4THb+QORb3QYfaP0PVgQwXfVU5Q8eUQFZ8A+siPtOASFjDumsIbseB5VzkF+UhvdseJwkX2+4pVFu8eHFDyvArYsHeGK6fBcQGJFQc2jSs6doIP9HD9IO2R ghelling@unknown38BAF87CD102"; - user4 = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQCoGGV3eD1oF0O62JZfCWNxmViRjRGQsfOhRkQfzQROkwDlFZ7S1+02fudD9t7mPtZE6dQ4yS2+6Q3NIfGW8NBbZAlWwsQ6PnrpuAhWpWc+ng/IDQd9CH/rBCt5bWSLL8AGHa4c+qde7iyoFGK0l9jXVD9wATBFQ274WTmPacVQVHmIAmJS6ISmR6vlq9eaDj1fX8wixao6WvzfwAUvXIs8nhPEfmtyu4T/1Eev9rVIxOw3ODQjk/E0VWV4Koeptsyc+V+j+XMyA91v8f20T4Uwe5LGnJHSQS0WavHnCMWHb1tzkmiKdaNCymoDUcUF2rywMYry7JN0kZo2mp2d7OzE/RP3bz/IsAI33+DwRlDYDNzgeLsLVmOJij61AtqBZque6WDcyCF8HN0ZaY0KJPOtNlN92+GUBRF/Faei0MXZ7wW2BZL5Bc7qnXc9USyhPNsm2vQ7LLhh/NtBGqB88+C+AidTTZ/xiIHKWZJXPkWLPRcK5cfaFqHFqcVMk4U+b0FYB95vYPKmjURlAZ6WrU6dNaNaMH9hJSE6/03is4hb4t8RCRiNaR41pEACDZbATjY0DInFn1LxxpUV66xfpOVg5hKm5ScIks3KxWJ8i3v4/cX7WvbDC/UzWb2UygpsqR7/1n5LV1SNPl+/qxFfdaOyZ8WVvx7DKGxkKfkPBgGwdpSthdv7BY+SC4sT9WXQAPGnvOIk6HwKhHjJYX7AIKK64ACfGZbjBC2gg7Ocl4HkgwpYYlUWLRJdJUhHOCi3VhPZDspYhw/UxPnUhYa8lxq5l7kgkks/tFe1qHOvPe3QRW6brg3EdJNkwtMrlrstW4/nph/KFqSshzNVDlEqTAnhE1cjbBZNmlHt1Un4ixcW1b8b86mE+472pSsIEfO8vxP26brQhxepJFZGOFv2vs3XDrrtn6IMJok4e+AQSCCY0kCcgfG5nMYXUoWpGyTpN/JLG0joJuhPWt58OaOzzKNPq2+rCVAbS7/UmDCqkwxjCywxOZRwluBsEWbZaLEdOwQOfIZQGwSDBM0hfHJJxMSaLN3rCe6VZb+c/5mFXUZ46L5mOGkRlO1TOEAe4jqawAQnuGaHN8mMWSw1gKM+UBXTKa0tBR6Aj/OSfPW0jU+mz/YzzJkzNnlRFiSrLxWvL4eXaBsMZvgKdpA41+E4JG8Vu+9D9KNGRnLASOCxRknV18MubZlEEyKby9A6TaKoPrz7GVQZP+36V9DtAJAza74nHSDNAQG/4w2BLOw9+VrDNdXwjMbgG+SN4f1K+e554OirtSMVB73VXjdwoH/FyX+7+dcUZRQ7V2n37jIVOE6CcuEPjzdnkvKSqBsdTO3Bt66+QtS9BwGHu5c01+Q7jvIl greg@nixos"; - user5 = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDR4vmc5TiymSjMB7E+oYsiTxOg+2xwnLAILYjQKPA7dIvz/A/HW31R1aVVxNEgkHm8qeqmgE1bUysMMl128zvdKmwkMmq2uagx9hboyfCwOYRaQOtpS0dlgSllhM654vL9553t94sTuMIfNUiXBD3EV2Z5JJ1RteCkBTJjzmXQnV9he0xozBYOdGv35UGneQzAr7Pps9iK81mR4yW+vLcW3pAaPmDBbN7C6WFxqcEBWsaJZK0rLCTrQo+6B130XgH6gPgh4GyDaRmtRJl63yANiP/RfkDFTPKOh87slLLZaHJUe94P2CTZw0e9xSzWuzx71nBp9JhkoZkI9XD+AnbHIZ9X3twIADUf+D0fivzOH+Yzne0gNRFa+O4x8xd/xj8QeM+Rr1ATikBf/FRfyx+RzHgHS1ZyOKfIpQbrm44E8Smv7FzS5RcCfAScSn0npOqP0cilYjtDCEoeMVsx4XQy4+iYLOA/EaMICSz2PwQFG/KXe7NK30Cc5flq5qUiz8TX1Mzlxuro4qTktYSXZBs5YyEg3Za/hcqMV52kVn0W8S1DatHOL4TlRKYeKsg1hWNvtm2MRqJvWkqK9vNNL86Ew5D5hgXdCk+AiRzOhQxfprPYMea2Vx1Mkaq3VYHWmJBWc/m4aOKUSajhFu8KG7l8bc4IkgC+qQCYzr6pCUDlCaCEF1iQ3lItSkbJJmRBHKEOb85lsIJ/SZ0bhsMl8bc9z33zY+bwv2NezG/aKVGrny4ZTAI1BKkZN/60L0yzJihyKamEa442jjnvG1jzC2wEtd/0gCGWScfZsQWqDu97spbeq8jrc67U9xqlGTrWyyNsCW2lpu26cQWWRC8ufl5zBNRDFDSYKceBaJ2+sx1GPj3YYdJSlTt5JvxNyBg0BGfGqCTd0w4IXF3KP9IZRWWAKPaOZcil2MRZwYhWEd7p+CtKVAL93uW0sE+0C13+iFMnBUkFBJ2dZH+tWpywCRYcrVNvrBlsHe2XniwBwvQHUFgKaQAB8upFTK1xBWTh2S+CVyNed/fckAUrPDj4sI2NERGcyPC5Oi6r0fUPtcWvKRfA/yXx5A0iNWc6acTqd5wwSO3s8rOCjIwdczZmkmnjAf3UKhmtDnwRd9rbO5Hanom80re9Dk0W+z9E2+70b9iYvZ60pbw+cG4WqEQnr02RS8hKvU0CsYFoDMTzV4snqTKNrl0IeD+Fmjl7oDkcC4YQbZd2902qVL3WHHvW+p0WQ1B/rk8BPVRYVmrUQbqwPFCQlmTe3Zy+LpqbWYemhQJGVSiEiioVNCc7pHO6RyWLCoEQKwKHAoNleKtkG94hT/d0z+1RYpB/nbJ51BPihK5EMlXbw/Hu1SVaaDLOSL6p greg@mm"; - user_genesis_virt = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFWPSFQT0AH77wrwRhiskcBS0w4ZakBRdJywYYBsnm3S greg@genesis"; user_ivr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMYzms+KIe5/bYF3uCyFjA5e1AgMPLIA3c4k417coqBe gregory.hellings@ls23003"; user_jude = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINnRc/kBhxcjpUtiRQY+BXnSObdp0jFL1395wAQxJip7 greg@jude";