From ece16dd202356a8e0521661476a979d4582e5779 Mon Sep 17 00:00:00 2001 From: oqyude Date: Mon, 4 Aug 2025 23:01:31 +0300 Subject: [PATCH] 123 --- devices/laptop.nix | 8 ++++---- devices/mini-pc.nix | 4 ++-- devices/server.nix | 2 +- devices/vds.nix | 18 +++++++++--------- home/wsl.nix | 2 +- modules/software/ai.nix | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/devices/laptop.nix b/devices/laptop.nix index 4c196e3..6dd8fc8 100755 --- a/devices/laptop.nix +++ b/devices/laptop.nix @@ -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; diff --git a/devices/mini-pc.nix b/devices/mini-pc.nix index e102dbc..130cb8c 100755 --- a/devices/mini-pc.nix +++ b/devices/mini-pc.nix @@ -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}"; diff --git a/devices/server.nix b/devices/server.nix index a7cc138..2b3630e 100755 --- a/devices/server.nix +++ b/devices/server.nix @@ -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}"; diff --git a/devices/vds.nix b/devices/vds.nix index c1307c3..1213e54 100755 --- a/devices/vds.nix +++ b/devices/vds.nix @@ -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; }; diff --git a/home/wsl.nix b/home/wsl.nix index a20150f..585930b 100644 --- a/home/wsl.nix +++ b/home/wsl.nix @@ -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 diff --git a/modules/software/ai.nix b/modules/software/ai.nix index dc85aa1..ce26661 100755 --- a/modules/software/ai.nix +++ b/modules/software/ai.nix @@ -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";