From dcf10dac0585572ed49040bd64925baf0187c060 Mon Sep 17 00:00:00 2001 From: tulg Date: Sat, 9 May 2026 16:00:54 +0300 Subject: [PATCH] a --- hosts/overlord/hardware-configuration.nix | 2 +- modules/home-manager/desktop/symlink.nix | 4 ---- modules/nixos/users/tulg.nix | 2 ++ modules/servers/per-host/overlord/share.nix | 11 +++-------- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/hosts/overlord/hardware-configuration.nix b/hosts/overlord/hardware-configuration.nix index 7a6a8c0..3616e4d 100644 --- a/hosts/overlord/hardware-configuration.nix +++ b/hosts/overlord/hardware-configuration.nix @@ -24,7 +24,7 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true; fileSystems."/mnt/2tbhdd" = { - device = "/dev/disk/by-uuid/29c2878a-6b8b-4719-addc-ed57dd647d7b"; + device = "/dev/disk/by-uuid/4ec6fd72-a161-4944-8ad4-b727ea90d014"; fsType = "ext4"; }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/modules/home-manager/desktop/symlink.nix b/modules/home-manager/desktop/symlink.nix index 130e8f2..21afd1c 100644 --- a/modules/home-manager/desktop/symlink.nix +++ b/modules/home-manager/desktop/symlink.nix @@ -22,8 +22,4 @@ in { source = link "${dots}/mako"; recursive = true; }; - xdg.configFile."zellij" = { - source = link "${dots}/zellij"; - recursive = true; - }; } diff --git a/modules/nixos/users/tulg.nix b/modules/nixos/users/tulg.nix index a680273..b3dbb7d 100644 --- a/modules/nixos/users/tulg.nix +++ b/modules/nixos/users/tulg.nix @@ -1,4 +1,5 @@ { + users.groups.media.gid = 169; users.users.tulg = { isNormalUser = true; description = "Tulga"; @@ -10,6 +11,7 @@ "wheel" "libvirtd" "kvm" + "media" ]; }; users.users."root".openssh.authorizedKeys.keys = [ diff --git a/modules/servers/per-host/overlord/share.nix b/modules/servers/per-host/overlord/share.nix index 1dd9884..0ac9318 100644 --- a/modules/servers/per-host/overlord/share.nix +++ b/modules/servers/per-host/overlord/share.nix @@ -1,7 +1,7 @@ { fileSystems."/export/share" = { device = "/mnt/2tbhdd"; - fsType = "nfs"; + fsType = "none"; options = ["bind"]; }; services.nfs.server = { @@ -12,13 +12,9 @@ statdPort = 4000; extraNfsdConfig = ''''; exports = '' - /export/share *(rw,sync,no_subtree_check,all_squash,insecure,anonuid=1000,anongid=100) + /export/share *(rw,sync,no_subtree_check) ''; }; - users.users.tulg = { - createHome = false; - shell = "/run/current-system/sw/bin/nologin"; - }; networking.firewall = { enable = true; # for NFSv3; view with `rpcinfo -p` @@ -29,12 +25,11 @@ enable = true; shares.share = { - path = "/mnt/2tbhdd/smb/"; + path = "/mnt/2tbhdd/nfs"; browseable = "yes"; writable = "yes"; "guest ok" = "yes"; "read only" = "no"; - "force user" = "nobody"; }; }; }