diff options
| -rw-r--r-- | etc/.cfgl/config | 4 | ||||
| -rw-r--r-- | etc/nftables.conf | 10 | ||||
| -rw-r--r-- | etc/pacman.conf | 23 | ||||
| -rw-r--r-- | home/xyz/.config/myconf/upd_rsync_files | 1 | ||||
| -rwxr-xr-x | home/xyz/.local/bin/upd | 22 | ||||
| -rwxr-xr-x | home/xyz/.local/bin/xmr | 4 | ||||
| -rw-r--r-- | home/xyz/.profile | 6 |
7 files changed, 29 insertions, 41 deletions
diff --git a/etc/.cfgl/config b/etc/.cfgl/config index 57825631..4f0d404d 100644 --- a/etc/.cfgl/config +++ b/etc/.cfgl/config @@ -11,9 +11,9 @@ fetch = +refs/heads/*:refs/remotes/origin/* [commit] gpgsign = false -[branch "master"] +[branch "pp"] remote = origin - merge = refs/heads/master + merge = refs/heads/pp [remote "usb"] url = /run/media/xyz/bd0/git_repos/config_local_arch fetch = +refs/heads/*:refs/remotes/usb/* diff --git a/etc/nftables.conf b/etc/nftables.conf index f1278a96..50b901ff 100644 --- a/etc/nftables.conf +++ b/etc/nftables.conf @@ -21,13 +21,13 @@ table inet my_table { ip protocol icmp accept meta l4proto ipv6-icmp accept - #tcp dport ssh accept + tcp dport ssh accept #tcp dport searx accept - tcp dport qrcp accept + #tcp dport qrcp accept udp dport mdns accept - tcp dport qbt-mullvad accept - udp dport qbt-mullvad accept - tcp dport monerod-mullvad accept + #tcp dport qbt-mullvad accept + #udp dport qbt-mullvad accept + #tcp dport monerod-mullvad accept pkttype host limit rate 5/second counter reject with icmpx type admin-prohibited counter comment "count any other traffic" diff --git a/etc/pacman.conf b/etc/pacman.conf index 9b8987e6..eacdc089 100644 --- a/etc/pacman.conf +++ b/etc/pacman.conf @@ -69,14 +69,19 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +# DANCTNIX: Uncomment this if you want to be the first trying out new stuffs. +# They might break your device. +#[danctnix-testing] +#Server = https://p64.arikawa-hi.me/$repo/$arch/ + [fly] Server = file:///home/xyz/programs/repos/fly/$arch [fly-any] Server = file:///home/xyz/programs/repos/fly/any -#[testing] -#Include = /etc/pacman.d/mirrorlist +[danctnix] +Server = https://p64.arikawa-hi.me/$repo/$arch/ [core] Include = /etc/pacman.d/mirrorlist @@ -84,20 +89,14 @@ Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - [community] Include = /etc/pacman.d/mirrorlist -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist +[alarm] +Include = /etc/pacman.d/mirrorlist -#[multilib] -#Include = /etc/pacman.d/mirrorlist +[aur] +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/home/xyz/.config/myconf/upd_rsync_files b/home/xyz/.config/myconf/upd_rsync_files index f7e62551..ce7d01ab 100644 --- a/home/xyz/.config/myconf/upd_rsync_files +++ b/home/xyz/.config/myconf/upd_rsync_files @@ -1,4 +1,3 @@ -home/xyz/.bitmonero/wallets home/xyz/.cache/nsxiv home/xyz/.config/qBittorrent home/xyz/.config/qmmp/qmmp.conf diff --git a/home/xyz/.local/bin/upd b/home/xyz/.local/bin/upd index e56a509c..f2ea2565 100755 --- a/home/xyz/.local/bin/upd +++ b/home/xyz/.local/bin/upd @@ -5,7 +5,7 @@ all () { qb refl usb - xmr + #xmr } clean () { @@ -98,24 +98,24 @@ usb () { #rsync -navPR --delete ~/archive ~/documents ~/downloads ~/music ~/pictures ~/programs ~/test ~/videos ~/.local/share/stardict/dic ~/.local/share/qBittorrent ~/.local/share/sdcv_history ~/.cache/nsxiv ~/.config/qBittorrent ~/.bitmonero/wallets ~/.password-store /run/media/xyz/bd0 # --files-from make -a not imply -r, so need to specify explicitly - rsync -avPRr --delete --files-from="$XDG_CONFIG_HOME/myconf/upd_rsync_files" / /run/media/xyz/bd0 + rsync -avPRr --delete --files-from="$XDG_CONFIG_HOME/myconf/upd_rsync_files" / /run/media/xyz/bd0/pp # not sure if useful or not sync } -xmr () { - # use cd to workaround monero-blockchain-export.log log file save in current dir? issue, haven't tested - cd "$HOME/.bitmonero" || exit - monero-blockchain-export --output-file /run/media/xyz/bd0/archive/monero/blockchain.raw - # not sure if useful or not - sync -} +#xmr () { +# # use cd to workaround monero-blockchain-export.log log file save in current dir? issue, haven't tested +# cd "$HOME/.bitmonero" || exit +# monero-blockchain-export --output-file /run/media/xyz/bd0/archive/monero/blockchain.raw +# # not sure if useful or not +# sync +#} if [ $# -eq 0 ]; then fast else - while getopts acfjmpqrux opt; do + while getopts acfjmpqru opt; do case $opt in a)all;; c)clean;; @@ -126,7 +126,7 @@ else q)qb;; r)refl;; u)usb;; - x)xmr;; + #x)xmr;; \?)exit 1;; esac done diff --git a/home/xyz/.local/bin/xmr b/home/xyz/.local/bin/xmr deleted file mode 100755 index e0516b9a..00000000 --- a/home/xyz/.local/bin/xmr +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -pidof -q monerod || alacritty -e monerod -monero-wallet-cli --config-file="$HOME/.bitmonero/monero-wallet-cli.conf" diff --git a/home/xyz/.profile b/home/xyz/.profile index f6dd5e8c..7cb95096 100644 --- a/home/xyz/.profile +++ b/home/xyz/.profile @@ -89,9 +89,3 @@ playerctld daemon # https://github.com/koalaman/shellcheck/wiki/SC3046 #[[ -f ~/.bashrc ]] && . ~/.bashrc [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" - -# startx when login, should be put after environmental variables for .xinitrc to use -# use `[ "$XDG_VTNR" ]` to avoid "-bash: [: : integer expression expected" warning/error message, when `sudo su - xyz` or ssh into a remote server, not sure if best practice or not -if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then - exec startx -fi |