This commit is contained in:
2025-08-08 22:33:10 +03:00
parent 310f41d9eb
commit 90e9707d27
17 changed files with 69 additions and 56 deletions
+7 -6
View File
@@ -8,6 +8,7 @@ let
config,
lib,
pkgs,
xlib,
...
}:
{
@@ -20,7 +21,7 @@ let
./hardware/logitech.nix
];
fileSystems = {
"${config.xlib.dirs.therima-drive}" = {
"${xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
fsType = "ntfs3";
options = [
@@ -33,7 +34,7 @@ let
#"x-systemd.device-timeout=0"
];
};
"${config.xlib.dirs.vetymae-drive}" = {
"${xlib.dirs.vetymae-drive}" = {
device = "/dev/disk/by-uuid/6E04EA7F04EA49A3";
fsType = "ntfs3";
options = [
@@ -85,7 +86,7 @@ let
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
networking = {
hostName = "${config.xlib.device.hostname}";
hostName = "${xlib.device.hostname}";
networkmanager.enable = true;
firewall.enable = false;
};
@@ -114,10 +115,10 @@ let
syncthing = {
enable = true;
systemService = true;
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}";
dataDir = "${config.xlib.dirs.user-home}";
configDir = "${xlib.dirs.user-storage}/Syncthing/${config.system.name}";
dataDir = "${xlib.dirs.user-home}";
group = "users";
user = "${config.xlib.device.username}";
user = "${xlib.device.username}";
};
pipewire = {
enable = lib.mkDefault true;
+6 -6
View File
@@ -29,7 +29,7 @@ let
};
fileSystems = {
"${config.xlib.dirs.therima-drive}" = {
"${xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
fsType = "ntfs3";
options = [
@@ -41,7 +41,7 @@ let
"nofail"
];
};
"${config.xlib.dirs.vetymae-drive}" = {
"${xlib.dirs.vetymae-drive}" = {
device = "/dev/disk/by-uuid/38D63C6ED63C2E8E";
fsType = "ntfs3";
options = [
@@ -74,7 +74,7 @@ let
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
networking = {
hostName = "${config.xlib.device.hostname}";
hostName = "${xlib.device.hostname}";
networkmanager.enable = true;
firewall.enable = false;
};
@@ -104,10 +104,10 @@ let
syncthing = {
enable = true;
systemService = true;
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}";
dataDir = "${config.xlib.dirs.user-home}";
configDir = "${xlib.dirs.user-storage}/Syncthing/${config.system.name}";
dataDir = "${xlib.dirs.user-home}";
group = "users";
user = "${config.xlib.device.username}";
user = "${xlib.device.username}";
};
pipewire = {
enable = lib.mkDefault true;
+3 -2
View File
@@ -5,6 +5,7 @@ let
config,
lib,
pkgs,
xlib,
...
}:
{
@@ -36,7 +37,7 @@ let
fileSystems = {
# External drive
"${config.xlib.dirs.server-home}" = {
"${xlib.dirs.server-home}" = {
device = "/dev/disk/by-uuid/37e53ebc-5343-a94d-9fe2-0ca39e13a8de";
fsType = "ext4";
# options = [
@@ -86,7 +87,7 @@ let
};
networking = {
hostName = "${config.xlib.device.hostname}";
hostName = "${xlib.device.hostname}";
networkmanager.enable = true;
firewall.enable = false;
};
+9 -8
View File
@@ -6,6 +6,7 @@ let
lib,
modulesPath,
pkgs,
xlib,
...
}:
{
@@ -59,19 +60,19 @@ let
"path" = "/etc/nixos";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${config.xlib.device.username}";
"valid users" = "${xlib.device.username}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 755;
"directory mask" = 755;
"force user" = "${config.xlib.device.username}";
"force user" = "${xlib.device.username}";
"force group" = "users";
};
root = {
"path" = "/";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${config.xlib.device.username}";
"valid users" = "${xlib.device.username}";
"guest ok" = "no";
"writable" = "yes";
#"create mask" = 0644;
@@ -79,16 +80,16 @@ let
"force user" = "root";
"force group" = "root";
};
"${config.xlib.device.username}" = {
"path" = "/home/${config.xlib.device.username}";
"${xlib.device.username}" = {
"path" = "/home/${xlib.device.username}";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${config.xlib.device.username}";
"valid users" = "${xlib.device.username}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 700;
"directory mask" = 700;
"force user" = "${config.xlib.device.username}";
"force user" = "${xlib.device.username}";
"force group" = "users";
};
};
@@ -116,7 +117,7 @@ let
};
networking = {
hostName = "${config.xlib.device.hostname}";
hostName = "${xlib.device.hostname}";
networkmanager.enable = true;
firewall.enable = true;
};
+3 -2
View File
@@ -6,6 +6,7 @@ let
lib,
pkgs,
modulesPath,
xlib,
...
}:
{
@@ -30,14 +31,14 @@ let
networking = {
firewall.enable = false;
hostName = config.xlib.device.hostname;
hostName = xlib.device.hostname;
};
wsl = {
enable = true;
startMenuLaunchers = true;
#useWindowsDriver = true;
defaultUser = config.xlib.device.username;
defaultUser = xlib.device.username;
};
system.stateVersion = "24.11";