diff --git a/flake.nix b/flake.nix index 2d20545..411c60c 100644 --- a/flake.nix +++ b/flake.nix @@ -8,26 +8,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - website = { - url = "github:thiloho/website"; - flake = false; - }; - aurora-blog-template = { - url = "github:thiloho/aurora"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - denbot = { - url = "github:thiloho/discord-bot"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - todos = { - url = "github:thiloho/todos"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - agenix = { - url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs@{ nixpkgs, home-manager, ... }: { @@ -51,7 +31,6 @@ in { pc = mkSystem ./nixos-configurations/pc; laptop = mkSystem ./nixos-configurations/laptop; - server = mkSystem ./nixos-configurations/server; }; }; } diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix index bafe178..de4de8e 100644 --- a/nixos-configurations/laptop/default.nix +++ b/nixos-configurations/laptop/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, ... }: +{ inputs, ... }: { imports = [ @@ -12,13 +12,7 @@ home-manager.users.thiloho = { pkgs, ... }: { programs.git.signing.key = "BFD8F6A55B1E4F11"; - home = { - packages = with pkgs; - [ - # ciscoPacketTracer8 - ]; - stateVersion = "23.05"; - }; + home = { stateVersion = "23.05"; }; }; system.stateVersion = "23.05"; } diff --git a/nixos-configurations/laptop/hardware-configuration.nix b/nixos-configurations/laptop/hardware-configuration.nix index a897547..405365d 100644 --- a/nixos-configurations/laptop/hardware-configuration.nix +++ b/nixos-configurations/laptop/hardware-configuration.nix @@ -4,28 +4,26 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/c930419a-6c2f-452a-9e58-c92979ab8f3d"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/c930419a-6c2f-452a-9e58-c92979ab8f3d"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/EF76-673F"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/EF76-673F"; + fsType = "vfat"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/5ec2362b-c256-4097-8d48-5460002d0978"; } - ]; + [{ device = "/dev/disk/by-uuid/5ec2362b-c256-4097-8d48-5460002d0978"; }]; # 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 @@ -36,5 +34,6 @@ # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/nixos-configurations/pc/default.nix b/nixos-configurations/pc/default.nix index 29263e9..d7bb479 100644 --- a/nixos-configurations/pc/default.nix +++ b/nixos-configurations/pc/default.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, lib, ... }: +{ inputs, ... }: { imports = [ diff --git a/nixos-configurations/server/default.nix b/nixos-configurations/server/default.nix deleted file mode 100644 index 7546d23..0000000 --- a/nixos-configurations/server/default.nix +++ /dev/null @@ -1,294 +0,0 @@ -{ inputs, pkgs, config, lib, ... }: - -{ - imports = [ - inputs.agenix.nixosModules.default - ./hardware-configuration.nix - ../shared.nix - ]; - - nix.settings.trusted-users = [ "thiloho" ]; - - age.secrets = { - hedgedoc-environment-file.file = - ../../secrets/hedgedoc-environment-file.age; - discord-bot-token.file = ../../secrets/discord-bot-token.age; - todos-environment-file.file = ../../secrets/todos-environment-file.age; - "restic/minecraft-environment-file".file = - ../../secrets/restic/minecraft-environment-file.age; - "restic/minecraft-repository".file = - ../../secrets/restic/minecraft-repository.age; - "restic/minecraft-password".file = - ../../secrets/restic/minecraft-password.age; - "restic/hedgedoc-environment-file".file = - ../../secrets/restic/hedgedoc-environment-file.age; - "restic/hedgedoc-repository".file = - ../../secrets/restic/hedgedoc-repository.age; - "restic/hedgedoc-password".file = - ../../secrets/restic/hedgedoc-password.age; - "restic/todos-environment-file".file = - ../../secrets/restic/todos-environment-file.age; - "restic/todos-repository".file = ../../secrets/restic/todos-repository.age; - "restic/todos-password".file = ../../secrets/restic/todos-password.age; - "restic/discord-bot-environment-file".file = - ../../secrets/restic/discord-bot-environment-file.age; - "restic/discord-bot-repository".file = - ../../secrets/restic/discord-bot-repository.age; - "restic/discord-bot-password".file = - ../../secrets/restic/discord-bot-password.age; - }; - - environment.systemPackages = with pkgs; [ nodejs_20 ]; - - networking = { - hostName = "server"; - firewall = { - allowedTCPPorts = [ 80 443 25565 3232 ]; - allowedUDPPorts = [ 80 443 25565 3232 ]; - }; - }; - - services = { - openssh = { - enable = true; - settings.PasswordAuthentication = false; - }; - minecraft-server = { - enable = true; - eula = true; - declarative = true; - openFirewall = true; - whitelist = { - thilo_ho = "4e4d744d-7748-46bc-add8-b3e8ca3b4cf5"; - Liaxswan = "ccbf3468-a6b4-4d7b-9837-5a2451deca79"; - }; - serverProperties = { - difficulty = 3; - max-players = 10; - motd = "Thilo's SMP"; - white-list = true; - }; - }; - nginx = { - enable = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts = { - "thilohohlt.com" = { - enableACME = true; - forceSSL = true; - root = inputs.website; - }; - "aurora.thilohohlt.com" = { - enableACME = true; - forceSSL = true; - root = inputs.aurora-blog-template.packages.${pkgs.system}.default; - }; - "collab.thilohohlt.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://localhost:3300"; - locations."/socket.io/" = { - proxyPass = "http://localhost:3300"; - proxyWebsockets = true; - extraConfig = "proxy_ssl_server_name on;"; - }; - }; - "todos.thilohohlt.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://localhost:5173"; - }; - "git.thilohohlt.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://localhost:3001"; - }; - }; - }; - hedgedoc = { - enable = true; - settings = { - port = 3300; - domain = "collab.thilohohlt.com"; - db = { - dialect = "postgres"; - host = "/run/postgresql"; - database = "hedgedoc"; - }; - protocolUseSSL = true; - allowAnonymous = false; - allowEmailRegister = false; - email = false; - }; - environmentFile = config.age.secrets.hedgedoc-environment-file.path; - }; - gitea = { - enable = true; - appName = "Gitea instance of Thilo"; - database = { - type = "postgres"; - host = "/run/postgresql"; - }; - settings.service.DISABLE_REGISTRATION = true; - settings.server = { - DOMAIN = "thilohohlt.com"; - ROOT_URL = "https://git.thilohohlt.com"; - HTTP_PORT = 3001; - }; - }; - invidious = { - enable = true; - port = 3232; - domain = "invidious.thilohohlt.com"; - nginx.enable = true; - settings = { - db.user = "invidious"; - registration_enabled = false; - }; - }; - postgresql = { - enable = true; - package = pkgs.postgresql_15; - ensureDatabases = [ "dcbot" "hedgedoc" "todos" "gitea" ]; - ensureUsers = [ - { - name = "hedgedoc"; - ensureDBOwnership = true; - } - { - name = "gitea"; - ensureDBOwnership = true; - } - ]; - authentication = lib.mkForce '' - #type database DBuser auth-method - local all all trust - ''; - }; - restic.backups = { - minecraft-backup = { - initialize = true; - - environmentFile = - config.age.secrets."restic/minecraft-environment-file".path; - repositoryFile = config.age.secrets."restic/minecraft-repository".path; - passwordFile = config.age.secrets."restic/minecraft-password".path; - - paths = [ "/var/lib/minecraft/world" ]; - - pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ]; - }; - hedgedoc-database-backup = { - initialize = true; - - environmentFile = - config.age.secrets."restic/hedgedoc-environment-file".path; - repositoryFile = config.age.secrets."restic/hedgedoc-repository".path; - passwordFile = config.age.secrets."restic/hedgedoc-password".path; - - paths = - [ "/var/lib/hedgedoc/uploads" "/var/lib/hedgedoc/hedgedoc.dump" ]; - - backupPrepareCommand = '' - ${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc hedgedoc > /var/lib/hedgedoc/hedgedoc.dump - ''; - - pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ]; - }; - todos-database-backup = { - initialize = true; - - environmentFile = - config.age.secrets."restic/todos-environment-file".path; - repositoryFile = config.age.secrets."restic/todos-repository".path; - passwordFile = config.age.secrets."restic/todos-password".path; - - paths = [ "/var/lib/todos.dump" ]; - - backupPrepareCommand = '' - ${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc todos > /var/lib/todos.dump - ''; - - pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ]; - }; - discord-bot-database-backup = { - initialize = true; - - environmentFile = - config.age.secrets."restic/discord-bot-environment-file".path; - repositoryFile = - config.age.secrets."restic/discord-bot-repository".path; - passwordFile = config.age.secrets."restic/discord-bot-password".path; - - paths = [ "/var/lib/dcbot.dump" ]; - - backupPrepareCommand = '' - ${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc dcbot > /var/lib/dcbot.dump - ''; - - pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ]; - }; - }; - }; - - security = { - acme = { - acceptTerms = true; - defaults.email = "thilo.hohlt@tutanota.com"; - }; - }; - - systemd.services = { - todoapp = { - description = "Todo application to plan your daily tasks effectively"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "simple"; - Environment = - "PORT=5173 DOTENV_CONFIG_PATH=${config.age.secrets.todos-environment-file.path}"; - ExecStart = "${pkgs.nodejs_20}/bin/node -r dotenv/config ."; - WorkingDirectory = inputs.todos.packages.${pkgs.system}.default; - Restart = "always"; - }; - }; - todoapp-check-due-dates = { - description = - "Set is_overdue for todo in database to true if todo is overdue"; - wantedBy = [ "timers.target" ]; - path = [ pkgs.postgresql_15 ]; - script = '' - psql -d todos -c "UPDATE user_todo SET is_overdue = true WHERE DATE_TRUNC('day', NOW() AT TIME ZONE 'CET') > due_date AND is_completed = false AND is_overdue = false" - ''; - serviceConfig = { User = "postgres"; }; - partOf = [ "todoapp.service" ]; - startAt = "daily"; - }; - denbot = { - description = "Thilo's Den discord bot"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "simple"; - ExecStartPre = [ - "${pkgs.nodejs_20}/bin/node dbInit.js" - "${pkgs.nodejs_20}/bin/node deploy-commands.js --token=${config.age.secrets.discord-bot-token.path} --clientId=1142441791459704912" - ]; - ExecStart = - "${pkgs.nodejs_20}/bin/node index.js --token=${config.age.secrets.discord-bot-token.path}"; - WorkingDirectory = inputs.denbot.packages.${pkgs.system}.default; - Restart = "always"; - }; - }; - }; - - users.users.thiloho.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkvr+vT7Ik0fjquxb9xQBfVVWJPgrfC+vJZsyG2V+/G thiloho@pc" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5jOELdhQ85uKV8l2QkbLhjdPr142p1AmPzpawaJ7ws thiloho@laptop" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA2jCxyYIisj7/tFdFewdCvxMHk3fNDkL8cFjowub7wV thiloho@pixelphone" - ]; - - home-manager.users.thiloho = { pkgs, lib, ... }: { - home = { stateVersion = "23.05"; }; - }; - system.stateVersion = "23.05"; -} diff --git a/nixos-configurations/server/hardware-configuration.nix b/nixos-configurations/server/hardware-configuration.nix deleted file mode 100644 index b32cf25..0000000 --- a/nixos-configurations/server/hardware-configuration.nix +++ /dev/null @@ -1,36 +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. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - - boot.initrd.availableKernelModules = - [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/950d0289-1ae9-4c4b-8792-3f369e2d0f05"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/08B5-9946"; - fsType = "vfat"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/d3ecc375-0371-4391-ad48-b79168737ec7"; }]; - - # 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/nixos-configurations/shared-desktop.nix b/nixos-configurations/shared-desktop.nix index 5866ebc..13c7b7c 100644 --- a/nixos-configurations/shared-desktop.nix +++ b/nixos-configurations/shared-desktop.nix @@ -55,8 +55,9 @@ programs = { firefox = { enable = true; - package = - pkgs.firefox-devedition.override { cfg = { speechSynthesisSupport = true; }; }; + package = pkgs.firefox-devedition.override { + cfg = { speechSynthesisSupport = true; }; + }; }; chromium = { enable = true; diff --git a/nixos-configurations/shared.nix b/nixos-configurations/shared.nix index 6b8b87e..6afcde6 100644 --- a/nixos-configurations/shared.nix +++ b/nixos-configurations/shared.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, ... }: +{ pkgs, ... }: { boot = { @@ -30,11 +30,8 @@ enable = true; shellAliases = { rbs = "sudo nixos-rebuild switch --flake ."; - off = "sudo systemctl poweroff"; cleanup = "nix store optimise && nix-collect-garbage -d && sudo nix store optimise && sudo nix-collect-garbage -d"; - listboots = - "nix profile history --profile /nix/var/nix/profiles/system"; }; }; helix = { @@ -43,6 +40,5 @@ settings.theme = "ayu_dark"; }; }; - home.packages = [ inputs.agenix.packages."x86_64-linux".default ]; }; } diff --git a/secrets/discord-bot-token.age b/secrets/discord-bot-token.age deleted file mode 100644 index d96f719..0000000 --- a/secrets/discord-bot-token.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA GIWZXYxMprQgnKyf6eHbmdAbm2BQ8qmXcNOCx6xACAM -KxoFMCq6BqOW0ZL+mPz084AsrJiYwd65TQbT3lm5C7Q --> ssh-ed25519 dRl0SQ 0lwzyhATdftLsGB+9yk3MWIjROdVDNiXUZ3zlSGMtXQ -C1PQpcq6mftSr9nWP7wteHQnK4/jNEzWBDPrVdlYg5Q --> H\-grease ika_t} ('9'r F[ z6"b$ -FjkIPhH4Cd1a ---- ERGBSp2uqfpO5fYXK8QfCmM6MOb2oGJ/PchtAV4INdA -7扷>q bkq>$[<<<+뺣w rt;u_R(0za.ɼ4f,ykk7ļ5ߋޮW7! \ No newline at end of file diff --git a/secrets/hedgedoc-environment-file.age b/secrets/hedgedoc-environment-file.age deleted file mode 100644 index b56f3ce..0000000 Binary files a/secrets/hedgedoc-environment-file.age and /dev/null differ diff --git a/secrets/restic/discord-bot-environment-file.age b/secrets/restic/discord-bot-environment-file.age deleted file mode 100644 index 664271e..0000000 Binary files a/secrets/restic/discord-bot-environment-file.age and /dev/null differ diff --git a/secrets/restic/discord-bot-password.age b/secrets/restic/discord-bot-password.age deleted file mode 100644 index 65231fb..0000000 --- a/secrets/restic/discord-bot-password.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA ch9l8hAmzPcDLcDqgHx7CvEHya5Cc+W6WPG5NFWVWAg -T+Mb5yxPCSo32EKbpxj/Ll8reLe4sosTd9ENjYV3B0c --> ssh-ed25519 dRl0SQ lPdA7HcBt03GR/EYXs+9N2gPMwEksgQKCSEJHiUYnAU -QXruj7Ao1Tap/ai5JYOmxBjIYvocmMYVX2GuCyxSqdI --> SN)(9z-grease CF C B!|*qlm -GobRjNqLfEwntbsGa3MpYqYFqkh80ZmtmXVesUKTjAaykeon9mGkW6cI3weL91Dp -Jyk5IF10fScpCERAqgUCMPkQ56oFtGESwnZUILqeKIk0QWAZMJWtkBse+AqizX8 ---- LTF3BpAb4BipCsqr+igNNnu3Guc1JBIgczy5+0S8W4Q -][YWF#pFYh@Ґ|򈪮];V]qew \ No newline at end of file diff --git a/secrets/restic/discord-bot-repository.age b/secrets/restic/discord-bot-repository.age deleted file mode 100644 index adc1f51..0000000 --- a/secrets/restic/discord-bot-repository.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA lQ3x2Yje/1js+SYkhWvkDtglDMOJySt8FyW+FfQY4Es -DfJ3VW7sIx9W7PaLxWod+GSMvYL2763QtI9EJ1Kxt90 --> ssh-ed25519 dRl0SQ iTLFTejTbILB/obvLiQB9vAVYBzqTAWaQFtU1iSFwAc -/d5xXO4FH57DZQ1bpOom6aX5uujD1SUIpXC9W5u/EKo --> aHYOr}px-grease z x -ElchruvBqkjNuIDKNjIniZulfDwSc/0zvZDpmIUCjVk2jj2z/Cty0A6yRhDMpr7s -/S5arjCA2zk ---- V3FO3trpSDAmwYqDqiS50rzGT6WlOvb5irsfkTSabdY -Gfqi \v~'nr4!<9fYŽ 8-e b9?xi \ No newline at end of file diff --git a/secrets/restic/hedgedoc-environment-file.age b/secrets/restic/hedgedoc-environment-file.age deleted file mode 100644 index a1007b6..0000000 Binary files a/secrets/restic/hedgedoc-environment-file.age and /dev/null differ diff --git a/secrets/restic/hedgedoc-password.age b/secrets/restic/hedgedoc-password.age deleted file mode 100644 index 2195371..0000000 --- a/secrets/restic/hedgedoc-password.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA 4ZzMfDC10jWotfzunUhNdhMg3WPGztmKK2cVQKE9H0Q -9To1L2Zev0U9beZfrc563fliqm0dsQKRaWwOqzBT7Wk --> ssh-ed25519 dRl0SQ I0l8bUdxSGFB0gcygz0FocuHbrDTJuQuyo8zu++AJns -daSQ3vwjjYfMl9x+gn+Nzr9klIEE8x2+9Zkos7aY5sA --> ss#ACz=}-grease Xvlm; 1 @A -ou2BEyCRjko ---- KMysJrselsTKj8YQYe3VYdn3MzPFhTnnFAfLexvohIo -:hZVɅOCEЊEѓ ssh-ed25519 owVgDA /9d1EdSTGvjj391MhHmCi34WcSd4YohJuE13f5Gqo24 -BKFoKgiorkWk/J7LsRe14FeuAh8zcVPElOY1Ifapv1Y --> ssh-ed25519 dRl0SQ BthbYG+p4HcrqcOxpc09n/Fo5OCUKfvVzhvcA3TslCQ -vapeXaR+9hu+eZecYchKxgFy9fSEiMzzpZliMGYx55c --> V"-grease XZ7z!A^ cxOP:.6 -z9ZbjqFMkBkGCylTNl9dt/5lshUV7kEvdMArCZH+Qc2pAULo6hctOO2sxvqeN9SG -7MlLRz/xhKB+jcxj5dD46LlneS6+dYQ49McCW1YA1l3dIlIVgi8KT0sVlw ---- Ylmc2BDrLW+jcmDs7bbeY3O9d+PjZ33Bs9gb2N7t7ww -O6ηSM`+qQW֠xkpvOc [9#et>QNl \ No newline at end of file diff --git a/secrets/restic/minecraft-environment-file.age b/secrets/restic/minecraft-environment-file.age deleted file mode 100644 index 1da1038..0000000 Binary files a/secrets/restic/minecraft-environment-file.age and /dev/null differ diff --git a/secrets/restic/minecraft-password.age b/secrets/restic/minecraft-password.age deleted file mode 100644 index 7d81870..0000000 --- a/secrets/restic/minecraft-password.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA 7KNI9wfwXEFEERfqr3YlNi3ZxaUVI3pk4dwzRRyr2G8 -TGrNsb6pFzt3lUzCHScrZPdHvDGqvS8nZk0hZN1uU2g --> ssh-ed25519 dRl0SQ BKqszxsI3ceZkzkNU07MKyF/lpknDgWEymAVkmHJLXA -XIVsjB6jDccNpACZtFyuUo5XpWs5A6lA3BNSbh+6Qlg --> 31Zf-grease wB]Jb6x 3 2IrizaM N -QA2dGpOzD9vBzjNwbtYX ---- Tv3WURbEvNjLuG2NAjTk7EtpyvlXYvesK/35I7Omkq8 -Z g $N4S#X,z -'$3J \ No newline at end of file diff --git a/secrets/restic/minecraft-repository.age b/secrets/restic/minecraft-repository.age deleted file mode 100644 index 2e6fc35..0000000 --- a/secrets/restic/minecraft-repository.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA wvUcfFupWO5SAjQAEPgsnzA/X9sZs1OKOtj2TbklwmU -4ALAG2v7XDtmfxzMYPHWVpsS+AJjPClV6JXd1UShdJY --> ssh-ed25519 dRl0SQ +5YXwSUS1Sjm2m2ekhP9kQEUw8NId1WzMPg3PZ+3cQk -39p6XM4GzHM8azI7yq+o1REscLv/10zRQsGtbLsa9b4 --> 0+6U-grease V;Z uy r*_k -Vkn3nufoGWiL2JadGeBB5WV7VnFeiKgC27sL5HBimNuk4q1K6zRG+mZcgFYs/N+r -alQKxZe7BB3mUCrCbv12rtJRSXqcx3wXOri+t+ERljO5r5j+4x0EBRru2Gw ---- c0FP/81ZSdLz7nwnjPA+ZDB515CUm7sYkvv4EQBbsMA - 9I}hkw쯱tNS^1%ɩPЩcN_nA - \ No newline at end of file diff --git a/secrets/restic/todos-environment-file.age b/secrets/restic/todos-environment-file.age deleted file mode 100644 index 6d932c2..0000000 --- a/secrets/restic/todos-environment-file.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA e5rW7H9HgvaH+pBahXl0NVLHauyTiMJZ09Y25uE7oFU -iZf1dOAdiXMhL6X6Wz9F+Qjn1gOkOIRGkpd5FkNKmJA --> ssh-ed25519 dRl0SQ o22AeR8iBA2BqiBoR1bBzEJ4VUK7l3li7W0/CxpfaWQ -glw7c+VY2hWOOfPaGt1dTGXOMovZ4L6FHELNLqsYpgM --> I:-grease QNX|`\ `,>k[ z!/ajk} ~OE -IDHem1mSEg ---- K5e+NoqGSWtZ0iwNiWviniiORG0yT0qvf/xoqIxofiw -Q0C` ٭|Xydb73`x%ƺ{ "ryz,LizVZ?ZW}>]U|n if&O{ֳiΦ1p]'dے \ No newline at end of file diff --git a/secrets/restic/todos-password.age b/secrets/restic/todos-password.age deleted file mode 100644 index 4d797f7..0000000 Binary files a/secrets/restic/todos-password.age and /dev/null differ diff --git a/secrets/restic/todos-repository.age b/secrets/restic/todos-repository.age deleted file mode 100644 index ca37c40..0000000 --- a/secrets/restic/todos-repository.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 owVgDA LAiIoN6jO47UdnkN2rZiayFuYNLDzvPYTrBIcyoNego -t0O3SjuBGqWl7apz8LIdemxWIOYgJtml0uTpihbu+UY --> ssh-ed25519 dRl0SQ YB735jB9c4KHDcoPL9AdgDWlJ01MDzioenShpCEuSHw -ePM/LJ5b3Lc6mH8sYSEgnw40cHpxcSBLTT+BRThPc8o --> sf;0zl-grease \R8 XL!~>Q# -vqybxsDF6ttWkv27cUrFrrpToAmTvq03nDYiMEYO5OA8n8tIN5HVri7hxJOVCLwJ -5TkgdX2a+JiODe0vM8Tp3UaQIHeyuQA8FzMhowJ5gY+3vNtiJvxa/XZeQ/gsx//4 -5w ---- 48SbG3pL8jLUA3EteqZ3AC3s8gC84VHgfrxnUqCpeX8 -xt{ׂ$%zV۵UՎ-.|>ǪM5' ZX;K)ƙ2|i \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix deleted file mode 100644 index 84f385f..0000000 --- a/secrets/secrets.nix +++ /dev/null @@ -1,22 +0,0 @@ -let - server = - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN82ukcaWQZcihgh+n0h+ihwTafm64SO1wngibOA6Vro root@server"; - pc = - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkvr+vT7Ik0fjquxb9xQBfVVWJPgrfC+vJZsyG2V+/G thiloho@pc"; -in { - "hedgedoc-environment-file.age".publicKeys = [ server pc ]; - "discord-bot-token.age".publicKeys = [ server pc ]; - "todos-environment-file.age".publicKeys = [ server pc ]; - "restic/minecraft-password.age".publicKeys = [ server pc ]; - "restic/minecraft-environment-file.age".publicKeys = [ server pc ]; - "restic/minecraft-repository.age".publicKeys = [ server pc ]; - "restic/hedgedoc-password.age".publicKeys = [ server pc ]; - "restic/hedgedoc-environment-file.age".publicKeys = [ server pc ]; - "restic/hedgedoc-repository.age".publicKeys = [ server pc ]; - "restic/todos-password.age".publicKeys = [ server pc ]; - "restic/todos-environment-file.age".publicKeys = [ server pc ]; - "restic/todos-repository.age".publicKeys = [ server pc ]; - "restic/discord-bot-password.age".publicKeys = [ server pc ]; - "restic/discord-bot-environment-file.age".publicKeys = [ server pc ]; - "restic/discord-bot-repository.age".publicKeys = [ server pc ]; -} diff --git a/secrets/todos-environment-file.age b/secrets/todos-environment-file.age deleted file mode 100644 index be0b1b0..0000000 Binary files a/secrets/todos-environment-file.age and /dev/null differ