From 145297af58c73e9d16b1b76fdef991070551e758 Mon Sep 17 00:00:00 2001 From: Bun Date: Mon, 10 Mar 2025 22:08:35 -0400 Subject: [PATCH] Move server to new hardware --- flake.lock | 117 ++++++++++++++---- flake.nix | 3 +- hosts/envy/filesystems/default.nix | 2 +- hosts/kitty/boot/default.nix | 10 -- hosts/kitty/default.nix | 31 ----- hosts/kitty/disko/default.nix | 75 ----------- hosts/kitty/filesystems/default.nix | 9 -- hosts/kitty/hardware/default.nix | 8 -- hosts/kitty/id_ed25519.pub | 1 - hosts/kitty/users/default.nix | 4 - hosts/kitty/users/main/default.nix | 6 - hosts/midas/boot/default.nix | 5 +- hosts/midas/default.nix | 36 +++--- hosts/midas/disko/default.nix | 9 -- hosts/midas/filesystems/default.nix | 14 +-- hosts/{kitty => midas}/firewall/default.nix | 0 hosts/midas/hardware/default.nix | 1 - hosts/midas/id_ed25519.pub | 2 +- hosts/midas/users/main/default.nix | 3 - hosts/pear/filesystems/default.nix | 2 +- hosts/redmond/filesystems/default.nix | 2 +- hosts/tower/filesystems/default.nix | 2 +- .../accounts/users/custom/main/default.nix | 1 - .../nextcloud/collabora/default.nix | 4 - .../server/fileserver/nextcloud/default.nix | 9 +- .../fileserver/nextcloud/nginx/default.nix | 2 +- .../services/server/socialserver/default.nix | 2 +- .../server/socialserver/matrix/default.nix | 7 -- .../socialserver/matrix/element/default.nix | 21 ---- .../matrix/element/nginx/default.nix | 8 -- .../socialserver/matrix/synapse/default.nix | 41 ------ .../matrix/synapse/nginx/default.nix | 13 -- 32 files changed, 129 insertions(+), 321 deletions(-) delete mode 100644 hosts/kitty/boot/default.nix delete mode 100644 hosts/kitty/default.nix delete mode 100644 hosts/kitty/disko/default.nix delete mode 100644 hosts/kitty/filesystems/default.nix delete mode 100644 hosts/kitty/hardware/default.nix delete mode 100644 hosts/kitty/id_ed25519.pub delete mode 100644 hosts/kitty/users/default.nix delete mode 100644 hosts/kitty/users/main/default.nix rename hosts/{kitty => midas}/firewall/default.nix (100%) delete mode 100644 modules/system/services/server/fileserver/nextcloud/collabora/default.nix delete mode 100644 modules/system/services/server/socialserver/matrix/default.nix delete mode 100644 modules/system/services/server/socialserver/matrix/element/default.nix delete mode 100644 modules/system/services/server/socialserver/matrix/element/nginx/default.nix delete mode 100644 modules/system/services/server/socialserver/matrix/synapse/default.nix delete mode 100644 modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix diff --git a/flake.lock b/flake.lock index 1f1d482..34aadba 100644 --- a/flake.lock +++ b/flake.lock @@ -200,6 +200,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -314,11 +332,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741397002, - "narHash": "sha256-drDvZrCYhao1RPlmykB1mN3sNxQmMUd8R+S5N6dkYUQ=", + "lastModified": 1741570035, + "narHash": "sha256-11AaZ1Zltaa4ZJPZrI5mfG5Or19XjlNYHPewbNC42bE=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "5384176f696b39c479dfc2798bb3ada09e72f6e1", + "rev": "b41a02dedb9d8dd3e0eb7ea7ab4d8c48da4389a5", "type": "github" }, "original": { @@ -329,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1741445498, + "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634", "type": "github" }, "original": { @@ -375,11 +393,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -390,11 +408,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -406,11 +424,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1741445498, + "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634", "type": "github" }, "original": { @@ -421,11 +439,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -442,11 +476,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741416242, - "narHash": "sha256-ICiUn+fH/ib4lTuQcYiUwcXKQj7/JoE4aQNZY9A1T1A=", + "lastModified": 1741649763, + "narHash": "sha256-436Es6IDqrUukz5VLjRP41F/znZPFZEz274s6phBR5o=", "owner": "nix-community", "repo": "NUR", - "rev": "84c34746969c63f8edbe5c76bd3fa0b015fd9a0f", + "rev": "2f76066428491220b7bd46388ac1e8e9d1ead805", "type": "github" }, "original": { @@ -493,6 +527,7 @@ "minecraft": "minecraft", "nixpkgs": "nixpkgs_4", "nur": "nur", + "spacebar": "spacebar", "unstable": "unstable" } }, @@ -521,6 +556,25 @@ "type": "github" } }, + "spacebar": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1737778726, + "narHash": "sha256-iaXm8Mnf1ROQW/i07/xVg81oNYsBvhB+D9I3c9e1FKI=", + "owner": "spacebarchat", + "repo": "server", + "rev": "b18a297794f62d87a41f36bf6ef81f126aa5c002", + "type": "github" + }, + "original": { + "owner": "spacebarchat", + "repo": "server", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -551,6 +605,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -574,11 +643,11 @@ }, "unstable": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f37be51..1dedaf1 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ impermanence.url = "github:nix-community/impermanence"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11"; minecraft.url = "github:Infinidoge/nix-minecraft"; + spacebar.url = "github:spacebarchat/server"; # Home inputs home-manager = { @@ -37,6 +38,7 @@ impermanence, mailserver, minecraft, + spacebar, home-manager, nur, blender, @@ -62,7 +64,6 @@ redmond = mkNix [ ./hosts/redmond ]; # Lenovo Dual-Boot iso = mkNix [ ./hosts/iso ]; # ISO File - kitty = mkNix [ ./hosts/kitty ]; # Dell Optiplex 7010 midas = mkNix [ ./hosts/midas ]; # Dell Optiplex 5040 prophet = mkNix [ ./hosts/prophet ]; # Oracle Neoverse-N1 }; diff --git a/hosts/envy/filesystems/default.nix b/hosts/envy/filesystems/default.nix index 52090c1..5a0a4c4 100644 --- a/hosts/envy/filesystems/default.nix +++ b/hosts/envy/filesystems/default.nix @@ -14,7 +14,7 @@ }; # Network mounts - "/home/${config.sysusers.main}/KittyNFS" = { + "/home/${config.sysusers.main}/MidasNFS" = { device = "10.100.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; diff --git a/hosts/kitty/boot/default.nix b/hosts/kitty/boot/default.nix deleted file mode 100644 index 5117fce..0000000 --- a/hosts/kitty/boot/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: -{ - boot = { - kernelPackages = pkgs.linuxPackages_5_15; - swraid = { - enable = true; - mdadmConf = "MAILADDR contact@nixfox.ca"; - }; - }; -} diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix deleted file mode 100644 index d178c4e..0000000 --- a/hosts/kitty/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ ... }: -{ - imports = [ - ./boot - ./disko - ./filesystems - ./firewall - ./hardware - ./users - ../../modules/system - ]; - - networking = { - hostName = "kitty"; - hostId = "38ba3f57"; - }; - - system = { - server.enable = true; - fileserver.enable = true; - socialserver.enable = true; - wireguard.server.enable = true; - stateVersion = "24.05"; - }; - - services.minecraft-servers.servers = { - velocity.enable = true; - cornworld.enable = true; - skyblock.enable = true; - }; -} diff --git a/hosts/kitty/disko/default.nix b/hosts/kitty/disko/default.nix deleted file mode 100644 index 9e2d2fb..0000000 --- a/hosts/kitty/disko/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, disko, ... }: -{ - imports = [ disko.nixosModules.disko ]; - - disko.devices = { - disk = { - "${config.networking.hostName}" = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - priority = 1; - size = "2G"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - main = { - size = "100%"; - content = { - type = "lvm_pv"; - vg = "${config.networking.hostName}"; - }; - }; - }; - }; - }; - }; - - lvm_vg = { - "${config.networking.hostName}" = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/prev" = { - mountpoint = "/prev"; - mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - }; - }; - }; - swap = { - size = "4G"; - content = { - type = "swap"; - discardPolicy = "both"; - }; - }; - }; - }; - }; - }; - - # Needed for impermanence - fileSystems."/persist".neededForBoot = true; -} diff --git a/hosts/kitty/filesystems/default.nix b/hosts/kitty/filesystems/default.nix deleted file mode 100644 index b3918e8..0000000 --- a/hosts/kitty/filesystems/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: -{ - fileSystems."/persist" = { - device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=persist" "compress=zstd" "noatime" ]; - }; -} diff --git a/hosts/kitty/hardware/default.nix b/hosts/kitty/hardware/default.nix deleted file mode 100644 index 3b62a4f..0000000 --- a/hosts/kitty/hardware/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, ... }: -{ - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ "kvm-intel" ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/kitty/id_ed25519.pub b/hosts/kitty/id_ed25519.pub deleted file mode 100644 index 082fe2e..0000000 --- a/hosts/kitty/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k diff --git a/hosts/kitty/users/default.nix b/hosts/kitty/users/default.nix deleted file mode 100644 index 57e7f20..0000000 --- a/hosts/kitty/users/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - imports = [ ./main ]; -} diff --git a/hosts/kitty/users/main/default.nix b/hosts/kitty/users/main/default.nix deleted file mode 100644 index 9366cad..0000000 --- a/hosts/kitty/users/main/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, ... }: -{ - home-manager.users."${config.sysusers.main}".home = { - stateVersion = lib.mkForce config.system.stateVersion; - }; -} diff --git a/hosts/midas/boot/default.nix b/hosts/midas/boot/default.nix index 50d146f..86250ce 100644 --- a/hosts/midas/boot/default.nix +++ b/hosts/midas/boot/default.nix @@ -1,4 +1,7 @@ { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.swraid = { + enable = true; + mdadmConf = "MAILADDR contact@nixfox.ca"; + }; } diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix index 556d147..c602211 100644 --- a/hosts/midas/default.nix +++ b/hosts/midas/default.nix @@ -1,40 +1,32 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ./boot ./disko ./filesystems + ./firewall ./hardware ./users ../../modules/system ]; - networking.hostName = "midas"; + networking = { + hostName = "midas"; + hostId = "38ba3f57"; + }; system = { - desktop.enable = true; + server.enable = true; lanzaboote.enable = true; - fancyboot.enable = true; - libvirtd.enable = true; + fileserver.enable = true; + socialserver.enable = true; + wireguard.server.enable = true; stateVersion = "24.11"; }; - hardware.graphics = { - extraPackages = with pkgs; [ - intel-media-driver - intel-ocl - intel-vaapi-driver - ]; - extraPackages32 = with pkgs.driversi686Linux; [ - intel-media-driver - intel-vaapi-driver - ]; + services.minecraft-servers.servers = { + velocity.enable = true; + cornworld.enable = true; + skyblock.enable = true; }; - - nixpkgs.allowUnfreePackages = [ "intel-ocl" ]; - - services.xserver.videoDrivers = [ - "intel" - "i915" - ]; } diff --git a/hosts/midas/disko/default.nix b/hosts/midas/disko/default.nix index e3aa303..f9c1725 100644 --- a/hosts/midas/disko/default.nix +++ b/hosts/midas/disko/default.nix @@ -61,15 +61,6 @@ mountpoint = "/nix"; mountOptions = [ "compress=zstd" "noatime" "ssd" ]; }; - - # Impermanence - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/persist/.snapshots" = { }; - "/persist/home/${config.sysusers.main}" = { }; - "/persist/home/${config.sysusers.main}/.snapshots" = { }; }; }; }; diff --git a/hosts/midas/filesystems/default.nix b/hosts/midas/filesystems/default.nix index 53dda74..b3918e8 100644 --- a/hosts/midas/filesystems/default.nix +++ b/hosts/midas/filesystems/default.nix @@ -1,11 +1,9 @@ -{ config, ... }: +{ ... }: { - fileSystems = { - # Network mounts - "/home/${config.sysusers.main}/KittyNFS" = { - device = "${config.ips.server}:/storage"; - fsType = "nfs4"; - options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; - }; + fileSystems."/persist" = { + device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; + fsType = "btrfs"; + neededForBoot = true; + options = [ "subvol=persist" "compress=zstd" "noatime" ]; }; } diff --git a/hosts/kitty/firewall/default.nix b/hosts/midas/firewall/default.nix similarity index 100% rename from hosts/kitty/firewall/default.nix rename to hosts/midas/firewall/default.nix diff --git a/hosts/midas/hardware/default.nix b/hosts/midas/hardware/default.nix index 5547956..87d570c 100644 --- a/hosts/midas/hardware/default.nix +++ b/hosts/midas/hardware/default.nix @@ -1,4 +1,3 @@ -# nixos-generate-config --root ./ --no-filesystems { config, lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/hosts/midas/id_ed25519.pub b/hosts/midas/id_ed25519.pub index 8738c9f..082fe2e 100644 --- a/hosts/midas/id_ed25519.pub +++ b/hosts/midas/id_ed25519.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzNzWYDUZ6PEzUPoGMA6I5t1ACUUwnucD8pNcAS1BeQ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k diff --git a/hosts/midas/users/main/default.nix b/hosts/midas/users/main/default.nix index 9c6469d..9366cad 100644 --- a/hosts/midas/users/main/default.nix +++ b/hosts/midas/users/main/default.nix @@ -1,9 +1,6 @@ { config, lib, ... }: { home-manager.users."${config.sysusers.main}".home = { - desktop.enable = true; - gaming.enable = true; - production.enable = true; stateVersion = lib.mkForce config.system.stateVersion; }; } diff --git a/hosts/pear/filesystems/default.nix b/hosts/pear/filesystems/default.nix index b506ad9..4d04ac2 100644 --- a/hosts/pear/filesystems/default.nix +++ b/hosts/pear/filesystems/default.nix @@ -1,6 +1,6 @@ { config, ... }: { - fileSystems."/home/${config.sysusers.main}/KittyNFS" = { + fileSystems."/home/${config.sysusers.main}/MidasNFS" = { device = "10.100.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; diff --git a/hosts/redmond/filesystems/default.nix b/hosts/redmond/filesystems/default.nix index 47808d5..394a938 100644 --- a/hosts/redmond/filesystems/default.nix +++ b/hosts/redmond/filesystems/default.nix @@ -5,7 +5,7 @@ device = "/dev/disk/by-uuid/582C6B802C6B57D0"; options = [ "nosuid" "nodev" ]; }; - "/home/${config.sysusers.main}/KittyNFS" = { + "/home/${config.sysusers.main}/MidasNFS" = { device = "10.100.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix index d759827..51e8ce4 100644 --- a/hosts/tower/filesystems/default.nix +++ b/hosts/tower/filesystems/default.nix @@ -39,7 +39,7 @@ }; # Network mounts - "/home/${config.sysusers.main}/KittyNFS" = { + "/home/${config.sysusers.main}/MidasNFS" = { device = "${config.ips.server}:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; diff --git a/modules/system/accounts/users/custom/main/default.nix b/modules/system/accounts/users/custom/main/default.nix index 38cb8a3..00fc0a0 100644 --- a/modules/system/accounts/users/custom/main/default.nix +++ b/modules/system/accounts/users/custom/main/default.nix @@ -18,7 +18,6 @@ ../../../../../../hosts/pear/id_ed25519.pub ../../../../../../hosts/redmond/id_ed25519.pub - ../../../../../../hosts/kitty/id_ed25519.pub ../../../../../../hosts/midas/id_ed25519.pub ../../../../../../hosts/prophet/id_ed25519.pub ]; diff --git a/modules/system/services/server/fileserver/nextcloud/collabora/default.nix b/modules/system/services/server/fileserver/nextcloud/collabora/default.nix deleted file mode 100644 index f53c879..0000000 --- a/modules/system/services/server/fileserver/nextcloud/collabora/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ config, lib, ... }: -{ - services.collabora-online.enable = config.services.nextcloud.enable; -} diff --git a/modules/system/services/server/fileserver/nextcloud/default.nix b/modules/system/services/server/fileserver/nextcloud/default.nix index 5ef5423..831bedd 100644 --- a/modules/system/services/server/fileserver/nextcloud/default.nix +++ b/modules/system/services/server/fileserver/nextcloud/default.nix @@ -1,15 +1,12 @@ { config, lib, pkgs, ... }: { - imports = [ - ./collabora - ./nginx - ]; + imports = [ ./nginx ]; config = lib.mkIf config.system.fileserver.enable { services.nextcloud = { enable = true; package = pkgs.nextcloud30; - hostName = "cloud.nixfox.ca"; + hostName = "files.nixfox.ca"; https = true; config = { adminuser = config.sysusers.main; @@ -17,7 +14,7 @@ }; settings = { trusted_proxies = [ "127.0.0.1" ]; - trusted_domains = [ "cloud.nixfox.ca" ]; + trusted_domains = [ "files.nixfox.ca" ]; overwriteprotocol = "https"; mail_smtphost = "mx.nixfox.ca"; mail_domain = "nixfox.ca"; diff --git a/modules/system/services/server/fileserver/nextcloud/nginx/default.nix b/modules/system/services/server/fileserver/nextcloud/nginx/default.nix index 88712d4..5212d53 100644 --- a/modules/system/services/server/fileserver/nextcloud/nginx/default.nix +++ b/modules/system/services/server/fileserver/nextcloud/nginx/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - services.nginx.virtualHosts."cloud.nixfox.ca" = lib.mkIf config.services.nextcloud.enable { + services.nginx.virtualHosts."files.nixfox.ca" = lib.mkIf config.services.nextcloud.enable { enableACME = true; addSSL = true; locations."/" = { diff --git a/modules/system/services/server/socialserver/default.nix b/modules/system/services/server/socialserver/default.nix index ff1a788..c49e35f 100644 --- a/modules/system/services/server/socialserver/default.nix +++ b/modules/system/services/server/socialserver/default.nix @@ -2,8 +2,8 @@ { imports = [ ./mastodon - ./matrix ./owncast + #./spacebar ]; options.system.socialserver.enable = lib.mkEnableOption "Enable social media like services"; diff --git a/modules/system/services/server/socialserver/matrix/default.nix b/modules/system/services/server/socialserver/matrix/default.nix deleted file mode 100644 index 3f05631..0000000 --- a/modules/system/services/server/socialserver/matrix/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - imports = [ - ./element - ./synapse - ]; -} diff --git a/modules/system/services/server/socialserver/matrix/element/default.nix b/modules/system/services/server/socialserver/matrix/element/default.nix deleted file mode 100644 index 68b5b83..0000000 --- a/modules/system/services/server/socialserver/matrix/element/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, ... }: -{ - imports = [ ./nginx ]; - - config = lib.mkIf config.services.matrix-synapse.enable { - nixpkgs.config.element-web.conf = { - default_server_config."m.homeserver" = { - base_url = "https://matrix.nixfox.ca"; - server_name = "matrix.nixfox.ca"; - }; - branding = { - auth_header_logo_url = "https://www.nixfox.ca/images/copyright/profile.png"; - #welcome_background_url = "https://www.nixfox.ca/images/backgrounds/template-background.png"; - }; - embedded_pages.home_url = "https://www.nixfox.ca/"; - disable_custom_urls = true; - disable_guests = true; - default_theme = "dark"; - }; - }; -} diff --git a/modules/system/services/server/socialserver/matrix/element/nginx/default.nix b/modules/system/services/server/socialserver/matrix/element/nginx/default.nix deleted file mode 100644 index 1c085eb..0000000 --- a/modules/system/services/server/socialserver/matrix/element/nginx/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - services.nginx.virtualHosts."chat.nixfox.ca" = lib.mkIf config.services.matrix-synapse.enable { - enableACME = true; - addSSL = true; - root = "${pkgs.element-web}"; - }; -} diff --git a/modules/system/services/server/socialserver/matrix/synapse/default.nix b/modules/system/services/server/socialserver/matrix/synapse/default.nix deleted file mode 100644 index 894619e..0000000 --- a/modules/system/services/server/socialserver/matrix/synapse/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, lib, ... }: -{ - imports = [ ./nginx ]; - - config = lib.mkIf config.system.socialserver.enable { - services.matrix-synapse = { - enable = true; - settings = { - server_name = "nixfox.ca"; - public_baseurl = "https://matrix.nixfox.ca"; - suppress_key_server_warning = true; - - # Email notifications about account status - email = { - notif_from = "NixFox Matrix "; - smtp_host = "mx.nixfox.ca"; - smtp_user = "noreply@nixfox.ca"; - smtp_pass = config.secrets.mailPass.nixfoxNoReply; - enable_tls = true; - smtp_port = 587; - require_transport_security = true; - }; - - # Disable registration without email - registrations_require_3pid = [ "email" ]; - - # Set the type of database - database.name = "sqlite3"; - - # Allow account registration - #enable_registration = true; - - # General settings - max_upload_size = "60M"; - burst_count = 15; - }; - }; - - environment.persistence."/persist".directories = [ "/var/lib/matrix-synapse" ]; - }; -} diff --git a/modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix b/modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix deleted file mode 100644 index c5d9d5f..0000000 --- a/modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, ... }: -{ - services.nginx.virtualHosts."matrix.nixfox.ca" = lib.mkIf config.services.matrix-synapse.enable { - enableACME = true; - forceSSL = true; - locations = { - "/".extraConfig = ''return 403;''; - "/client".proxyPass = "http://127.0.0.1:8008"; - "/_matrix".proxyPass = "http://127.0.0.1:8008"; - "/_synapse/client".proxyPass = "http://127.0.0.1:8008"; - }; - }; -}