diff options
Diffstat (limited to 'hosts')
| -rwxr-xr-x | hosts/iroha/scripts/game.sh (renamed from hosts/iroha/scripts/game) | 5 | ||||
| -rwxr-xr-x | hosts/iroha/scripts/prepare-network-mounts | 7 | ||||
| -rwxr-xr-x | hosts/iroha/scripts/rebuild-modules | 3 | ||||
| -rwxr-xr-x | hosts/iroha/scripts/xbox-controller-battery | 2 | ||||
| -rw-r--r-- | hosts/moyo/samba/smb.conf | 6 | ||||
| -rwxr-xr-x | hosts/moyo/scripts/id-dm-device | 2 | ||||
| -rwxr-xr-x | hosts/moyo/scripts/mount-luks | 11 | ||||
| -rw-r--r-- | hosts/sofue/incus.yaml | 80 | ||||
| -rw-r--r-- | hosts/yashinoki/configuration.nix | 2 |
9 files changed, 80 insertions, 38 deletions
diff --git a/hosts/iroha/scripts/game b/hosts/iroha/scripts/game.sh index c716f7e..c8d626d 100755 --- a/hosts/iroha/scripts/game +++ b/hosts/iroha/scripts/game.sh @@ -1,6 +1,5 @@ #! /usr/bin/env sh sudo su -c 'echo high > /sys/class/drm/card0/device/power_dpm_force_performance_level' -#read -p "Waiting..." -sudo scx_bpfland +read -p "Waiting..." +#sudo scx_bpfland sudo su -c 'echo auto > /sys/class/drm/card0/device/power_dpm_force_performance_level' - diff --git a/hosts/iroha/scripts/prepare-network-mounts b/hosts/iroha/scripts/prepare-network-mounts index 7559c26..06cf01b 100755 --- a/hosts/iroha/scripts/prepare-network-mounts +++ b/hosts/iroha/scripts/prepare-network-mounts @@ -1,5 +1,4 @@ #! /usr/bin/env sh - -/home/andrew/scripts/mount-nfs /srv/nfs/c /home/andrew/c -/home/andrew/scripts/mount-nfs /srv/nfs/pics /home/andrew/pics -/home/andrew/scripts/mount-nfs /srv/nfs/torrents /mnt/store/files/ext/torrents +$HOME/scripts/mount-nfs /srv/nfs/c /mnt/nfs/c +$HOME/scripts/mount-nfs /srv/nfs/pics /mnt/nfs/pics +$HOME/scripts/mount-nfs /srv/nfs/samba /mnt/nfs/samba diff --git a/hosts/iroha/scripts/rebuild-modules b/hosts/iroha/scripts/rebuild-modules index 9a0d902..ad400f8 100755 --- a/hosts/iroha/scripts/rebuild-modules +++ b/hosts/iroha/scripts/rebuild-modules @@ -1,3 +1,4 @@ #! /usr/bin/env sh -sudo emerge --ask --verbose v4l2loopback xpad-noone \=games-util/xone-0.3_p20240226 nvidia-drivers +#sudo emerge --ask --verbose v4l2loopback xpad-noone \=games-util/xone-0.3_p20240226 nvidia-drivers +sudo emerge --ask --verbose xpad-noone v4l2loopback diff --git a/hosts/iroha/scripts/xbox-controller-battery b/hosts/iroha/scripts/xbox-controller-battery new file mode 100755 index 0000000..84913cc --- /dev/null +++ b/hosts/iroha/scripts/xbox-controller-battery @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +cat /sys/class/power_supply/gip0.0/capacity_level diff --git a/hosts/moyo/samba/smb.conf b/hosts/moyo/samba/smb.conf index 1ca1afa..5781f4f 100644 --- a/hosts/moyo/samba/smb.conf +++ b/hosts/moyo/samba/smb.conf @@ -11,16 +11,16 @@ max log size = 50 passdb backend = tdbsam allow insecure wide links = yes - kernel oplocks = no + kernel oplocks = yes socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=32768 SO_SNDBUF=32768 getwd cache = true acl allow execute always = yes ea support = yes store dos attributes = yes -[code] +[samba] comment = code - path = /srv/nfs/c + path = /srv/nfs/samba valid users = andrew guest ok = no browseable = yes diff --git a/hosts/moyo/scripts/id-dm-device b/hosts/moyo/scripts/id-dm-device new file mode 100755 index 0000000..b7d5781 --- /dev/null +++ b/hosts/moyo/scripts/id-dm-device @@ -0,0 +1,2 @@ +#! /usr/bin/env sh +sudo sudo dmsetup info /dev/$1 diff --git a/hosts/moyo/scripts/mount-luks b/hosts/moyo/scripts/mount-luks index 1d89cd2..5be1aaa 100755 --- a/hosts/moyo/scripts/mount-luks +++ b/hosts/moyo/scripts/mount-luks @@ -1,10 +1,11 @@ #! /usr/bin/env sh + sudo cryptsetup luksOpen /dev/mapper/moyo--vg1-moyo--store0--raid1 moyo-store0 sudo mount /dev/mapper/moyo-store0 /mnt/store0 -sudo mount --bind /mnt/store0/c /srv/nfs/c -sudo mount --bind /mnt/store0/media/pics /srv/nfs/pics -sudo mount --bind /mnt/store0/torrents /srv/nfs/torrents -$HOME/scripts/export-nfs /srv/nfs + +sudo mount --bind /mnt/store0/nfs/c /srv/nfs/c +sudo mount --bind /mnt/store0/nfs/pics /srv/nfs/pics +sudo mount --bind /mnt/store0/nfs/samba /srv/nfs/samba $HOME/scripts/export-nfs /srv/nfs/c $HOME/scripts/export-nfs /srv/nfs/pics -$HOME/scripts/export-nfs /srv/nfs/torrents +$HOME/scripts/export-nfs /srv/nfs/samba diff --git a/hosts/sofue/incus.yaml b/hosts/sofue/incus.yaml index b01d237..407e604 100644 --- a/hosts/sofue/incus.yaml +++ b/hosts/sofue/incus.yaml @@ -29,14 +29,14 @@ container: security.syscalls.intercept.bpf.devices: "true" security.syscalls.intercept.mknod: "true" security.syscalls.intercept.mount: "true" - security.syscalls.intercept.mount.allowed: ext4,fat32,ntfs + security.syscalls.intercept.mount.allowed: ext4,fat32,ntfs,udf security.syscalls.intercept.mount.shift: "true" security.syscalls.intercept.sched_setscheduler: "true" security.syscalls.intercept.setxattr: "true" security.syscalls.intercept.sysinfo: "true" volatile.base_image: b57963b527b192cbd262777b137333def448e7dc21fbf954e75a51f1b8acef5c volatile.cloud-init.instance-id: 8d938ed8-c204-48e1-9670-f3aea059fd57 - volatile.eth0.host_name: veth4220df45 + volatile.eth0.host_name: veth812d6ba0 volatile.eth0.hwaddr: 00:16:3e:c3:79:59 volatile.idmap.base: "0" volatile.idmap.current: '[{"Isuid":true,"Isgid":false,"Hostid":1000000,"Nsid":0,"Maprange":1000},{"Isuid":true,"Isgid":false,"Hostid":1000,"Nsid":1000,"Maprange":1},{"Isuid":true,"Isgid":false,"Hostid":1001001,"Nsid":1001,"Maprange":999998999},{"Isuid":false,"Isgid":true,"Hostid":1000000,"Nsid":0,"Maprange":17},{"Isuid":false,"Isgid":true,"Hostid":18,"Nsid":17,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000018,"Nsid":18,"Maprange":82},{"Isuid":false,"Isgid":true,"Hostid":100,"Nsid":100,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000101,"Nsid":101,"Maprange":73},{"Isuid":false,"Isgid":true,"Hostid":97,"Nsid":174,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000175,"Nsid":175,"Maprange":999999825}]' @@ -47,6 +47,12 @@ container: volatile.uuid: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0 volatile.uuid.generation: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0 devices: + 8bitdom30: + gid: "97" + mode: "0666" + productid: "0024" + type: unix-hotplug + vendorid: 0ca3 PipewireSocket1: bind: container connect: unix:/run/user/1000/pipewire-0 @@ -78,6 +84,7 @@ container: type: proxy uid: "1000" binder: + gid: "100" mode: "0666" path: /dev/binder source: /dev/binder @@ -88,8 +95,8 @@ container: source: /dev/sr0 type: unix-block code: - path: /home/andrew/c - source: /home/andrew/c + path: /mnt/nfs/c + source: /mnt/nfs/c type: disk data: path: /mnt/data @@ -105,6 +112,10 @@ container: productid: "0201" type: unix-hotplug vendorid: 04d9 + ext_ssd: + path: /mnt/ext_ssd + source: /mnt/ext_ssd + type: disk googlepixel: mode: "0666" productid: 4ee7 @@ -160,6 +171,7 @@ container: listen: tcp:0.0.0.0:14356 type: proxy hwbinder: + gid: "100" mode: "0666" path: /dev/hwbinder source: /dev/hwbinder @@ -207,8 +219,12 @@ container: pci: 0000:0f:00.0 type: gpu pics: - path: /home/andrew/pics - source: /home/andrew/pics + path: /mnt/nfs/pics + source: /mnt/nfs/pics + type: disk + samba: + path: /mnt/nfs/samba + source: /mnt/nfs/samba type: disk ssd: path: /mnt/ssd @@ -218,10 +234,12 @@ container: path: /mnt/store source: /mnt/store type: disk - torrents: - path: /mnt/store/files/ext/torrents - source: /mnt/store/files/ext/torrents - type: disk + switchpro: + gid: "97" + mode: "0666" + productid: "2009" + type: unix-hotplug + vendorid: 057e tty: mode: "0666" path: /dev/tty @@ -265,6 +283,7 @@ container: source: /dev/video1 type: unix-char vndbinder: + gid: "100" mode: "0666" path: /dev/vndbinder source: /dev/vndbinder @@ -334,14 +353,14 @@ container: security.syscalls.intercept.bpf.devices: "true" security.syscalls.intercept.mknod: "true" security.syscalls.intercept.mount: "true" - security.syscalls.intercept.mount.allowed: ext4,fat32,ntfs + security.syscalls.intercept.mount.allowed: ext4,fat32,ntfs,udf security.syscalls.intercept.mount.shift: "true" security.syscalls.intercept.sched_setscheduler: "true" security.syscalls.intercept.setxattr: "true" security.syscalls.intercept.sysinfo: "true" volatile.base_image: b57963b527b192cbd262777b137333def448e7dc21fbf954e75a51f1b8acef5c volatile.cloud-init.instance-id: 8d938ed8-c204-48e1-9670-f3aea059fd57 - volatile.eth0.host_name: veth4220df45 + volatile.eth0.host_name: veth812d6ba0 volatile.eth0.hwaddr: 00:16:3e:c3:79:59 volatile.idmap.base: "0" volatile.idmap.current: '[{"Isuid":true,"Isgid":false,"Hostid":1000000,"Nsid":0,"Maprange":1000},{"Isuid":true,"Isgid":false,"Hostid":1000,"Nsid":1000,"Maprange":1},{"Isuid":true,"Isgid":false,"Hostid":1001001,"Nsid":1001,"Maprange":999998999},{"Isuid":false,"Isgid":true,"Hostid":1000000,"Nsid":0,"Maprange":17},{"Isuid":false,"Isgid":true,"Hostid":18,"Nsid":17,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000018,"Nsid":18,"Maprange":82},{"Isuid":false,"Isgid":true,"Hostid":100,"Nsid":100,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000101,"Nsid":101,"Maprange":73},{"Isuid":false,"Isgid":true,"Hostid":97,"Nsid":174,"Maprange":1},{"Isuid":false,"Isgid":true,"Hostid":1000175,"Nsid":175,"Maprange":999999825}]' @@ -352,6 +371,12 @@ container: volatile.uuid: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0 volatile.uuid.generation: 85cd7ef4-2e99-4d9b-ad55-a0b311d3a7d0 expanded_devices: + 8bitdom30: + gid: "97" + mode: "0666" + productid: "0024" + type: unix-hotplug + vendorid: 0ca3 PipewireSocket1: bind: container connect: unix:/run/user/1000/pipewire-0 @@ -383,6 +408,7 @@ container: type: proxy uid: "1000" binder: + gid: "100" mode: "0666" path: /dev/binder source: /dev/binder @@ -393,8 +419,8 @@ container: source: /dev/sr0 type: unix-block code: - path: /home/andrew/c - source: /home/andrew/c + path: /mnt/nfs/c + source: /mnt/nfs/c type: disk data: path: /mnt/data @@ -414,6 +440,10 @@ container: name: eth0 network: incusbr0 type: nic + ext_ssd: + path: /mnt/ext_ssd + source: /mnt/ext_ssd + type: disk googlepixel: mode: "0666" productid: 4ee7 @@ -469,6 +499,7 @@ container: listen: tcp:0.0.0.0:14356 type: proxy hwbinder: + gid: "100" mode: "0666" path: /dev/hwbinder source: /dev/hwbinder @@ -516,13 +547,17 @@ container: pci: 0000:0f:00.0 type: gpu pics: - path: /home/andrew/pics - source: /home/andrew/pics + path: /mnt/nfs/pics + source: /mnt/nfs/pics type: disk root: path: / pool: default type: disk + samba: + path: /mnt/nfs/samba + source: /mnt/nfs/samba + type: disk ssd: path: /mnt/ssd source: /mnt/ssd @@ -531,10 +566,12 @@ container: path: /mnt/store source: /mnt/store type: disk - torrents: - path: /mnt/store/files/ext/torrents - source: /mnt/store/files/ext/torrents - type: disk + switchpro: + gid: "97" + mode: "0666" + productid: "2009" + type: unix-hotplug + vendorid: 057e tty: mode: "0666" path: /dev/tty @@ -578,6 +615,7 @@ container: source: /dev/video1 type: unix-char vndbinder: + gid: "100" mode: "0666" path: /dev/vndbinder source: /dev/vndbinder @@ -609,7 +647,7 @@ container: name: sofue status: Running status_code: 103 - last_used_at: 2025-05-02T10:45:55.80642907Z + last_used_at: 2025-05-27T23:32:26.92570937Z location: none type: container project: iroha diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix index 06a6700..932637a 100644 --- a/hosts/yashinoki/configuration.nix +++ b/hosts/yashinoki/configuration.nix @@ -139,7 +139,7 @@ in { }; users.users.andrew.extraGroups = [ "networkmanager" ]; - fileSystems."/home/andrew/c" = { + fileSystems."/mnt/nfs/c" = { device = "moyo:/srv/nfs/c"; fsType = "nfs4"; options = disks.nfs_options; |