cleaning?

This commit is contained in:
2025-09-17 14:15:40 +03:00
parent b7ce4a8342
commit 7edae13daa
11 changed files with 12 additions and 56 deletions
@@ -8,10 +8,6 @@
content = {
type = "gpt";
partitions = {
#boot = {
# type = "EF02";
# size = "1M";
#;
ESP = {
size = "500M";
type = "EF00";
@@ -14,6 +14,7 @@
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
swap = {
-10
View File
@@ -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 = {
+1 -16
View File
@@ -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
@@ -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 = [
+1 -1
View File
@@ -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
+7 -7
View File
@@ -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;
+1 -1
View File
@@ -22,7 +22,7 @@
"pipewire"
"qemu-libvirtd"
"wheel"
"immich"
"immich" # rm?
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P"
-1
View File
@@ -4,7 +4,6 @@
}:
{
imports = [
#./cloudflared.nix
./docker.nix
./netbird.nix
./nginx.nix
-7
View File
@@ -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
+1 -1
View File
@@ -12,7 +12,7 @@
networking.firewall = {
allowedTCPPorts = [ 8443 ];
allowedUDPPorts = [ 8443 ]; # 41641
allowedUDPPorts = [ 8443 ];
#trustedInterfaces = [ "tailscale0" ];
};