Merge branch 'master' of gitee.com:klesh/dotfiles
This commit is contained in:
commit
3c6a505fa3
0
cli/keyd.sh
Normal file → Executable file
0
cli/keyd.sh
Normal file → Executable file
22
cli/proxy.sh
Executable file
22
cli/proxy.sh
Executable file
|
@ -0,0 +1,22 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
DIR=$(dirname "$(readlink -f "$0")")
|
||||
. "$DIR/../env.sh"
|
||||
|
||||
log 'Setting up shell'
|
||||
|
||||
case "$UNAMEA" in
|
||||
*artix*)
|
||||
sudo pacman -S --noconfirm --needed clash
|
||||
sudo rm -rf /etc/runit/sv/clash
|
||||
sudo cp -r $DIR/prx /etc/runit/sv/clash
|
||||
sudo mkdir -p /etc/clash
|
||||
sudo cp ~/Nextcloud/docker/clash/config.yaml /etc/clash/
|
||||
sudo cp ~/Nextcloud/docker/clash/Country.mmdb /etc/clash/
|
||||
sudo rm -rf /etc/clash/ui
|
||||
sudo cp -r ~/Nextcloud/docker/clash/clash-dashboard-gh-pages /etc/clash/ui
|
||||
sudo ln -sf /etc/runit/sv/clash/ /run/runit/service/
|
||||
#wget https://cdn.jsdelivr.net/gh/alecthw/mmdb_china_ip_list@release/Country.mmdb -O ~/.config/clash/Country.mmdb
|
||||
;;
|
||||
esac
|
2
cli/prx/log/run
Executable file
2
cli/prx/log/run
Executable file
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
exec svlogd -tt /var/log/clash
|
3
cli/prx/run
Executable file
3
cli/prx/run
Executable file
|
@ -0,0 +1,3 @@
|
|||
#!/bin/sh
|
||||
sv check clash >/dev/null || exit 1
|
||||
exec /usr/bin/clash -d /etc/clash 2>&1
|
|
@ -876,3 +876,325 @@ selection:
|
|||
|
||||
# Print all received window events.
|
||||
#print_events: false
|
||||
|
||||
color_schemes:
|
||||
|
||||
|
||||
|
||||
latte: &latte
|
||||
|
||||
# Default colors
|
||||
primary:
|
||||
background: '#EFF1F5' # base
|
||||
foreground: '#4C4F69' # text
|
||||
# Bright and dim foreground colors
|
||||
dim_foreground: '#4C4F69' # text
|
||||
bright_foreground: '#4C4F69' # text
|
||||
|
||||
# Cursor colors
|
||||
cursor:
|
||||
text: '#EFF1F5' # base
|
||||
cursor: '#DC8A78' # rosewater
|
||||
vi_mode_cursor:
|
||||
text: '#EFF1F5' # base
|
||||
cursor: '#7287FD' # lavender
|
||||
|
||||
# Search colors
|
||||
search:
|
||||
matches:
|
||||
foreground: '#EFF1F5' # base
|
||||
background: '#6C6F85' # subtext0
|
||||
focused_match:
|
||||
foreground: '#EFF1F5' # base
|
||||
background: '#40A02B' # green
|
||||
bar:
|
||||
foreground: '#EFF1F5' # base
|
||||
background: '#6C6F85' # subtext0
|
||||
|
||||
# Keyboard regex hints
|
||||
hints:
|
||||
start:
|
||||
foreground: '#EFF1F5' # base
|
||||
background: '#DF8E1D' # yellow
|
||||
end:
|
||||
foreground: '#EFF1F5' # base
|
||||
background: '#6C6F85' # subtext0
|
||||
|
||||
# Selection colors
|
||||
selection:
|
||||
text: '#EFF1F5' # base
|
||||
background: '#DC8A78' # rosewater
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '#4C4F69' # text
|
||||
red: '#D20F39' # red
|
||||
green: '#40A02B' # green
|
||||
yellow: '#DF8E1D' # yellow
|
||||
blue: '#1E66F5' # blue
|
||||
magenta: '#EA76CB' # pink
|
||||
cyan: '#179299' # teal
|
||||
white: '#ACB0BE' # surface2
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '#4C4F69' # text
|
||||
red: '#D20F39' # red
|
||||
green: '#40A02B' # green
|
||||
yellow: '#DF8E1D' # yellow
|
||||
blue: '#1E66F5' # blue
|
||||
magenta: '#EA76CB' # pink
|
||||
cyan: '#179299' # teal
|
||||
white: '#ACB0BE' # surface2
|
||||
|
||||
# Dim colors
|
||||
dim:
|
||||
black: '#4C4F69' # text
|
||||
red: '#D20F39' # red
|
||||
green: '#40A02B' # green
|
||||
yellow: '#DF8E1D' # yellow
|
||||
blue: '#1E66F5' # blue
|
||||
magenta: '#EA76CB' # pink
|
||||
cyan: '#179299' # teal
|
||||
white: '#ACB0BE' # surface2
|
||||
|
||||
|
||||
|
||||
frappe: &frappe
|
||||
|
||||
# Default colors
|
||||
primary:
|
||||
background: '#303446' # base
|
||||
foreground: '#C6D0F5' # text
|
||||
# Bright and dim foreground colors
|
||||
dim_foreground: '#C6D0F5' # text
|
||||
bright_foreground: '#C6D0F5' # text
|
||||
|
||||
# Cursor colors
|
||||
cursor:
|
||||
text: '#303446' # base
|
||||
cursor: '#F2D5CF' # rosewater
|
||||
vi_mode_cursor:
|
||||
text: '#303446' # base
|
||||
cursor: '#BABBF1' # lavender
|
||||
|
||||
# Search colors
|
||||
search:
|
||||
matches:
|
||||
foreground: '#303446' # base
|
||||
background: '#A5ADCE' # subtext0
|
||||
focused_match:
|
||||
foreground: '#303446' # base
|
||||
background: '#A6D189' # green
|
||||
bar:
|
||||
foreground: '#303446' # base
|
||||
background: '#A5ADCE' # subtext0
|
||||
|
||||
# Keyboard regex hints
|
||||
hints:
|
||||
start:
|
||||
foreground: '#303446' # base
|
||||
background: '#E5C890' # yellow
|
||||
end:
|
||||
foreground: '#303446' # base
|
||||
background: '#A5ADCE' # subtext0
|
||||
|
||||
# Selection colors
|
||||
selection:
|
||||
text: '#303446' # base
|
||||
background: '#F2D5CF' # rosewater
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '#51576D' # surface1
|
||||
red: '#E78284' # red
|
||||
green: '#A6D189' # green
|
||||
yellow: '#E5C890' # yellow
|
||||
blue: '#8CAAEE' # blue
|
||||
magenta: '#F4B8E4' # pink
|
||||
cyan: '#81C8BE' # teal
|
||||
white: '#B5BFE2' # subtext1
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '#51576D' # surface1
|
||||
red: '#E78284' # red
|
||||
green: '#A6D189' # green
|
||||
yellow: '#E5C890' # yellow
|
||||
blue: '#8CAAEE' # blue
|
||||
magenta: '#F4B8E4' # pink
|
||||
cyan: '#81C8BE' # teal
|
||||
white: '#B5BFE2' # subtext1
|
||||
|
||||
# Dim colors
|
||||
dim:
|
||||
black: '#51576D' # surface1
|
||||
red: '#E78284' # red
|
||||
green: '#A6D189' # green
|
||||
yellow: '#E5C890' # yellow
|
||||
blue: '#8CAAEE' # blue
|
||||
magenta: '#F4B8E4' # pink
|
||||
cyan: '#81C8BE' # teal
|
||||
white: '#B5BFE2' # subtext1
|
||||
|
||||
|
||||
|
||||
macchiato: &macchiato
|
||||
|
||||
# Default colors
|
||||
primary:
|
||||
background: '#24273A' # base
|
||||
foreground: '#CAD3F5' # text
|
||||
# Bright and dim foreground colors
|
||||
dim_foreground: '#CAD3F5' # text
|
||||
bright_foreground: '#CAD3F5' # text
|
||||
|
||||
# Cursor colors
|
||||
cursor:
|
||||
text: '#24273A' # base
|
||||
cursor: '#F4DBD6' # rosewater
|
||||
vi_mode_cursor:
|
||||
text: '#24273A' # base
|
||||
cursor: '#B7BDF8' # lavender
|
||||
|
||||
# Search colors
|
||||
search:
|
||||
matches:
|
||||
foreground: '#24273A' # base
|
||||
background: '#A5ADCB' # subtext0
|
||||
focused_match:
|
||||
foreground: '#24273A' # base
|
||||
background: '#A6DA95' # green
|
||||
bar:
|
||||
foreground: '#24273A' # base
|
||||
background: '#A5ADCB' # subtext0
|
||||
|
||||
# Keyboard regex hints
|
||||
hints:
|
||||
start:
|
||||
foreground: '#24273A' # base
|
||||
background: '#EED49F' # yellow
|
||||
end:
|
||||
foreground: '#24273A' # base
|
||||
background: '#A5ADCB' # subtext0
|
||||
|
||||
# Selection colors
|
||||
selection:
|
||||
text: '#24273A' # base
|
||||
background: '#F4DBD6' # rosewater
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '#494D64' # surface1
|
||||
red: '#ED8796' # red
|
||||
green: '#A6DA95' # green
|
||||
yellow: '#EED49F' # yellow
|
||||
blue: '#8AADF4' # blue
|
||||
magenta: '#F5BDE6' # pink
|
||||
cyan: '#8BD5CA' # teal
|
||||
white: '#B8C0E0' # subtext1
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '#494D64' # surface1
|
||||
red: '#ED8796' # red
|
||||
green: '#A6DA95' # green
|
||||
yellow: '#EED49F' # yellow
|
||||
blue: '#8AADF4' # blue
|
||||
magenta: '#F5BDE6' # pink
|
||||
cyan: '#8BD5CA' # teal
|
||||
white: '#B8C0E0' # subtext1
|
||||
|
||||
# Dim colors
|
||||
dim:
|
||||
black: '#494D64' # surface1
|
||||
red: '#ED8796' # red
|
||||
green: '#A6DA95' # green
|
||||
yellow: '#EED49F' # yellow
|
||||
blue: '#8AADF4' # blue
|
||||
magenta: '#F5BDE6' # pink
|
||||
cyan: '#8BD5CA' # teal
|
||||
white: '#B8C0E0' # subtext1
|
||||
|
||||
|
||||
|
||||
mocha: &mocha
|
||||
|
||||
# Default colors
|
||||
primary:
|
||||
background: '#1E1E2E' # base
|
||||
foreground: '#CDD6F4' # text
|
||||
# Bright and dim foreground colors
|
||||
dim_foreground: '#CDD6F4' # text
|
||||
bright_foreground: '#CDD6F4' # text
|
||||
|
||||
# Cursor colors
|
||||
cursor:
|
||||
text: '#1E1E2E' # base
|
||||
cursor: '#F5E0DC' # rosewater
|
||||
vi_mode_cursor:
|
||||
text: '#1E1E2E' # base
|
||||
cursor: '#B4BEFE' # lavender
|
||||
|
||||
# Search colors
|
||||
search:
|
||||
matches:
|
||||
foreground: '#1E1E2E' # base
|
||||
background: '#A6ADC8' # subtext0
|
||||
focused_match:
|
||||
foreground: '#1E1E2E' # base
|
||||
background: '#A6E3A1' # green
|
||||
bar:
|
||||
foreground: '#1E1E2E' # base
|
||||
background: '#A6ADC8' # subtext0
|
||||
|
||||
# Keyboard regex hints
|
||||
hints:
|
||||
start:
|
||||
foreground: '#1E1E2E' # base
|
||||
background: '#F9E2AF' # yellow
|
||||
end:
|
||||
foreground: '#1E1E2E' # base
|
||||
background: '#A6ADC8' # subtext0
|
||||
|
||||
# Selection colors
|
||||
selection:
|
||||
text: '#1E1E2E' # base
|
||||
background: '#F5E0DC' # rosewater
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '#45475A' # surface1
|
||||
red: '#F38BA8' # red
|
||||
green: '#A6E3A1' # green
|
||||
yellow: '#F9E2AF' # yellow
|
||||
blue: '#89B4FA' # blue
|
||||
magenta: '#F5C2E7' # pink
|
||||
cyan: '#94E2D5' # teal
|
||||
white: '#BAC2DE' # subtext1
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '#45475A' # surface1
|
||||
red: '#F38BA8' # red
|
||||
green: '#A6E3A1' # green
|
||||
yellow: '#F9E2AF' # yellow
|
||||
blue: '#89B4FA' # blue
|
||||
magenta: '#F5C2E7' # pink
|
||||
cyan: '#94E2D5' # teal
|
||||
white: '#BAC2DE' # subtext1
|
||||
|
||||
# Dim colors
|
||||
dim:
|
||||
black: '#45475A' # surface1
|
||||
red: '#F38BA8' # red
|
||||
green: '#A6E3A1' # green
|
||||
yellow: '#F9E2AF' # yellow
|
||||
blue: '#89B4FA' # blue
|
||||
magenta: '#F5C2E7' # pink
|
||||
cyan: '#94E2D5' # teal
|
||||
white: '#BAC2DE' # subtext1
|
||||
|
||||
|
||||
|
||||
colors: *macchiato
|
||||
|
|
|
@ -86,12 +86,14 @@ case "$UNAMEA" in
|
|||
if is_laptop; then
|
||||
sudo pacman -S --noconfirm --needed \
|
||||
arandr autorandr \
|
||||
xf86-input-synaptics \
|
||||
acpi light python-pip
|
||||
yay -S --needed --noconfirm auto-cpufreq-git
|
||||
sudo mkdir -p /etc/runit/sv/auto-cpufreq
|
||||
sudo cp $DIR/auto-cpufreq/auto-cpufreq-runit /etc/runit/sv/auto-cpufreq/run
|
||||
sudo chmod +x /etc/runit/sv/auto-cpufreq/run
|
||||
sudo ln -sf /etc/runit/sv/auto-cpufreq/ /run/runit/service/
|
||||
sudo cp $DIR/x11/70-synaptics.conf /etc/X11/xorg.conf.d/
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
53
gui/x11/70-synaptics.conf
Normal file
53
gui/x11/70-synaptics.conf
Normal file
|
@ -0,0 +1,53 @@
|
|||
# Example xorg.conf.d snippet that assigns the touchpad driver
|
||||
# to all touchpads. See xorg.conf.d(5) for more information on
|
||||
# InputClass.
|
||||
# DO NOT EDIT THIS FILE, your distribution will likely overwrite
|
||||
# it when updating. Copy (and rename) this file into
|
||||
# /etc/X11/xorg.conf.d first.
|
||||
# Additional options may be added in the form of
|
||||
# Option "OptionName" "value"
|
||||
#
|
||||
Section "InputClass"
|
||||
Identifier "touchpad catchall"
|
||||
Driver "synaptics"
|
||||
MatchIsTouchpad "on"
|
||||
# This option is recommend on all Linux systems using evdev, but cannot be
|
||||
# enabled by default. See the following link for details:
|
||||
# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
|
||||
# MatchDevicePath "/dev/input/event*"
|
||||
# # tap to click
|
||||
Option "TapButton1" "1"
|
||||
# two finger tap to right click
|
||||
Option "TapButton2" "3"
|
||||
# for natural scrolling
|
||||
Option "VertScrollDelta" "-111"
|
||||
Option "HorizScrollDelta" "-111"
|
||||
EndSection
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "touchpad ignore duplicates"
|
||||
MatchIsTouchpad "on"
|
||||
MatchOS "Linux"
|
||||
MatchDevicePath "/dev/input/mouse*"
|
||||
Option "Ignore" "on"
|
||||
EndSection
|
||||
|
||||
# This option enables the bottom right corner to be a right button on clickpads
|
||||
# and the right and middle top areas to be right / middle buttons on clickpads
|
||||
# with a top button area.
|
||||
# This option is only interpreted by clickpads.
|
||||
Section "InputClass"
|
||||
Identifier "Default clickpad buttons"
|
||||
MatchDriver "synaptics"
|
||||
Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
|
||||
Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%"
|
||||
EndSection
|
||||
|
||||
# This option disables software buttons on Apple touchpads.
|
||||
# This option is only interpreted by clickpads.
|
||||
Section "InputClass"
|
||||
Identifier "Disable clickpad buttons on Apple touchpads"
|
||||
MatchProduct "Apple|bcm5974"
|
||||
MatchDriver "synaptics"
|
||||
Option "SoftButtonAreas" "0 0 0 0 0 0 0 0"
|
||||
EndSection
|
Loading…
Reference in New Issue
Block a user