so many tests

This commit is contained in:
2025-08-04 21:39:24 +03:00
parent 704e704b4c
commit 56e97b6d5f
20 changed files with 104 additions and 104 deletions
+7 -9
View File
@@ -24,14 +24,12 @@ let
self.nixosModules.software.wine
self.nixosModules.software.beets
self.nixosModules.desktop
self.homeConfigurations.main.nixosModule
self.homeConfigurations.root.nixosModule
sops-nix.nixosModules.sops
]
++ builtins.attrValues inputs.self.nixosModules.extra.self;
fileSystems = {
"${inputs.zeroq.dirs.therima-drive}" = {
"${config.xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
fsType = "ntfs3";
options = [
@@ -44,7 +42,7 @@ let
#"x-systemd.device-timeout=0"
];
};
"${inputs.zeroq.dirs.vetymae-drive}" = {
"${config.xlib.dirs.vetymae-drive}" = {
device = "/dev/disk/by-uuid/6E04EA7F04EA49A3";
fsType = "ntfs3";
options = [
@@ -58,7 +56,7 @@ let
];
};
"/mnt/beets/music" = {
device = "/home/${inputs.zeroq.devices.admin}/Music"; # "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Music"
device = "/home/${config.xlib.devices.admin}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [
"bind"
#"uid=1000"
@@ -108,7 +106,7 @@ let
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
networking = {
hostName = "${inputs.zeroq.devices.laptop.hostname}";
hostName = "${config.xlib.devices.laptop.hostname}";
networkmanager.enable = true;
firewall.enable = false;
};
@@ -137,10 +135,10 @@ let
syncthing = {
enable = true;
systemService = true;
configDir = "${inputs.zeroq.dirs.user-storage}/Syncthing/${config.system.name}"; # ${inputs.zeroq.devices.laptop.hostname}
dataDir = "${inputs.zeroq.dirs.user-home}";
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname}
dataDir = "${config.xlib.dirs.user-home}";
group = "users";
user = "${inputs.zeroq.devices.admin}";
user = "${config.xlib.devices.admin}";
};
pipewire = {
enable = lib.mkDefault true;
+10 -9
View File
@@ -24,8 +24,9 @@ let
self.nixosModules.software.beets
#self.nixosModules.extra.self.fingerprint
self.nixosModules.desktop
self.homeConfigurations.main.nixosModule
self.homeConfigurations.root.nixosModule
self.homeConfigurations.default.nixosModule
# self.homeConfigurations.main.nixosModule
# self.homeConfigurations.root.nixosModule
];
sops = {
@@ -34,7 +35,7 @@ let
};
fileSystems = {
"${inputs.zeroq.dirs.therima-drive}" = {
"${config.xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
fsType = "ntfs3";
options = [
@@ -47,7 +48,7 @@ let
#"x-systemd.device-timeout=0"
];
};
"${inputs.zeroq.dirs.vetymae-drive}" = {
"${config.xlib.dirs.vetymae-drive}" = {
device = "/dev/disk/by-uuid/38D63C6ED63C2E8E";
fsType = "ntfs3";
options = [
@@ -61,7 +62,7 @@ let
];
};
"/mnt/beets/music" = {
device = "/home/${inputs.zeroq.devices.admin}/Music"; # "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Music"
device = "/home/${config.xlib.devices.admin}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [
"bind"
#"uid=1000"
@@ -93,7 +94,7 @@ let
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
networking = {
hostName = "${inputs.zeroq.devices.laptop.hostname}";
hostName = "${config.xlib.devices.laptop.hostname}";
networkmanager.enable = true;
firewall.enable = false;
};
@@ -123,10 +124,10 @@ let
syncthing = {
enable = true;
systemService = true;
configDir = "${inputs.zeroq.dirs.user-storage}/Syncthing/${config.system.name}"; # ${inputs.zeroq.devices.laptop.hostname}
dataDir = "${inputs.zeroq.dirs.user-home}";
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname}
dataDir = "${config.xlib.dirs.user-home}";
group = "users";
user = "${inputs.zeroq.devices.admin}";
user = "${config.xlib.devices.admin}";
};
pipewire = {
enable = lib.mkDefault true;
+20 -20
View File
@@ -43,7 +43,7 @@ let
users = {
users = {
"${inputs.zeroq.devices.admin}" = {
"${config.xlib.devices.admin}" = {
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P root@sapphira"
];
@@ -53,7 +53,7 @@ let
fileSystems = {
# External drive
"${inputs.zeroq.dirs.server-home}" = {
"${config.xlib.dirs.server-home}" = {
device = "/dev/disk/by-uuid/37e53ebc-5343-a94d-9fe2-0ca39e13a8de";
fsType = "ext4";
options = [
@@ -74,7 +74,7 @@ let
};
# beets
"/mnt/beets/music" = {
device = "${inputs.zeroq.dirs.server-home}/Music";
device = "${config.xlib.dirs.server-home}/Music";
options = [
"bind"
"uid=1000"
@@ -110,19 +110,19 @@ let
"path" = "/etc/nixos";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}";
"valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 755;
"directory mask" = 755;
"force user" = "${inputs.zeroq.devices.admin}";
"force user" = "${config.xlib.devices.admin}";
"force group" = "users";
};
root = {
"path" = "/";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}";
"valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no";
"writable" = "yes";
#"create mask" = 0644;
@@ -130,16 +130,16 @@ let
"force user" = "root";
"force group" = "root";
};
"${inputs.zeroq.devices.admin}" = {
"path" = "${inputs.zeroq.dirs.server-home}";
"${config.xlib.devices.admin}" = {
"path" = "${config.xlib.dirs.server-home}";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}";
"valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 700;
"directory mask" = 700;
"force user" = "${inputs.zeroq.devices.admin}";
"force user" = "${config.xlib.devices.admin}";
"force group" = "users";
};
};
@@ -147,9 +147,9 @@ let
calibre-web = {
enable = true;
group = "users";
user = "${inputs.zeroq.devices.admin}";
user = "${config.xlib.devices.admin}";
options = {
calibreLibrary = "${inputs.zeroq.dirs.calibre-library}";
calibreLibrary = "${config.xlib.dirs.calibre-library}";
enableBookUploading = true;
enableKepubify = false;
};
@@ -174,14 +174,14 @@ let
};
transmission = {
enable = false;
credentialsFile = "${inputs.zeroq.dirs.server-home}/server/transmission/settings.json";
credentialsFile = "${config.xlib.dirs.server-home}/server/transmission/settings.json";
openRPCPort = true;
package = pkgs.transmission_4;
user = "${inputs.zeroq.devices.admin}";
user = "${config.xlib.devices.admin}";
group = "users";
settings = {
download-dir = "${inputs.zeroq.dirs.server-home}/Downloads";
incomplete-dir = "${inputs.zeroq.dirs.server-home}/Downloads/Temp";
download-dir = "${config.xlib.dirs.server-home}/Downloads";
incomplete-dir = "${config.xlib.dirs.server-home}/Downloads/Temp";
incomplete-dir-enabled = true;
rpc-bind-address = "0.0.0.0";
rpc-port = 9091;
@@ -193,16 +193,16 @@ let
enable = true;
systemService = true;
guiAddress = "0.0.0.0:8384";
configDir = "${inputs.zeroq.dirs.storage}/Syncthing/${inputs.zeroq.devices.server.hostname}";
dataDir = "${inputs.zeroq.dirs.server-home}";
configDir = "${config.xlib.dirs.storage}/Syncthing/${config.xlib.devices.server.hostname}";
dataDir = "${config.xlib.dirs.server-home}";
group = "users";
user = "${inputs.zeroq.devices.admin}";
user = "${config.xlib.devices.admin}";
};
tailscale.enable = true;
};
networking = {
hostName = "${inputs.zeroq.devices.server.hostname}";
hostName = "${config.xlib.devices.server.hostname}";
networkmanager.enable = true;
firewall.enable = false;
};
+9 -9
View File
@@ -52,7 +52,7 @@ let
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P"
];
};
"${inputs.zeroq.devices.admin}" = {
"${config.xlib.devices.admin}" = {
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P"
];
@@ -81,19 +81,19 @@ let
"path" = "/etc/nixos";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}";
"valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 755;
"directory mask" = 755;
"force user" = "${inputs.zeroq.devices.admin}";
"force user" = "${config.xlib.devices.admin}";
"force group" = "users";
};
root = {
"path" = "/";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}";
"valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no";
"writable" = "yes";
#"create mask" = 0644;
@@ -101,16 +101,16 @@ let
"force user" = "root";
"force group" = "root";
};
"${inputs.zeroq.devices.admin}" = {
"path" = "/home/${inputs.zeroq.devices.admin}";
"${config.xlib.devices.admin}" = {
"path" = "/home/${config.xlib.devices.admin}";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}";
"valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 700;
"directory mask" = 700;
"force user" = "${inputs.zeroq.devices.admin}";
"force user" = "${config.xlib.devices.admin}";
"force group" = "users";
};
};
@@ -138,7 +138,7 @@ let
};
networking = {
hostName = "${inputs.zeroq.devices.vds.hostname}";
hostName = "${config.xlib.devices.vds.hostname}";
networkmanager.enable = true;
firewall.enable = true;
};
+2 -2
View File
@@ -37,7 +37,7 @@ let
fileSystems = {
# beets
"/mnt/beets/music" = {
device = "${inputs.zeroq.dirs.wsl-home}/Music";
device = "${config.xlib.dirs.wsl-home}/Music";
options = [
"bind"
"uid=1000"
@@ -62,7 +62,7 @@ let
networking = {
firewall.enable = false;
hostName = "${config.xlib.device.hostname}";
hostName = config.xlib.device.hostname;
};
wsl = {