From 8f3d1a592142d8b489399bd38d7749ace564ace0 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 4 Oct 2022 10:15:29 +0200 Subject: [PATCH] treewide nixpkgs update --- fixups.nix | 10 ++++ flake.lock | 77 ++++++++++++++---------- flake.nix | 103 +++++++++++++++++++------------- home-manager/desktop.nix | 8 +-- home-manager/emacs.nix | 3 +- home-manager/home.nix | 4 +- nixos/logical/zazu.nix | 2 +- nixos/physical/apu2c4.nix | 2 +- nixos/physical/hetznercloud.nix | 2 +- nixos/physical/nuc.nix | 39 ------------ nixos/physical/x11.nix | 4 +- nixos/roles/homeserver.nix | 4 +- nixos/roles/workstation.nix | 4 +- nixos/services/git.nix | 6 +- nixos/services/torrent-wg.nix | 2 +- nixos/sshkeys.nix | 3 + 16 files changed, 138 insertions(+), 135 deletions(-) delete mode 100644 nixos/physical/nuc.nix diff --git a/fixups.nix b/fixups.nix index 8e1503e..7f983c5 100644 --- a/fixups.nix +++ b/fixups.nix @@ -1,3 +1,13 @@ (pkgs: super: { + electrum = super.electrum.overrideAttrs (o: { + # todo: remove (194112) + postPatch = '' + # make compatible with protobuf4 by easing dependencies ... + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace "protobuf>=3.12,<4" "protobuf>=3.12" + # ... and regenerating the paymentrequest_pb2.py file + protoc --python_out=. electrum/paymentrequest.proto + ''; + }); }) diff --git a/flake.lock b/flake.lock index 214a081..4cac802 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1662241716, - "narHash": "sha256-urqPvSvvGUhkwzTDxUI8N1nsdMysbAfjmBNZaTYBZRU=", + "lastModified": 1664140963, + "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", "owner": "ryantm", "repo": "agenix", - "rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e", + "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", "type": "github" }, "original": { @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1663156788, - "narHash": "sha256-Z+KgxF/ZqANBToRi/wJVHM/+bEiNtnyCPusCYcKeuTU=", + "lastModified": 1664860004, + "narHash": "sha256-1+FKMhZH7se1Xobo8wRW6CW0Yz4isT9lkZcvYuwVfbs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a28218ac1fff0e9e4cd9bad9b5ad54dbdea964ad", + "rev": "20dc7a0a1ea9c40201c8fe1e29b91a50b5ecba9b", "type": "github" }, "original": { @@ -104,6 +104,20 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -126,11 +140,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1663099612, - "narHash": "sha256-ucokjFDRwCFWbcGiqxz0mfHv82UqwyW7RXY6ZgKSl80=", + "lastModified": 1664783440, + "narHash": "sha256-KlMwR7mUf5h8MPnzV7nGFUAt6ih/euW5xgvZ5x+hwvI=", "owner": "nix-community", "repo": "home-manager", - "rev": "60c6bfe322944d04bb38e76b64effcbd01258824", + "rev": "e4e639dd4dc3e431aa5b5f95325f9a66ac7e0dd9", "type": "github" }, "original": { @@ -140,15 +154,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1662898238, - "narHash": "sha256-HXBObJiPUC9xfOtQ/7VQNq90jCBvED4+C3AidBDahW0=", + "lastModified": 1664107902, + "narHash": "sha256-58SzPL6ZhSkijl8J+HNTgZc2IManB5CYouuoWlulf8k=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "b46e404ec92559c01dd751ce4f26d5cc2be568ea", + "rev": "d838f91d10773418622421e8580ddb862cde3ff0", "type": "github" }, "original": { @@ -159,11 +173,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1663133271, - "narHash": "sha256-juBxlETvfMetD/pUFLtdDLQ8BOayxROra8d5Hg6Zg1M=", + "lastModified": 1664628729, + "narHash": "sha256-A1J0ZPhBfZZiWI6ipjKJ8+RpMllzOMu/An/8Tk3t4oo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "93580fca1000c37e382d7e2c19c78c1c3852482d", + "rev": "3024c67a2e9a35450558426c42e7419ab37efd95", "type": "github" }, "original": { @@ -196,11 +210,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1662996720, - "narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=", + "lastModified": 1664780719, + "narHash": "sha256-Oxe6la5dSqRfJogjtY4sRzJjDDqvroJIVkcGEOT87MA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f326e2a403e1cebaec378e72ceaf5725983376d", + "rev": "fd54651f5ffb4a36e8463e0c327a78442b26cbe7", "type": "github" }, "original": { @@ -227,11 +241,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1662858143, - "narHash": "sha256-I/1BGOLo2C0gH4PDnUitqJ10oz7pk1PK+wtboTclZvM=", + "lastModified": 1664067728, + "narHash": "sha256-uUhnCcjlx99GA+PEN1EyDobrBFeVFIcdL6aBnhV7oB4=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "08ace8d434f46a2314366f0a220d2df642ed6a99", + "rev": "b627e4dc7430fa35fd4710987077f96c7b5623f5", "type": "github" }, "original": { @@ -242,11 +256,11 @@ }, "nixpkgs-mozilla": { "locked": { - "lastModified": 1657214286, - "narHash": "sha256-rO/4oymKXU09wG2bcTt4uthPCp1XsBZjxuCJo3yVXNs=", + "lastModified": 1664789696, + "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "0508a66e28a5792fdfb126bbf4dec1029c2509e0", + "rev": "80627b282705101e7b38e19ca6e8df105031b072", "type": "github" }, "original": { @@ -281,11 +295,11 @@ ] }, "locked": { - "lastModified": 1663143742, - "narHash": "sha256-jDwtbz+eFVnsveW6V2xshajwD5w5ZDV0jWJcMCYoMuE=", + "lastModified": 1664302111, + "narHash": "sha256-1f6Jg887PM9F91+HjIewp6aAPNK3ySj96kfLh9rS4IM=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e03f1cb970b6eb180e72dc7982f702b5af404e4b", + "rev": "4370a181d2c7cbefa4cd1c8bbae2e4a16b2573ae", "type": "github" }, "original": { @@ -298,6 +312,7 @@ "inputs": { "agenix": "agenix", "emacs-overlay": "emacs-overlay", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixos-mailserver": "nixos-mailserver", @@ -309,11 +324,11 @@ }, "utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 555619e..6188f9a 100644 --- a/flake.nix +++ b/flake.nix @@ -14,38 +14,34 @@ agenix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ nixpkgs, home-manager, nixpkgs-mozilla, emacs-overlay - , nixpkgs-wayland, nixpkgs-stable, nixos-hardware, agenix, self, ... }: { - overlays.default = nixpkgs.lib.composeManyExtensions [ - nixpkgs-wayland.overlay - #nixpkgs-mozilla.overlay - emacs-overlay.overlay - agenix.overlay - (import ./fixups.nix) - (import ./pkgs) - (import ./pkgs/mdr.nix) - (final: prev: { - nixpkgs-stable = import nixpkgs-stable { - system = prev.stdenv.system; - config = { }; - overlays = [ ]; + , nixpkgs-wayland, nixpkgs-stable, nixos-hardware, agenix, flake-utils, self + , ... }: + (flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: + let pkgs = self.legacyPackages.${system}; + in { + legacyPackages = import nixpkgs { + config = { + allowUnfree = true; + # chromium.vaapiSupport = true; + android_sdk.accept_license = true; }; - flake-inputs = inputs; - }) - (import ./nixos/overlay.nix) - ]; - legacyPackages.x86_64-linux = import nixpkgs { - config = { - allowUnfree = true; - # chromium.vaapiSupport = true; - android_sdk.accept_license = true; + inherit system; + overlays = [ self.overlays.default ]; }; - system = "x86_64-linux"; - overlays = builtins.attrValues self.overlays; - }; - nixosConfigurations = self.legacyPackages.x86_64-linux.yorick.machine; - homeConfigurations.x86_64-linux = - home-manager.lib.homeManagerConfiguration { - pkgs = self.legacyPackages.x86_64-linux; + + packages = { + yorick-home = self.homeConfigurations.${system}.activationPackage; + default = pkgs.linkFarm "yori-nix" ([{ + name = "yorick-home"; + path = self.packages.${system}.yorick-home; + }] ++ (map (n: { + name = n.toplevel.name; + path = n.toplevel; + }) (builtins.attrValues self.nixosConfigurations))); + }; + + homeConfigurations = home-manager.lib.homeManagerConfiguration { + inherit pkgs; modules = [ ./home-manager/home.nix { @@ -57,18 +53,39 @@ } ]; }; - packages.x86_64-linux.yorick-home = - self.homeConfigurations.x86_64-linux.activationPackage; - apps.x86_64-linux.update-home = { - type = "app"; - program = (self.legacyPackages.x86_64-linux.writeScript "update-home" '' - set -euo pipefail - old_profile=$(nix profile list | grep home-manager-path | head -n1 | awk '{print $4}') - echo $old_profile - nix profile remove $old_profile - ${self.packages.x86_64-linux.yorick-home}/activate || (echo "restoring old profile"; ${self.legacyPackages.x86_64-linux.nix}/bin/nix profile install $old_profile) - '').outPath; - }; - }; + # updater script for home profile + # works around https://github.com/nix-community/home-manager/issues/2848 + apps.update-home = flake-utils.lib.mkApp { + drv = pkgs.writeScript "update-home" '' + set -euo pipefail + old_profile=$(nix profile list | grep home-manager-path | head -n1 | awk '{print $4}') + echo $old_profile + nix profile remove $old_profile + ${ + self.packages.${system}.yorick-home + }/activate || (echo "restoring old profile"; ${pkgs.nix}/bin/nix profile install $old_profile) + ''; + }; + })) // { + overlays.default = nixpkgs.lib.composeManyExtensions [ + nixpkgs-wayland.overlay + #nixpkgs-mozilla.overlay + emacs-overlay.overlay + agenix.overlay + (import ./fixups.nix) + (import ./pkgs) + (import ./pkgs/mdr.nix) + (final: prev: { + nixpkgs-stable = import nixpkgs-stable { + system = prev.stdenv.system; + config = { }; + overlays = [ ]; + }; + flake-inputs = inputs; + }) + (import ./nixos/overlay.nix) + ]; + nixosConfigurations = self.legacyPackages.x86_64-linux.yorick.machine; + }; } diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 50fe2f6..081d256 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -79,9 +79,9 @@ in { "XF86MonBrightnessDown" = exec light "light -T 0.9"; "ctrl+XF86MonBrightnessUp" = exec light "light -A 1"; "ctrl+XF86MonBrightnessDown" = exec light "light -U 1"; - "XF86AudioLowerVolume" = exec alsaUtils "amixer set Master 1%-"; - "XF86AudioRaiseVolume" = exec alsaUtils "amixer set Master 1%+"; - "XF86AudioMute" = exec alsaUtils "amixer set Master toggle"; + "XF86AudioLowerVolume" = exec alsa-utils "amixer set Master 1%-"; + "XF86AudioRaiseVolume" = exec alsa-utils "amixer set Master 1%+"; + "XF86AudioMute" = exec alsa-utils "amixer set Master toggle"; "XF86AudioPause" = "exec playerctl pause"; "XF86AudioPlay" = "exec playerctl play"; "${mod}+Shift+s" = exec bin.screenshot_public "screenshot_public >> ~/screenshot-public.log"; @@ -179,7 +179,7 @@ in { QT_QPA_PLATFORM = "wayland"; _JAVA_AWT_WM_NONREPARENTING = "1"; XCURSOR_THEME = "Adwaita"; - XCURSOR_PATH = "${pkgs.gnome3.adwaita-icon-theme}/share/icons"; + XCURSOR_PATH = "${pkgs.gnome.adwaita-icon-theme}/share/icons"; XDG_CURRENT_DESKTOP = "sway"; }; # todo: use home-manager unit diff --git a/home-manager/emacs.nix b/home-manager/emacs.nix index dd40c0f..69ce3a2 100644 --- a/home-manager/emacs.nix +++ b/home-manager/emacs.nix @@ -1,6 +1,5 @@ { lib, config, options, pkgs, ... }: let epkgs = pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp; - engpkgs = pkgs.emacsPackagesNgFor pkgs.emacsPgtkNativeComp; in { programs.emacs = { enable = true; @@ -77,6 +76,7 @@ in { pandoc-mode projectile reason-mode + rescript-mode request s solarized-theme @@ -87,7 +87,6 @@ in { vue-mode weechat which-key - ]) ++ (with engpkgs; [ crdt doom-modeline evil-goggles diff --git a/home-manager/home.nix b/home-manager/home.nix index 7ece0ea..ca5b23e 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -152,7 +152,7 @@ in { gcr.out git-absorb github-cli - gmailieer + lieer htop kcachegrind lm_sensors @@ -243,7 +243,7 @@ in { smartmontools unzip vim - xdg_utils + xdg-utils #wlrctl ## coins diff --git a/nixos/logical/zazu.nix b/nixos/logical/zazu.nix index 1e5b77d..4da6a3d 100644 --- a/nixos/logical/zazu.nix +++ b/nixos/logical/zazu.nix @@ -58,7 +58,7 @@ "network-link-enp1s0.service" ]; before = [ "network-setup.service" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/physical/apu2c4.nix b/nixos/physical/apu2c4.nix index 45bffa4..957051e 100644 --- a/nixos/physical/apu2c4.nix +++ b/nixos/physical/apu2c4.nix @@ -18,5 +18,5 @@ swapDevices = [{ device = "/dev/disk/by-uuid/5f8f358d-f63c-48ad-a322-d1aeb403e4ff"; }]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; } diff --git a/nixos/physical/hetznercloud.nix b/nixos/physical/hetznercloud.nix index 9bc7d64..d9f41a3 100644 --- a/nixos/physical/hetznercloud.nix +++ b/nixos/physical/hetznercloud.nix @@ -21,7 +21,7 @@ in { swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 1; + nix.settings.max-jobs = lib.mkDefault 1; #services.nscd.enable = false; networking.dhcpcd.enable = false; systemd.network.enable = true; diff --git a/nixos/physical/nuc.nix b/nixos/physical/nuc.nix deleted file mode 100644 index 7140247..0000000 --- a/nixos/physical/nuc.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, lib, pkgs, inputs, modulesPath, ... }: -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ./. - inputs.nixos-hardware.nixosModules.common-cpu-intel - ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/3e148654-0ed8-4354-8159-e3499c6fa299"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/439E-26EA"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - - nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - }; - hardware.opengl.extraPackages = with pkgs; - [ - intel-media-driver # only available starting nixos-19.03 or the current nixos-unstable - ]; -} diff --git a/nixos/physical/x11.nix b/nixos/physical/x11.nix index 5e8a874..dfd0fa4 100644 --- a/nixos/physical/x11.nix +++ b/nixos/physical/x11.nix @@ -11,9 +11,7 @@ boot.zfs.requestEncryptionCredentials = true; boot.supportedFilesystems = [ "zfs" ]; - # FIXME: https://bugzilla.kernel.org/show_bug.cgi?id=215768 - #boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; - boot.kernelPackages = pkgs.linuxPackages_5_15; + boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; networking.wireless.iwd.enable = true; networking.hostId = "54a8968e"; diff --git a/nixos/roles/homeserver.nix b/nixos/roles/homeserver.nix index 63a58e1..c1b0fd5 100644 --- a/nixos/roles/homeserver.nix +++ b/nixos/roles/homeserver.nix @@ -1,8 +1,8 @@ { lib, ... }: { users.users.lars = { isNormalUser = true; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbieYUtRGQ4nf4glQvrZDn72doP6W2uw2z9VqFq5sZLROXYa4jW8nwx4h+BiArGs+VPwn6lfsP19PX6yNIk74C/SkO26S1Zvbe7ffNusi6PH2BQIOWeAYKk+eZH+ZOeD8z07uDB7QffwRLwzSaPFg+zfRzsMFoXH/GE9qOQ4lnfk8czTZL7zbZf/yS7mDFztClXFciYsVwgRXNiFpfc+9mOkU0oBWtGo/WGUhB0Hds3a4ylyjjVAcC/l1H2bvc/Q3d6bbn23pUFl2V78Yg1B4b1MT34qbBV6whXAQd7KM9tND2ZhpF2XQ7Spi1QlOac0jup+sE+3bbvcjNqTI05DwJO/dX5F2gSAFkvSY4ZPqSX5ilE/hj4DQuhRgLmQdbVl5IFV9aLYqUvJcCqX9jRFMly4YTFXsFz18rGkxOYGZabcE1usBM2zRVDTtEP6Si5ii76Ocvp8aNFBB2Kf1whg8tziTv3kQEQ9fd2sRtE2J3xveJiwXjUBU2uikSOKe8JP47Tb6PYlv7Ty/6OI51aUQn++R72VNajdBJ1r1osp7leqTJ+sXuLlWLo/a7lDpDmgEI7dbxqmpjLcMce0JzqLKlP1Q2U/nkYy86xkjSTH1rNUI2JAbJx3iTcGy7bq12yfjNfcGAqY4GVXvisK1cpbF0RCjaFExwtmzorljHh6ZHjQ==" + openssh.authorizedKeys.keys = with (import ../sshkeys.nix); [ + lars ]; }; services.avahi = { diff --git a/nixos/roles/workstation.nix b/nixos/roles/workstation.nix index 2977e3e..29fca5b 100644 --- a/nixos/roles/workstation.nix +++ b/nixos/roles/workstation.nix @@ -61,7 +61,7 @@ security.rtkit.enable = true; services.pipewire = { enable = true; - # TODO (segfaults) + # TODO (segfaults, 192044) package = pkgs.pipewire.override { libcameraSupport = false; }; alsa.enable = true; alsa.support32Bit = true; # todo: support32bit? @@ -87,7 +87,7 @@ inconsolata # monospaced source-code-pro ubuntu_font_family # Ubuntu fonts - source-han-sans-japanese + source-han-sans iosevka emojione font-awesome diff --git a/nixos/services/git.nix b/nixos/services/git.nix index 392407f..11e4927 100644 --- a/nixos/services/git.nix +++ b/nixos/services/git.nix @@ -27,11 +27,11 @@ in { domain = cfg.vhost; rootUrl = "https://${cfg.vhost}/"; httpAddress = "localhost"; - cookieSecure = true; - log.level = "Warn"; - disableRegistration = true; + settings.log.LEVEL = "Warn"; settings.service = { + DISABLE_REGISTRATION = true; REGISTER_EMAIL_CONFIRM = false; + COOKIE_SECURE = true; ENABLE_NOTIFY_MAIL = false; REQUIRE_SIGNIN_VIEW = false; }; diff --git a/nixos/services/torrent-wg.nix b/nixos/services/torrent-wg.nix index e5d9dd6..aaded44 100644 --- a/nixos/services/torrent-wg.nix +++ b/nixos/services/torrent-wg.nix @@ -19,7 +19,7 @@ in { }]; interfaceNamespace = cfg.namespace; preSetup = '' - ${pkgs.iproute}/bin/ip netns add "${cfg.namespace}" || true + ${pkgs.iproute2}/bin/ip netns add "${cfg.namespace}" || true ''; }; environment.etc."netns/torrent/resolv.conf".text = '' diff --git a/nixos/sshkeys.nix b/nixos/sshkeys.nix index ff9f9e1..748c050 100644 --- a/nixos/sshkeys.nix +++ b/nixos/sshkeys.nix @@ -5,4 +5,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDo1N5E6qkb3McJOvv0PqI7E8iYLAcjil5RWc+zeTtN/" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFQm2OJ8PlnDHfI7FV3hddXP0t2jgKAiCnnuWIc+LK4dnyGmlC/ihIe9KhSENZEnzVAXnYAMOoOvpkVa5p0Itf1n0anCK3k2vDq0Jz9nY3ZXmkSHE09QGCpSG8kU6j+zWJPo2jWYNtxYMRmmHAuzzOdlPY9Q199PEvHVaqzpSVhIdhqhEcmap8oqHW6KbJu+17nLGGQB5XiTB1SlTxbg62copA9KMcvQzNGIooKs5QyrU/B0g05EfbogH7xOLbwYAK676DTUBEcKpEUYFMMv+DBcU4cH2EI6UTLxI5ohrS1pxk20zu5nTRMlQRUETpWN4EbEPfOzF8FW1YOwdttfCas8D6Y6t9gA4o8GpylBG9AElVw7VyOFeBR+AtchormH+wH6nZEvzs6wg2d84I8xo5qYGUJIQS7OYxypjlY01IFCCa/7rjzXGDmdWAP/UEu85ys9FSryn9Ey5DXDQOqhMHguOwQDUyaArWyRCCBzKbx6cPZw2D9bLfDxbnaC2/5dVyxHJXoWmwneX2E/UT5QwtG1nyLShIZhYgO9lfDpO61Mz9Jjap3sj6mJPxHZc5SGye0j47xV6kX4vbSgfoSHHnasaI3fR2ZBS7tnfq1ebxXqFFSPHK6uHjLgDHtkMisvjOVZnybuXB296pjv6K1o2G3qlUnImOqfxZxvuy4Xl/mw== cardno:000607186578" ]; + lars = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbieYUtRGQ4nf4glQvrZDn72doP6W2uw2z9VqFq5sZLROXYa4jW8nwx4h+BiArGs+VPwn6lfsP19PX6yNIk74C/SkO26S1Zvbe7ffNusi6PH2BQIOWeAYKk+eZH+ZOeD8z07uDB7QffwRLwzSaPFg+zfRzsMFoXH/GE9qOQ4lnfk8czTZL7zbZf/yS7mDFztClXFciYsVwgRXNiFpfc+9mOkU0oBWtGo/WGUhB0Hds3a4ylyjjVAcC/l1H2bvc/Q3d6bbn23pUFl2V78Yg1B4b1MT34qbBV6whXAQd7KM9tND2ZhpF2XQ7Spi1QlOac0jup+sE+3bbvcjNqTI05DwJO/dX5F2gSAFkvSY4ZPqSX5ilE/hj4DQuhRgLmQdbVl5IFV9aLYqUvJcCqX9jRFMly4YTFXsFz18rGkxOYGZabcE1usBM2zRVDTtEP6Si5ii76Ocvp8aNFBB2Kf1whg8tziTv3kQEQ9fd2sRtE2J3xveJiwXjUBU2uikSOKe8JP47Tb6PYlv7Ty/6OI51aUQn++R72VNajdBJ1r1osp7leqTJ+sXuLlWLo/a7lDpDmgEI7dbxqmpjLcMce0JzqLKlP1Q2U/nkYy86xkjSTH1rNUI2JAbJx3iTcGy7bq12yfjNfcGAqY4GVXvisK1cpbF0RCjaFExwtmzorljHh6ZHjQ==" + ]; }