diff --git a/nixosConfigurations/hosts/disko/mini-pc.nix b/nixosConfigurations/hosts/disko/mini-pc.nix index 41831eb..6e572e5 100755 --- a/nixosConfigurations/hosts/disko/mini-pc.nix +++ b/nixosConfigurations/hosts/disko/mini-pc.nix @@ -8,10 +8,6 @@ content = { type = "gpt"; partitions = { - #boot = { - # type = "EF02"; - # size = "1M"; - #; ESP = { size = "500M"; type = "EF00"; diff --git a/nixosConfigurations/hosts/disko/server.nix b/nixosConfigurations/hosts/disko/server.nix index c5928ac..0e73e05 100755 --- a/nixosConfigurations/hosts/disko/server.nix +++ b/nixosConfigurations/hosts/disko/server.nix @@ -14,6 +14,7 @@ type = "filesystem"; format = "vfat"; mountpoint = "/boot"; + mountOptions = [ "umask=0077" ]; }; }; swap = { diff --git a/nixosConfigurations/hosts/disko/vds.nix b/nixosConfigurations/hosts/disko/vds.nix index 7ce8e7c..f097a04 100755 --- a/nixosConfigurations/hosts/disko/vds.nix +++ b/nixosConfigurations/hosts/disko/vds.nix @@ -11,16 +11,6 @@ type = "EF02"; size = "1M"; }; - # ESP = { - # size = "500M"; - # type = "EF00"; - # content = { - # type = "filesystem"; - # format = "vfat"; - # mountpoint = "/boot"; - # mountOptions = [ "umask=0077" ]; - # }; - # }; root = { size = "100%"; content = { diff --git a/nixosConfigurations/hosts/hardware/server.nix b/nixosConfigurations/hosts/hardware/server.nix index 669b605..fabb010 100755 --- a/nixosConfigurations/hosts/hardware/server.nix +++ b/nixosConfigurations/hosts/hardware/server.nix @@ -40,28 +40,13 @@ device = "/dev/disk/by-partlabel/disk-main-ESP"; fsType = "vfat"; options = [ + # maybe 700? "fmask=0022" "dmask=0022" ]; }; }; - # fileSystems."/" = - # { device = "/dev/disk/by-uuid/8acccc34-edc6-4934-886c-ef4b778ca24a"; - # fsType = "ext4"; - # }; - # - # fileSystems."/boot" = - # { device = "/dev/disk/by-uuid/DDF2-C940"; - # fsType = "vfat"; - # options = [ "fmask=0022" "dmask=0022" ]; - # }; - # - # fileSystems."/home/otreca/External" = - # { device = "/dev/disk/by-uuid/37e53ebc-5343-a94d-9fe2-0ca39e13a8de"; - # fsType = "ext4"; - # }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/nixosConfigurations/hosts/hardware/vds.nix b/nixosConfigurations/hosts/hardware/vds.nix index 3db54b3..5d7f044 100755 --- a/nixosConfigurations/hosts/hardware/vds.nix +++ b/nixosConfigurations/hosts/hardware/vds.nix @@ -15,14 +15,6 @@ device = lib.mkForce "/dev/disk/by-partlabel/disk-main-root"; # "/dev/disk/by-partlabel/disk-main-root"; fsType = "ext4"; }; - # "/boot" = { - # device = lib.mkForce "/dev/disk/by-partlabel/disk-main-ESP"; - # fsType = "vfat"; - # options = [ - # "fmask=0022" - # "dmask=0022" - # ]; - # }; }; # swapDevices = [ diff --git a/nixosModules/default.nix b/nixosModules/default.nix index 1a12e11..4d9f979 100755 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -13,7 +13,7 @@ let ./essentials ./users.nix ./options.nix - ./temp.nix + # ./temp.nix (./. + "/${deviceType}") # specific modules home-manager.nixosModules.home-manager # home-manager module diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index 75abc34..22b6a81 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -8,13 +8,13 @@ }: { services = { - # nextcloud-whiteboard-server = { - # enable = true; - # settings = { - # NEXTCLOUD_URL = "http://localhost:10000"; - # }; - # secrets = [ "${inputs.zeroq-credentials}/services/nextcloud/jwt-secret.txt" ]; - # }; + nextcloud-whiteboard-server = { + enable = true; + settings = { + NEXTCLOUD_URL = "https://nextcloud.zeroq.ru"; + }; + secrets = [ "${inputs.zeroq-credentials}/services/nextcloud/jwt-secret.txt" ]; + }; nextcloud = { enable = true; package = pkgs.nextcloud31; diff --git a/nixosModules/users.nix b/nixosModules/users.nix index c615d1e..0333985 100755 --- a/nixosModules/users.nix +++ b/nixosModules/users.nix @@ -22,7 +22,7 @@ "pipewire" "qemu-libvirtd" "wheel" - "immich" + "immich" # rm? ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P" diff --git a/nixosModules/vds/default.nix b/nixosModules/vds/default.nix index def8cdf..fba4eee 100755 --- a/nixosModules/vds/default.nix +++ b/nixosModules/vds/default.nix @@ -4,7 +4,6 @@ }: { imports = [ - #./cloudflared.nix ./docker.nix ./netbird.nix ./nginx.nix diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index e6e48ca..5db6cd8 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -125,13 +125,6 @@ in #server = "https://acme-staging-v02.api.letsencrypt.org/directory"; #listenHTTP = ":1360"; }; - # certs."immich.zeroq.ru" = { - # email = "go.bin043120@gmail.com"; - # dnsProvider = "cloudflare"; - # dnsResolver = "1.1.1.1"; - # environmentFile = "${inputs.zeroq-credentials}/accounts/cloudflare.txt"; - # webroot = null; # Required in my case - # }; }; networking.firewall.allowedTCPPorts = [ 80 diff --git a/nixosModules/vds/xray.nix b/nixosModules/vds/xray.nix index 26bf0c6..00bee70 100755 --- a/nixosModules/vds/xray.nix +++ b/nixosModules/vds/xray.nix @@ -12,7 +12,7 @@ networking.firewall = { allowedTCPPorts = [ 8443 ]; - allowedUDPPorts = [ 8443 ]; # 41641 + allowedUDPPorts = [ 8443 ]; #trustedInterfaces = [ "tailscale0" ]; };