This commit is contained in:
2025-08-04 23:01:31 +03:00
parent 3f292a7f4c
commit ece16dd202
6 changed files with 18 additions and 18 deletions
+4 -4
View File
@@ -56,7 +56,7 @@ let
];
};
"/mnt/beets/music" = {
device = "/home/${config.xlib.devices.admin}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
device = "/home/${config.xlib.device.username}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [
"bind"
#"uid=1000"
@@ -106,7 +106,7 @@ let
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
networking = {
hostName = "${config.xlib.devices.laptop.hostname}";
hostName = "${config.xlib.device.hostname}";
networkmanager.enable = true;
firewall.enable = false;
};
@@ -135,10 +135,10 @@ let
syncthing = {
enable = true;
systemService = true;
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname}
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}";
dataDir = "${config.xlib.dirs.user-home}";
group = "users";
user = "${config.xlib.devices.admin}";
user = "${config.xlib.device.username}";
};
pipewire = {
enable = lib.mkDefault true;
+2 -2
View File
@@ -65,7 +65,7 @@ let
];
};
"/mnt/beets/music" = {
device = "/home/${config.xlib.devices.admin}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
device = "/home/${config.xlib.device.username}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [
"bind"
#"uid=1000"
@@ -127,7 +127,7 @@ let
syncthing = {
enable = true;
systemService = true;
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname}
configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}";
dataDir = "${config.xlib.dirs.user-home}";
group = "users";
user = "${config.xlib.device.username}";
+1 -1
View File
@@ -202,7 +202,7 @@ let
enable = true;
systemService = true;
guiAddress = "0.0.0.0:8384";
configDir = "${config.xlib.dirs.storage}/Syncthing/${config.xlib.devices.server.hostname}";
configDir = "${config.xlib.dirs.storage}/Syncthing/${config.xlib.device.hostname}";
dataDir = "${config.xlib.dirs.server-home}";
group = "users";
user = "${config.xlib.device.username}";
+9 -9
View File
@@ -52,7 +52,7 @@ let
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P"
];
};
"${config.xlib.devices.admin}" = {
"${config.xlib.device.username}" = {
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P"
];
@@ -81,19 +81,19 @@ let
"path" = "/etc/nixos";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${config.xlib.devices.admin}";
"valid users" = "${config.xlib.device.username}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 755;
"directory mask" = 755;
"force user" = "${config.xlib.devices.admin}";
"force user" = "${config.xlib.device.username}";
"force group" = "users";
};
root = {
"path" = "/";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${config.xlib.devices.admin}";
"valid users" = "${config.xlib.device.username}";
"guest ok" = "no";
"writable" = "yes";
#"create mask" = 0644;
@@ -101,16 +101,16 @@ let
"force user" = "root";
"force group" = "root";
};
"${config.xlib.devices.admin}" = {
"path" = "/home/${config.xlib.devices.admin}";
"${config.xlib.device.username}" = {
"path" = "/home/${config.xlib.device.username}";
"browseable" = "yes";
"read only" = "no";
"valid users" = "${config.xlib.devices.admin}";
"valid users" = "${config.xlib.device.username}";
"guest ok" = "no";
"writable" = "yes";
"create mask" = 700;
"directory mask" = 700;
"force user" = "${config.xlib.devices.admin}";
"force user" = "${config.xlib.device.username}";
"force group" = "users";
};
};
@@ -138,7 +138,7 @@ let
};
networking = {
hostName = "${config.xlib.devices.vds.hostname}";
hostName = "${config.xlib.device.hostname}";
networkmanager.enable = true;
firewall.enable = true;
};
+1 -1
View File
@@ -7,7 +7,7 @@
let
# Paths
beetsPath = "${xlib.dirs.wsl-storage}/beets/linux";
#sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.devices.server.hostname}";
#sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.device.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${xlib.dirs.wsl-home}";
in
+1 -1
View File
@@ -15,7 +15,7 @@
# HSA_OVERRIDE_GFX_VERSION = "11.5.0";
# HCC_AMDGPU_TARGET = "gfx1150"; # used to be necessary, but doesn't seem to anymore
# };
# user = "ollama"; # "${config.xlib.devices.admin}";
# user = "ollama"; # "${config.xlib.device.username}";
# group = "ollama";
# acceleration = "rocm";
# rocmOverrideGfx = "11.5.0";