remove linde
25 files changed, 40 insertions(+), 312 deletions(-)
changed files
- flake.nix
- scripts/os/update/buk
- scripts/os/update/r5
- scripts/os/update/smrk
- secrets/acme.age
- secrets/binarycache.age
- secrets/caddy.age
- secrets/codeberg-runner.age
- secrets/dyndns.age
- secrets/ntfy.age
- secrets/open-webui.age
- secrets/paperless.age
- secrets/pocket-id.age
- secrets/powerdns.age
- secrets/readeck.age
- secrets/redis-website.age
- secrets/secrets.nix
- secrets/syncthing.age
- secrets/vpsfreectl.age
- system/hosts/marvin.nix
- system/hosts/r6.nix
- user/settings/emacs/post-init.el
M flake.nix → flake.nix
@@ -130,17 +130,6 @@ ./system/hosts/r5.nix ./system/hosts/r5-hardware.nix ]; }; - nixosConfigurations.linde = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - srvos.nixosModules.server - srvos.nixosModules.hardware-hetzner-cloud-arm - agenix.nixosModules.default - ./packages/modules/nixos/git-pr.nix - ./system/hosts/linde.nix - ]; - }; nixosConfigurations.smrk = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; };@@ -203,15 +192,6 @@ homeConfigurations."alin@r5" = mkHomeConfiguration { system = "aarch64-linux"; modules = [ ./user/hosts/r5.nix - ]; - }; - homeConfigurations."alin@linde" = mkHomeConfiguration { - system = "aarch64-linux"; - modules = [ - ./user/hosts/server.nix - { - home.stateVersion = "22.11"; - } ]; }; homeConfigurations."alin@buk" = mkHomeConfiguration {
D scripts/os/update/linde
@@ -1,22 +0,0 @@ -#!/usr/bin/env fish -# update server with nixos-rebuild - -if test (path basename $PWD) != nixfiles - echo "not in nixfiles directory!" >&2 - return 1 -end - -argparse r/remote -- $argv - -set --local target (status basename) -set --local action (if test -n "$argv[1]"; echo $argv[1]; else echo "switch"; end) - -if set --query _flag_remote - set --function build_host --build-host root@{$target} -end - -nixos-rebuild $action \ - --flake .?submodules=1#{$target} \ - $build_host \ - --target-host root@{$target} \ - --no-reexec
M scripts/os/update/smrk → scripts/os/update/smrk
@@ -1,1 +1,22 @@ -linde+#!/usr/bin/env fish +# update server with nixos-rebuild + +if test (path basename $PWD) != nixfiles + echo "not in nixfiles directory!" >&2 + return 1 +end + +argparse r/remote -- $argv + +set --local target (status basename) +set --local action (if test -n "$argv[1]"; echo $argv[1]; else echo "switch"; end) + +if set --query _flag_remote + set --function build_host --build-host root@{$target} +end + +nixos-rebuild $action \ + --flake .?submodules=1#{$target} \ + $build_host \ + --target-host root@{$target} \ + --no-reexec
M secrets/codeberg-runner.age → secrets/codeberg-runner.age
@@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 cvV2sw stNMevymIYfdarnSf/bGzOAzBIHSdFu42FpxxMWKiWU -O/U1AygRRcIUAECDWVWQ//oGESzCm7zhegRer4IUUSU --> ssh-ed25519 knHzXw cJ+xEj8lTz0v601Jv/uiF4nDx+jmLN8jE2HZ20X1FRQ -uUpPqfFKT6optd7Z5JbAl3SILG+PWSkeVKi/g+D00vY --> piv-p256 VBDKjg AnlJEr2nb72PFMGTy6FjC1CyDx/MSoG5Dt/7SHpParGS -X423GwBQ/kxe3ah18On2lWkQO9YfwGvYzNageInyqys ---- f6b37j6INziUl3M2nNzPx+maFGZJrkn54tMMg5TZ7rA -ˆ<ÖÜŸ¾§¸#pY‰mà1à0¼%:Ù°ºáuøÚdEïö5Æá< -¨TÔ»h°Þ"h¹�˜ÓH „]ð±nK N„\4á9×XŒã+-> ssh-ed25519 knHzXw uB7baYwlumujat6pBv27c2+8Lb/TCSqwgmM2ELrrtiA +TWpxDGegypqS5Tl0xTd///Oi5Nuvv1y/4cm4ijOanjU +-> piv-p256 VBDKjg A3aNB8hEx2Mrzr5m/ZuhNCChMg5Z/VQzX6l+ioly2A2o +E3ds5WpoKEMWJXz0QLHN2NHPijgxiJp2VqnfiLZH3Gk +--- 8wHfNevBSPyUszb3ClBXYb6cHEvnEbTLqXPmpfb03Lo +fgÄ\!îuL‡p\Õão‘ +«Í³€Ââ²ÝoC¸È1Ÿ-~»Ëݳßå(f¼§ÑÁŸí¤c"ø x'Ø"dz�“Î×�{¥¾êd{¨ñ
M secrets/redis-website.age → secrets/redis-website.age
@@ -1,8 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 knHzXw 3zkErBCu1wsCrfBXqdPyL1j33yoBE6CXLC68LPYZ510 -Tj7T4D7ApyzLTcwc1e6vX6I1WDFGi6YSYkPwVrkKmzE --> piv-p256 VBDKjg Ax/yrCGuWa2J0V83uPfAmEMlE6N7eKttXzM3unauOCUD -z+PXRRyYea9O3IE/O5NE0B2Jb/gJN5FWuWXelLeQncw ---- WQl/OwZncpy+Mw2KOLcAk0NI5veMzrNuhZ26bmzwWT8 -HŽ[YZ–{SyùI…L�9¯¡4t\·Ú\;�Bãû?�,øµ´%ù짆tC:.^¤ûœŠL -#´?Wþ&+-> ssh-ed25519 knHzXw jPtwXJIgTdEw/uGaUHnDmkI73NzwwBst2R1gsYGyZHM +bp55xknAOwd+fojuhPPH6iiTSq6nDI8pJncPNHbKy+k +-> piv-p256 VBDKjg AoPLFWGxN4rHhEcPxuuZivPv5alhqvlbtfwvULEBxb+/ +NDm7CJZ2gE6sJOPik0V+9adeOL+6hYv+zc+pMmQmGkE +--- 9UViCoIJm4treBHyhyDqmaP5k1Cw0WGt7MlJvsLVKV8 +lÐ4CÇ(ÌÌžh +“Á"€!ÅŽõzË7 õï<�&vÒpCØß¹WqT×s'¾¬Úó®cË^s]�s
M secrets/secrets.nix → secrets/secrets.nix
@@ -6,24 +6,19 @@ ]; }; machines = { - linde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHdh3J7dEmh9G+CVmzFEC8/ont35ZXpCFcpLUO863vC"; r5 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAw70HIEZEBQ751WB9aA/mbk0aSebUsAiPIquQp0NcJ5"; smrk = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINU03etY1me+35aJ7DTJID60cHlvYx6lV8A6V+OiR7hr"; }; secrets = with machines; { acme = [ - linde smrk r5 ]; redis-website = [ smrk ]; - caddy = [ - linde - smrk - ]; + caddy = [ smrk ]; pocket-id = [ smrk ]; binarycache = [ smrk ]; paperless = [ smrk ];@@ -31,10 +26,7 @@ powerdns = [ smrk ]; ntfy = [ smrk ]; readeck = [ smrk ]; open-webui = [ smrk ]; - codeberg-runner = [ - linde - smrk - ]; + codeberg-runner = [ smrk ]; vpsfreectl = [ smrk ];
D system/hosts/linde-hardware.nix
@@ -1,48 +0,0 @@ -# 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. -{ - lib, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "virtio_pci" - "virtio_scsi" - "usbhid" - "sr_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/09c12218-c189-439a-9ef1-846b87538841"; - fsType = "ext4"; - }; - - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/1C43-4EC4"; - fsType = "vfat"; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/29793e8e-5c0d-4e5b-80e0-11252d786294"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; -}
D system/hosts/linde.nix
@@ -1,147 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running `nixos-help`). - -{ - lib, - pkgs, - ... -}: - -with lib; -let - netif = "eth0"; - hostname = "linde"; - net-ip4 = "116.203.248.56"; - net-mask4 = 32; - net-gw = "172.31.1.1"; - prefix6 = "2a01:4f8:c012:23a4"; - net-ip6 = "${prefix6}::1"; - net-mask6 = 64; - net-gw6 = "fe80::1"; - domain = "alin.ovh"; -in -{ - imports = [ - # Include the results of the hardware scan. - ./linde-hardware.nix - - ../roles/remote.nix - ../roles/server.nix - ../roles/reverse-proxy.nix - ../roles/forgejo-runner.nix - ../roles/nix-remote-builder.nix - ../roles/searchix.nix - ]; - - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - - environment.systemPackages = with pkgs; [ - cifs-utils - knot-dns - ]; - - # Initial empty root password for easy login: - users.users.root.initialHashedPassword = ""; - programs.ssh.extraConfig = '' - Host ${domain} git.${domain} - Hostname git.${domain} - User gitolite - ''; - - nix = { - settings = { - max-jobs = 2; - }; - - buildMachines = [ - { - protocol = "ssh-ng"; - sshUser = "nixremote"; - hostName = "granatum.opia.ovh"; - system = "aarch64-linux"; - maxJobs = 2; - speedFactor = 1; - supportedFeatures = [ "kvm" ]; - } - ]; - }; - - networking = { - hostName = hostname; - dhcpcd.enable = false; - nameservers = [ - "2606:4700:4700::1111" - "2606:4700:4700::1001" - "1.1.1.1" - "1.0.0.1" - ]; - hosts = lib.mkForce { - ${net-ip4} = [ - "${hostname}.${domain}" - hostname - ]; - ${net-ip6} = [ - "${hostname}.${domain}" - hostname - ]; - }; - defaultGateway = { - address = net-gw; - interface = netif; - }; - defaultGateway6 = { - address = net-gw6; - interface = netif; - }; - interfaces.${netif} = { - ipv4 = { - addresses = [ - { - address = net-ip4; - prefixLength = net-mask4; - } - ]; - routes = [ - { - address = net-gw; - prefixLength = 32; - } - ]; - }; - ipv6 = { - addresses = [ - { - address = net-ip6; - prefixLength = net-mask6; - } - ]; - }; - }; - resolvconf = { - enable = false; - useLocalResolver = false; - }; - }; - services.cloud-init.network.enable = false; - services.resolved = { - enable = true; - settings.Resolve = { - DNSSEC = true; - }; - }; - systemd.network.wait-online.enable = lib.mkForce true; - - zramSwap = { - enable = true; - algorithm = "zstd"; - }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? -}
M system/hosts/marvin.nix → system/hosts/marvin.nix
@@ -91,21 +91,6 @@ max-jobs = 4; cores = 8; }; - nix = { - distributedBuilds = true; - buildMachines = [ - { - protocol = "ssh-ng"; - sshUser = "nixremote"; - hostName = "linde"; - system = "aarch64-linux"; - maxJobs = 2; - speedFactor = 1; - supportedFeatures = [ "kvm" ]; - } - ]; - }; - nix.linux-builder = { enable = true; systems = [
M system/hosts/r6.nix → system/hosts/r6.nix
@@ -355,37 +355,8 @@ }; }; }; - users.groups.linde.members = [ ]; - users.users.linde = { - group = "linde"; - description = "Backup user for system 'linde'"; - isSystemUser = true; - shell = "/bin/sh"; - home = "/srv/backup/linde"; - homeMode = "755"; - createHome = true; - packages = with pkgs; [ rdiff-backup ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ74cPdIX9OlDkzHb6Y1E5sWqtIqMaf0z/SN3Tfy1Fjl root@linde" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNXwIdGcP1vKyjmgeLw/sJntn7lajaZivepgdzaXvOt rdiff-backup" - ]; - }; - nix = { distributedBuilds = true; - buildMachines = [ - { - protocol = "ssh-ng"; - sshUser = "nixremote"; - hostName = "linde.alanpearce.eu"; - system = "aarch64-linux"; - # TODO make secret - sshKey = "/root/.ssh/id_buche.alanpearce.eu_nixremote"; - maxJobs = 2; - speedFactor = 4; - supportedFeatures = [ ]; - } - ]; settings = { max-jobs = 2; builders-use-substitutes = true;
M user/settings/emacs/post-init.el → user/settings/emacs/post-init.el
@@ -681,9 +681,6 @@ (connection-local-set-profile-variables 'remote-direct-async-process '((tramp-direct-async-process . t))) - (connection-local-set-profiles '(:application tramp :machine "linde") - 'remote-direct-async-process) - (setq magit-tramp-pipe-stty-settings 'pty) (with-eval-after-load 'compile