configure_priv.sh

@@ -324,33 +324,13 @@ configure_fail2ban() {
 }
 
 configure_iptables() {
+    [ -f /etc/network/if-pre-up.d/iptables-load ] && return
     [ $offline -eq 1 ] && return
-    if command_exists ifquery && systemctl is-active --quiet networking; then
-        # ifupdown: /etc/network/if-pre-up.d/iptables-load
-        [ -f /etc/network/if-pre-up.d/iptables-load ] && return
-        if confirm_action "要配置 iptables 吗？" "N"; then
-            sudo cp $scriptdir/files/iptables-load /etc/network/if-pre-up.d/iptables-load
-            sudo chmod +x /etc/network/if-pre-up.d/iptables-load
-            sudo sh /etc/network/if-pre-up.d/iptables-load
-        fi
-    else
-        # systemd: /etc/network/iptables-load
-        [ -f /etc/network/iptables-load ] && return
-        if confirm_action "要配置 iptables 吗？" "N"; then
-            if [ -f /etc/network/if-pre-up.d/iptables-load ]; then
-                sudo mv /etc/network/if-pre-up.d/iptables-load /etc/network/iptables-load
-            else
-                sudo cp $scriptdir/files/iptables-load /etc/network/iptables-load
-                sudo chmod +x /etc/network/iptables-load
-                sudo sh /etc/network/iptables-load
-            fi
 
-            sudo cp $scriptdir/files/iptables-load.service /etc/systemd/system/iptables-load.service
+    if confirm_action "要配置 iptables 吗？" "N"; then
-            sudo chmod +x /etc/systemd/system/iptables-load.service
+        sudo cp $scriptdir/files/iptables-load /etc/network/if-pre-up.d/iptables-load
-            sudo systemctl daemon-reload
+        sudo chmod +x /etc/network/if-pre-up.d/iptables-load
-            sudo systemctl start iptables-load.service
+        sudo sh /etc/network/if-pre-up.d/iptables-load
-            sudo systemctl enable iptables-load.service
-        fi
     fi
 }
 

files/discarded/.zshrc

@@ -0,0 +1,185 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="ys-simple"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git)
+plugins+=(git-open autojump zsh-autosuggestions zsh-syntax-highlighting sudo)
+plugins+=(history encode64 tmux)
+plugins+=(dirhistory jsontools)
+
+dependent_plugins() {
+    if command -v "$@" >/dev/null 2>&1; then plugins+=("$@"); fi
+}
+
+dependent_plugins docker-compose
+dependent_plugins fzf
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# ====================================================================================================
+
+HOST="VM-ubuntu"
+
+HIST_STAMPS='yyyy-mm-dd'
+DISABLE_AUTO_TITLE='true'
+ZSH_THEME_TERM_TITLE_IDLE='%~'
+
+alias -s txt='nano'
+alias -s xz='tar -xvf'
+alias -s gz='tar -xzvf'
+alias -s tgz='tar -xzvf'
+alias -s zip='unzip'
+alias -s bz2='tar -xjvf'
+
+alias cp='cp -i'
+alias cl='clear'
+alias ag='alias | grep'
+alias hg='history | grep'
+
+alias ipl='sudo iptables -L -n'
+if [ -f "/etc/network/if-pre-up.d/iptables-load" ]; then
+    alias ipe='sudo nano /etc/network/if-pre-up.d/iptables-load'
+    alias ips='sudo /etc/network/if-pre-up.d/iptables-load'
+fi
+
+command_exists() { command -v "$@" >/dev/null 2>&1; }
+
+command_exists trash-put && alias rm='trash-put'
+command_exists batcat && alias cat='batcat'
+command_exists fdfind && alias fd='fdfind'
+
+if command_exists exa; then
+    alias e='exa -la'
+    alias eb='eza -lab'
+    alias et='exa -lT'
+    alias ef='exa -lTa -BhHigSmu'
+fi
+
+command_exists docker && alias gost='docker run --rm -p 9443:9443 --cpus=0.2 --memory=256mb gogost/gost -L socks5://nano:QpuwAqcsP8Xp@:9443'
+
+source ~/.user_utils
+alias net='__get_ip'
+
+_systemctl_unit_state() {
+    typeset -gA _sys_unit_state
+    _sys_unit_state=( $(__systemctl list-unit-files '$PREFIX*' | awk '{print $1, $2}') )
+}
+
+# pip3
+export PATH=$PATH:$HOME/.local/bin
+command_exists trash-put && alias rm='trash-put'
+
+# Docker
+# export DOCKER_HOST=unix:///run/user/500/docker.sock
+# export DOCKER_HOST=unix:///run/user/1000/docker.sock
+
+# Yarn
+# export PATH=$PATH:$HOME/.yarn/bin
+
+# Golang
+# export PATH=$PATH:/usr/local/go/bin
+# export PATH=$PATH:$HOME/.local/go/bin
+# export GOPROXY=https://goproxy.cn,direct
+
+# Node.js, npm, nvm
+# export NVM_NODEJS_ORG_MIRROR=https://npmmirror.com/mirrors/node
+# export NVM_IOJS_ORG_MIRROR=https://npmmirror.com/mirrors/iojs
+
+# WSL Xming
+# export DISPLAY=:0;
+
+alias lazy='~/.lazy/run.sh'

files/iptables-load.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Load iptables rules during network pre-up
-Wants=network-pre.target
-Before=network-pre.target
-
-[Service]
-Type=oneshot
-ExecStart=/etc/network/iptables-load
-RemainAfterExit=yes
-
-[Install]
-WantedBy=network-pre.target

files/zsh/51-alias.zsh

@@ -14,10 +14,7 @@ command_exists() { command -v "$@" >/dev/null 2>&1; }
 
 if command_exists iptables; then
     alias ipl='sudo iptables -L -n'
-    if [ -f "/etc/network/iptables-load" ]; then
+    if [ -f "/etc/network/if-pre-up.d/iptables-load" ]; then
-        alias ipe='sudo vi /etc/network/iptables-load'
-        alias ips='sudo /etc/network/iptables-load'
-    elif [ -f "/etc/network/if-pre-up.d/iptables-load" ]; then
         alias ipe='sudo vi /etc/network/if-pre-up.d/iptables-load'
         alias ips='sudo /etc/network/if-pre-up.d/iptables-load'
     fi