summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/.cfgl/config4
-rw-r--r--etc/fstab8
-rw-r--r--etc/hostname2
-rw-r--r--etc/myconf/cfgl_meta9
-rw-r--r--etc/nftables.conf9
-rw-r--r--etc/postfix/main.cf2
-rw-r--r--etc/services5
-rw-r--r--etc/systemd/network/10-cloud-init-eth0.network35
l---------etc/systemd/system/multi-user.target.wants/qbittorrent-nox@xyz.service1
-rw-r--r--etc/systemd/system/paccache.service.d/10-remove-all.conf8
-rw-r--r--etc/systemd/system/paccache.service.d/20-remove-all-uninstalled.conf9
-rw-r--r--home/xyz/.bashrc2
-rw-r--r--home/xyz/.config/myconf/pacman_Qqme1
-rw-r--r--home/xyz/.config/myconf/pacman_Qqne2
-rw-r--r--home/xyz/.config/myconf/sye1
-rw-r--r--home/xyz/.local/share/qBittorrent/nova3/engines/jackett.json6
16 files changed, 48 insertions, 56 deletions
diff --git a/etc/.cfgl/config b/etc/.cfgl/config
index 608699e2..cf863b03 100644
--- a/etc/.cfgl/config
+++ b/etc/.cfgl/config
@@ -11,6 +11,6 @@
fetch = +refs/heads/*:refs/remotes/origin/*
[commit]
gpgsign = false
-[branch "ca"]
+[branch "ib"]
remote = origin
- merge = refs/heads/ca
+ merge = refs/heads/ib
diff --git a/etc/fstab b/etc/fstab
index a3bf39b9..a3aa1b42 100644
--- a/etc/fstab
+++ b/etc/fstab
@@ -2,4 +2,10 @@
# See fstab(5) for details.
# <file system> <dir> <type> <options> <dump> <pass>
-/swap/swapfile none swap defaults 0 0
+# /dev/sda1 LABEL=root
+UUID=ed61e67e-7605-4383-ac16-fe54ee2ede87 / ext4 rw,relatime,errors=remount-ro 0 1
+
+# /dev/sdb1
+UUID=57bd9dcd-6024-4e7e-a5c7-811269c13078 /home ext4 rw,relatime 0 2
+
+/swapfile none swap defaults 0 0
diff --git a/etc/hostname b/etc/hostname
index 8eb04e15..89dfb421 100644
--- a/etc/hostname
+++ b/etc/hostname
@@ -1 +1 @@
-xyzca
+xyzib
diff --git a/etc/myconf/cfgl_meta b/etc/myconf/cfgl_meta
index 04ff1f47..44110548 100644
--- a/etc/myconf/cfgl_meta
+++ b/etc/myconf/cfgl_meta
@@ -41,7 +41,6 @@
644 root root //etc/sysctl.d/99-sysctl.conf
755 root root //etc/systemd
755 root root //etc/systemd/network
-644 systemd-network systemd-network //etc/systemd/network/10-cloud-init-eth0.network
755 root root //etc/systemd/system
755 root root //etc/systemd/system/acme.sh.service.d
644 root root //etc/systemd/system/acme.sh.service.d/override.conf
@@ -50,7 +49,7 @@
755 root root //etc/systemd/system/opendmarc.service.d
644 root root //etc/systemd/system/opendmarc.service.d/override.conf
755 root root //etc/systemd/system/paccache.service.d
-644 root root //etc/systemd/system/paccache.service.d/20-remove-all-uninstalled.conf
+644 root root //etc/systemd/system/paccache.service.d/10-remove-all.conf
755 root root //etc/tmpfiles.d
644 root root //etc/tmpfiles.d/opendmarc.conf
755 root root //home
@@ -72,6 +71,12 @@
755 xyz wheel //home/xyz/.config/nvim
644 xyz wheel //home/xyz/.config/nvim/init.vim
600 xyz wheel //home/xyz/.config/user-dirs.dirs
+755 xyz wheel //home/xyz/.local
+755 xyz wheel //home/xyz/.local/share
+755 xyz wheel //home/xyz/.local/share/qBittorrent
+755 xyz wheel //home/xyz/.local/share/qBittorrent/nova3
+755 xyz wheel //home/xyz/.local/share/qBittorrent/nova3/engines
+644 xyz wheel //home/xyz/.local/share/qBittorrent/nova3/engines/jackett.json
644 xyz wheel //home/xyz/.profile
700 xyz wheel //home/xyz/.ssh
600 xyz wheel //home/xyz/.ssh/authorized_keys
diff --git a/etc/nftables.conf b/etc/nftables.conf
index b824edee..da1f2f44 100644
--- a/etc/nftables.conf
+++ b/etc/nftables.conf
@@ -3,7 +3,10 @@
# IPv4/IPv6 Simple & Safe firewall ruleset.
# More examples in /usr/share/nftables/ and /usr/share/doc/nftables/examples/.
-# some codes from https://wiki.archlinux.org/title/Nftables
+# references, some codes from:
+# https://wiki.archlinux.org/title/Nftables
+# https://www.procustodibus.com/blog/2021/11/wireguard-nftables
+# https://wiki.gentoo.org/wiki/Nftables/Examples#Basic_NAT
# needed for reload config using `sudo systemctl restart nftables` or `sudo nft -f /etc/nftables.conf`
flush ruleset
@@ -25,8 +28,8 @@ table inet my_table {
tcp dport ssh accept
#tcp dport qbt-nox accept
- #tcp dport qbt accept
- #udp dport qbt accept
+ tcp dport qbt accept
+ udp dport qbt accept
#tcp dport iperf3 accept
udp dport wireguard accept
udp dport swgp accept
diff --git a/etc/postfix/main.cf b/etc/postfix/main.cf
index fe83cc82..f5cc794d 100644
--- a/etc/postfix/main.cf
+++ b/etc/postfix/main.cf
@@ -7,7 +7,7 @@
# `man postconf.5`
# print config: `postconf`
# default config: `postconf -d`
-myhostname = mail.flylightning.xyz
+myhostname = mail2.flylightning.xyz
# fix "relay access denied" error when receiving emails
# I choose to follow `man postconf.5` instruction to only add $mydomain
diff --git a/etc/services b/etc/services
index 45722821..5081b2a3 100644
--- a/etc/services
+++ b/etc/services
@@ -11522,3 +11522,8 @@ wireguard 49432/udp
ssh-isp 49812/tcp
iperf3 53497/tcp
swgp 54635/udp
+# qbittorrent-nox web ui port for remote access browser gui
+qbt-nox 57151/tcp
+# qbittorrent/ options/ connection/ listening port
+qbt 57737/tcp
+qbt 57737/udp
diff --git a/etc/systemd/network/10-cloud-init-eth0.network b/etc/systemd/network/10-cloud-init-eth0.network
deleted file mode 100644
index 7829f528..00000000
--- a/etc/systemd/network/10-cloud-init-eth0.network
+++ /dev/null
@@ -1,35 +0,0 @@
-# not fully understood
-# https://unix.stackexchange.com/q/509430/
-# man `systemd.network`
-# https://superuser.com/q/1562380
-# https://docs.netgate.com/pfsense/en/latest/network/ipv6/subnets.html
-
-[Match]
-Name=eth0
-
-[Address]
-Address=38.175.201.185/22
-
-[Address]
-Address=2606:a8c0:3::75f/128
-
-[Address]
-# another ipv6 address for aa wireguard+swgp into
-# not sure if it is corret, but it works
-Address=2606:a8c0:3:773::b/64
-
-[Address]
-# the last address seems is the default?
-# ...:1/64 also works, but I use ...:a/64 because crunchbits panel reverse DNS support this address
-# 2024-06-27, ...:1/64 seems doe not work any more, not sure why
-Address=2606:a8c0:3:773::a/64
-# use the following will not need GatewayOnLink=yes in [Route] section, but I'm not sure if it is correct, I'm not sure if those ips could be accessed without gateway, more see https://superuser.com/q/1562380
-#Address=2606:a8c0:3:773::a/48
-
-[Route]
-Gateway=38.175.200.1
-
-[Route]
-Gateway=2606:a8c0:3::1
-# GatewayOnLink=yes needed for 2606:a8c0:3::1 gateway, maybe because 2606:a8c0:3::1 is not in the same subnet as 2606:a8c0:3:38d::a/64? see: https://serverfault.com/q/814419
-GatewayOnLink=yes
diff --git a/etc/systemd/system/multi-user.target.wants/qbittorrent-nox@xyz.service b/etc/systemd/system/multi-user.target.wants/qbittorrent-nox@xyz.service
new file mode 120000
index 00000000..41aa9f51
--- /dev/null
+++ b/etc/systemd/system/multi-user.target.wants/qbittorrent-nox@xyz.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/qbittorrent-nox@.service \ No newline at end of file
diff --git a/etc/systemd/system/paccache.service.d/10-remove-all.conf b/etc/systemd/system/paccache.service.d/10-remove-all.conf
new file mode 100644
index 00000000..a33a36a2
--- /dev/null
+++ b/etc/systemd/system/paccache.service.d/10-remove-all.conf
@@ -0,0 +1,8 @@
+[Service]
+# may need `sudo systemctl daemon-reload` afterward
+# need a line of `ExecStart=` to clear the list first,
+# more about drop-in dir see `man systemd.unit`, more about ExecStart see `man systemd.service`
+# https://wiki.archlinux.org/title/Systemd#Drop-in_files
+# https://wiki.archlinux.org/title/Systemd#Examples
+ExecStart=
+ExecStart=/usr/bin/paccache -rk0
diff --git a/etc/systemd/system/paccache.service.d/20-remove-all-uninstalled.conf b/etc/systemd/system/paccache.service.d/20-remove-all-uninstalled.conf
deleted file mode 100644
index 38d3c2d0..00000000
--- a/etc/systemd/system/paccache.service.d/20-remove-all-uninstalled.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[Service]
-# keep original `ExecStart=/usr/bin/paccache -r` while adding to the list
-# because I want the default behavior and also remove all uninstalled pacman package cache
-# may need `sudo systemctl daemon-reload` afterward
-# if I want to clear the list first, I should do a line of `ExecStart=` first
-# more about drop-in dir see `man systemd.unit`, more about ExecStart see `man systemd.service`
-# https://wiki.archlinux.org/title/Systemd#Drop-in_files
-# https://wiki.archlinux.org/title/Systemd#Examples
-ExecStart=/usr/bin/paccache -ruk0
diff --git a/home/xyz/.bashrc b/home/xyz/.bashrc
index 8b1dff90..d1755bc6 100644
--- a/home/xyz/.bashrc
+++ b/home/xyz/.bashrc
@@ -29,7 +29,7 @@ esac
# tput is better for different terminals?
# but also need \[ and \] around color code for PS1! but seems no need for printf in script? why?
# setaf and sgr0 see `man terminfo`, also it seems can have 256 different colors
-PS1="\[$(tput setaf 6)\][\u@\h \W]\$ \[$(tput sgr0)\]"
+PS1="\[$(tput setaf 5)\][\u@\h \W]\$ \[$(tput sgr0)\]"
# https://github.com/LukeSmithxyz/voidrice/blob/master/.config/shell/aliasrc
for cmd in hardcode-fixer ventoy units_cur fbgrab powertop nft rpi-imager fdisk dmesg; do
diff --git a/home/xyz/.config/myconf/pacman_Qqme b/home/xyz/.config/myconf/pacman_Qqme
index 1ae88691..026331c3 100644
--- a/home/xyz/.config/myconf/pacman_Qqme
+++ b/home/xyz/.config/myconf/pacman_Qqme
@@ -5,6 +5,7 @@ bash-complete-alias
dashbinsh
grub-hook
htop-vim
+jackett-bin
librespeed-cli-bin
neovim-plug
paru-bin
diff --git a/home/xyz/.config/myconf/pacman_Qqne b/home/xyz/.config/myconf/pacman_Qqne
index 961590a5..7efe7697 100644
--- a/home/xyz/.config/myconf/pacman_Qqne
+++ b/home/xyz/.config/myconf/pacman_Qqne
@@ -1,7 +1,6 @@
base
base-devel
bash-completion
-btrfs-progs
dash
devtools
dovecot
@@ -38,6 +37,7 @@ posix-user-portability
posix-xsi
postfix
python-pip
+qbittorrent-nox
rebuild-detector
reflector
shellcheck
diff --git a/home/xyz/.config/myconf/sye b/home/xyz/.config/myconf/sye
index a47a970f..576c1d39 100644
--- a/home/xyz/.config/myconf/sye
+++ b/home/xyz/.config/myconf/sye
@@ -1,6 +1,7 @@
UNIT FILE STATE PRESET
dovecot.service enabled disabled
getty@.service enabled enabled
+jackett.service enabled disabled
nftables.service enabled disabled
opendkim.service enabled disabled
opendmarc.service enabled disabled
diff --git a/home/xyz/.local/share/qBittorrent/nova3/engines/jackett.json b/home/xyz/.local/share/qBittorrent/nova3/engines/jackett.json
new file mode 100644
index 00000000..b79246d6
--- /dev/null
+++ b/home/xyz/.local/share/qBittorrent/nova3/engines/jackett.json
@@ -0,0 +1,6 @@
+{
+ "api_key": "1a6rfhe9xw7fzgu640vnymriq00lbyav",
+ "thread_count": 20,
+ "tracker_first": false,
+ "url": "http://127.0.0.1:9117"
+}
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-04-16 15:12:08 +0000