diff --git a/modules/hosts/dnsc-vps-sm/default.nix b/modules/hosts/dnsc-vps-sm/default.nix index a6b66ff..f5ea706 100644 --- a/modules/hosts/dnsc-vps-sm/default.nix +++ b/modules/hosts/dnsc-vps-sm/default.nix @@ -21,11 +21,9 @@ in uptime-kuma homepage actual-server - memos - forgejo ( - { config, lib, ... }: + { config, ... }: { imports = [ ./_hardware-configuration.nix @@ -45,8 +43,6 @@ in }; system.stateVersion = "24.11"; - boot.loader.systemd-boot.enable = lib.mkForce false; - boot.loader.efi.canTouchEfiVariables = lib.mkForce false; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; # Fix due to https://github.com/NixOS/nixpkgs/issues/180175 @@ -58,25 +54,19 @@ in "${config.users.users.dennis.home}/.ssh/id_ed25519" ]; secrets."vaultwarden/env" = { - file = "${secretsDir}/vaultwarden/env.age"; + file = "${secretsDir}/vaultwarden/env"; }; secrets."restic/password" = { file = "${secretsDir}/restic/password.age"; }; - secrets."forgejo/mail-password" = { - file = "${secretsDir}/forgejo/mail-password.age"; - }; }; # Custom Module Options restic.repository = "sftp:dnsc-storage:restic/dnsc-server"; restic.backupPaths = [ "/var/backup/vaultwarden" - "/var/lib/vaultwarden" - "/var/lib/actual-server" - "/var/lib/memos" - "/var/lib/uptime-kuma" - "/var/lib/forgejo" + "/data/actual-server" + # TODO: Include memos path, maybe uptime kuma ]; } ) diff --git a/modules/selfhosted/caddy/default.nix b/modules/selfhosted/caddy/default.nix index efca4e8..b7da834 100644 --- a/modules/selfhosted/caddy/default.nix +++ b/modules/selfhosted/caddy/default.nix @@ -35,9 +35,6 @@ virtualHosts."notes.dnsc.io".extraConfig = '' reverse_proxy localhost:9003 ''; - virtualHosts."git.dnsc.io".extraConfig = '' - reverse_proxy localhost:9004 - ''; }; }; } diff --git a/modules/selfhosted/forgejo/default.nix b/modules/selfhosted/forgejo/default.nix deleted file mode 100644 index cc7f5bc..0000000 --- a/modules/selfhosted/forgejo/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ ... }: -{ - flake.modules.nixos.forgejo = - { - pkgs, - config, - lib, - ... - }: - { - services.forgejo = { - enable = true; - lfs.enable = true; - settings = { - server = { - DOMAIN = "git.dnsc.io"; - ROOT_URL = "https://git.dnsc.io/"; - HTTP_PORT = 9004; - SSH_PORT = lib.head config.services.openssh.ports; - }; - service.DISABLE_REGISTRATION = true; - mailer = { - ENABLED = true; - SMTP_ADDR = "me@dnsc.io"; - FROM = "git@dnsc.io"; - USER = "git@dnsc.io"; - }; - }; - secrets.mailer.PASSWD = config.age.secrets."forgejo/mail-password".path; - }; - }; -} diff --git a/modules/selfhosted/homepage/default.nix b/modules/selfhosted/homepage/default.nix index 9131164..e55d206 100644 --- a/modules/selfhosted/homepage/default.nix +++ b/modules/selfhosted/homepage/default.nix @@ -49,15 +49,10 @@ url = "https://vault.dnsc.io"; icon = "si:vaultwarden"; } - { - title = "Forgejo"; - url = "https://git.dnsc.io"; - icon = "si:forgejo"; - } { title = "Notes"; url = "https://notes.dnsc.io"; - icon = "si:parrotsecurity"; + icon = "si:memos"; } { title = "Uptime Kuma"; diff --git a/modules/selfhosted/memos/default.nix b/modules/selfhosted/memos/default.nix deleted file mode 100644 index 24b6c3f..0000000 --- a/modules/selfhosted/memos/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: -{ - flake.modules.nixos.memos = - { pkgs, config, ... }: - { - services.memos = { - enable = true; - settings = { - MEMOS_MODE = "prod"; - MEMOS_PORT = "9003"; - MEMOS_DATA = "/var/lib/memos"; - MEMOS_DRIVER = "sqlite"; - MEMOS_INSTANCE_URL = "https://notes.dnsc.io"; - }; - }; - }; -} diff --git a/secrets/forgejo/mail-password.age b/secrets/forgejo/mail-password.age deleted file mode 100644 index ec441e8..0000000 --- a/secrets/forgejo/mail-password.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 JIw3cQ 6dRa6cCY05awbR5Ypq89K9nAPN1SBcoz67RrZ2PLvWE -yYJn+UHJHt+DX34+EHneLuCWDs4qw7l/+LUVe3DaVEo --> ssh-ed25519 HufN+g Avtl/q3JuMecU5fFnGHqByHg5y/ZMVN90UDB325Mhi4 -7Mw+QqltaEDAOCCSlAG/aBOayGBxtOeiJwRfdXGX2ow --> ssh-ed25519 cTYF0w 8VwH3Yz2dUAhAVBHeeZL7leSmyUQfMusiAEFLGnafhQ -mtc13Xfnc7X42iMgrxGVdLWk54H9IjjmTI2T26jWMXQ ---- bVcpPfFruDRU3VEipqVt6ztjsOon71V38jKdDQkhvQA -v'?cg܉ 8`neo *V GJ vNBSoC \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b15d5f3..cedfc8a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,11 +2,9 @@ let dnsc-air = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvXWZOPOJJDAoF+Sx/ZLoAVu6G/7/MAWoknBgMAzjul dennis@dnsc-mac"; dnsc-vps-sm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF/sUA38t7TI1LYADLBn898Hh0MTR4maiHVwEtDoN9W5 dnsc-vps-sm"; dnsc-server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM3mkEgvHrwjsEReHQHpLbMP71JLvp6XxMPyW7PTaLCd dennis@dnsc-server"; - dnsc-vps-sm-r = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCIgMI4LjpYuVcFEhSM3VIYvOEb94jW/fJS+HZwPog8 root@dnsc-vps-sm"; systems = [ dnsc-air dnsc-vps-sm - dnsc-vps-sm-r dnsc-server ]; in @@ -14,7 +12,6 @@ in # Add like this: "secret1.age".publicKeys = systems; "vaultwarden/env.age".publicKeys = systems; "restic/password.age".publicKeys = systems; - "forgejo/mail-password.age".publicKeys = systems; } # 1. Create a file with secret