bump
This commit is contained in:
parent
81a7e066e4
commit
4a675bbfbb
42
arch_install
42
arch_install
|
@ -168,7 +168,7 @@ set_pkgs() {
|
|||
elif [ "$VIDEO_DRIVER" == "nouveau" ];then
|
||||
pkgs+=' xf86-video-nouveau'
|
||||
pkgs+=' nvidia nvidia-utils lib32-nvidia-utils nvidia-settings vulkan-icd-loader lib32-vulkan-icd-loader'
|
||||
elif [ "$VIDEO_DRIVER" = "vesa" ];then
|
||||
elif [ "$VIDEO_DRIVER" == "vesa" ];then
|
||||
packages+=' xf86-video-vesa'
|
||||
fi
|
||||
fi
|
||||
|
@ -186,12 +186,10 @@ setup() {
|
|||
echo 'Creating partitions'
|
||||
partition_drive "$DRIVE"
|
||||
|
||||
if [ -n "$ENCRYPT_DRIVE" ]
|
||||
then
|
||||
if "$ENCRYPT_DRIVE";then
|
||||
local lvm_part="/dev/mapper/lvm"
|
||||
|
||||
if [ -z "$DRIVE_PASSPHRASE" ]
|
||||
then
|
||||
if [ -z "$DRIVE_PASSPHRASE" ];then
|
||||
echo 'Enter a passphrase to encrypt the disk:'
|
||||
read -s DRIVE_PASSPHRASE
|
||||
fi
|
||||
|
@ -223,8 +221,7 @@ setup() {
|
|||
chmod +x "/mnt/setup.sh"
|
||||
arch-chroot /mnt "./setup.sh"
|
||||
|
||||
if [ -f "/mnt/setup.sh" ]
|
||||
then
|
||||
if [ -f "/mnt/setup.sh" ];then
|
||||
echo 'ERROR: Something failed inside the chroot, not unmounting filesystems so you can investigate.'
|
||||
echo 'Make sure you unmount everything before you try to run this script again.'
|
||||
else
|
||||
|
@ -297,8 +294,7 @@ setup_lvm() {
|
|||
lvcreate --yes -C y -L1G "$volgroup" -n swap
|
||||
|
||||
# if the disk has more than
|
||||
if [ "$d_size" -gt $(( 50*10**9 )) ]
|
||||
then
|
||||
if [ "$d_size" -gt $(( 50*10**9 )) ]; then
|
||||
# Create a 50GB root partition
|
||||
lvcreate --yes -L '50G' "$volgroup" -n root
|
||||
else
|
||||
|
@ -350,8 +346,7 @@ unmount_filesystems() {
|
|||
umount -R /mnt
|
||||
swapoff /dev/vg00/swap
|
||||
vgchange -an
|
||||
if [ -n "$ENCRYPT_DRIVE" ]
|
||||
then
|
||||
if [ -n "$ENCRYPT_DRIVE" ];then
|
||||
cryptsetup luksClose lvm
|
||||
fi
|
||||
}
|
||||
|
@ -404,8 +399,7 @@ configure() {
|
|||
echo 'Configuring PAM'
|
||||
set_pam
|
||||
|
||||
if [ -z "$ROOT_PASSWORD" ]
|
||||
then
|
||||
if [ -z "$ROOT_PASSWORD" ];then
|
||||
echo 'Enter the root password:'
|
||||
read -s ROOT_PASSWORD
|
||||
fi
|
||||
|
@ -413,8 +407,7 @@ configure() {
|
|||
echo 'Setting root password'
|
||||
set_root_password "$ROOT_PASSWORD"
|
||||
|
||||
if [ -z "$USER_PASSWORD" ]
|
||||
then
|
||||
if [ -z "$USER_PASSWORD" ];then
|
||||
echo "Enter the password for user $USER_NAME"
|
||||
read -s USER_PASSWORD
|
||||
fi
|
||||
|
@ -523,7 +516,7 @@ set_timezone() {
|
|||
|
||||
timedatectl set-ntp on
|
||||
|
||||
hwclock --systohc
|
||||
hwclock --systohc || echo FAILED TO SET HW CLOCK
|
||||
}
|
||||
#}}}
|
||||
# set_locale() {#{{{
|
||||
|
@ -562,20 +555,16 @@ EOF
|
|||
set_initcpio() {
|
||||
local vid
|
||||
|
||||
if [ "$VIDEO_DRIVER" = "i915" ]
|
||||
then
|
||||
if [ "$VIDEO_DRIVER" = "i915" ];then
|
||||
vid='i915'
|
||||
elif [ "$VIDEO_DRIVER" = "nouveau" ]
|
||||
then
|
||||
elif [ "$VIDEO_DRIVER" = "nouveau" ];then
|
||||
vid='nouveau'
|
||||
elif [ "$VIDEO_DRIVER" = "radeon" ]
|
||||
then
|
||||
elif [ "$VIDEO_DRIVER" = "radeon" ];then
|
||||
vid='radeon'
|
||||
fi
|
||||
|
||||
local encrypt=""
|
||||
if [ -n "$ENCRYPT_DRIVE" ]
|
||||
then
|
||||
if [ -n "$ENCRYPT_DRIVE" ];then
|
||||
encrypt="encrypt keyboard"
|
||||
fi
|
||||
|
||||
|
@ -600,8 +589,7 @@ set_daemons() {
|
|||
|
||||
systemctl enable cronie.service NetworkManager.service
|
||||
|
||||
if [ -z "$tmp_on_tmpfs" ]
|
||||
then
|
||||
if [ -z "$tmp_on_tmpfs" ];then
|
||||
systemctl mask tmp.mount
|
||||
fi
|
||||
}
|
||||
|
@ -722,7 +710,7 @@ get_uuid() {
|
|||
#}}}
|
||||
# is_chroot(){{{{
|
||||
is_chroot(){
|
||||
[ "$(ls -id / | cut -d' ' -f1)" == "2" ]
|
||||
test "$(ls -id / | cut -d' ' -f1)" == "2"
|
||||
}
|
||||
#}}}
|
||||
#}}}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
// Remove clutter
|
||||
//"window.titleBarStyle": "custom",
|
||||
// "window.titleBarStyle": "custom",
|
||||
"window.menuBarVisibility": "toggle",
|
||||
"workbench.activityBar.visible": false,
|
||||
"workbench.editor.showTabs": false,
|
||||
|
@ -109,4 +109,12 @@
|
|||
"editor.formatOnType": true,
|
||||
"editor.formatOnSave": true,
|
||||
"editor.formatOnPaste": true,
|
||||
}
|
||||
"editor.suggestSelection": "first",
|
||||
"vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
|
||||
"files.exclude": {
|
||||
"**/.classpath": true,
|
||||
"**/.project": true,
|
||||
"**/.settings": true,
|
||||
"**/.factorypath": true
|
||||
},
|
||||
}
|
|
@ -270,7 +270,7 @@ set line_numbers relative
|
|||
|
||||
# When line_numbers=relative show the absolute line number in the
|
||||
# current line.
|
||||
set relative_current_zero true
|
||||
set relative_current_zero false
|
||||
|
||||
# Start line numbers from 1 instead of 0
|
||||
set one_indexed false
|
||||
|
@ -724,3 +724,6 @@ tmap <delete> eval -q fm.ui.taskview.task_remove()
|
|||
tmap <C-l> redraw_window
|
||||
tmap <ESC> taskview_close
|
||||
copytmap <ESC> q Q w <C-c>
|
||||
# a plugin that adds file glyphs / icon support to Ranger:
|
||||
# https://github.com/alexanderjeurissen/ranger_devicons
|
||||
default_linemode devicons
|
||||
|
|
|
@ -221,3 +221,5 @@ label pager, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER"
|
|||
|
||||
# The very last action, so that it's never triggered accidentally, is to execute a program:
|
||||
mime application/x-executable = "$1"
|
||||
|
||||
has dragon, X, flag f = dragon -a -x "$@"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# BEMENU_BACKEND=x11
|
||||
# BEMENU_BACKEND=wayland
|
||||
if [ "$1" == "run" ]
|
||||
then
|
||||
|
|
|
@ -12,7 +12,11 @@ owm(){
|
|||
QUERY="$CITY, $REGI, $COUN"
|
||||
APPID="fd68c0fe7951f5ab7e24a240eb0942b8"
|
||||
|
||||
http get http://api.openweathermap.org/data/2.5/forecast\?APPID\=${APPID}\&q="${CITY}"\&units\=metric
|
||||
FORECAST=$(http get http://api.openweathermap.org/data/2.5/forecast\?APPID\=${APPID}\&q="${CITY}"\&units\=metric)
|
||||
TEMP=$(echo $FORECAST | jq -r ".list[0].main.temp")
|
||||
WEATHER=$(echo $FORECAST | jq -r ".list[0].weather[0].main")
|
||||
|
||||
format_weather
|
||||
}
|
||||
|
||||
format_weather(){
|
||||
|
@ -41,11 +45,7 @@ format_weather(){
|
|||
}
|
||||
|
||||
owm_long(){
|
||||
FORECAST=$(owm)
|
||||
TEMP=$(echo $FORECAST | jq -r ".list[0].main.temp")
|
||||
WEATHER=$(echo $FORECAST | jq -r ".list[0].weather[0].main")
|
||||
format_weather
|
||||
|
||||
owm
|
||||
MIN=$(echo $FORECAST | jq -r ".list[2].main.temp_min" |
|
||||
perl -pe 's/(\d*)\.\d*/\1/')
|
||||
MAX=$(echo $FORECAST | jq -r ".list[2].main.temp_max" |
|
||||
|
@ -57,17 +57,21 @@ owm_long(){
|
|||
}
|
||||
|
||||
owm_short(){
|
||||
FORECAST=$(owm)
|
||||
TEMP=$(echo $FORECAST | jq -r ".list[0].main.temp" |
|
||||
perl -pe 's/(\d*)\.\d*/\1/')
|
||||
WEATHER=$(echo $FORECAST | jq -r ".list[0].weather[0].main")
|
||||
format_weather
|
||||
owm
|
||||
|
||||
text="$WEATHER $TEMP°C"
|
||||
|
||||
echo "$text"
|
||||
}
|
||||
|
||||
owm_pango(){
|
||||
owm
|
||||
|
||||
text="$WEATHER <b>$TEMP°C</b>"
|
||||
|
||||
echo "$text"
|
||||
}
|
||||
|
||||
wttrin(){
|
||||
local request="wttr.in/${1-Caxias}?QF"
|
||||
[ "$(tput cols)" -lt 125 ] && request+='n'
|
||||
|
@ -80,6 +84,9 @@ then
|
|||
elif [ "$1" == "short" ]
|
||||
then
|
||||
owm_short
|
||||
elif [ "$1" == "pango" ]
|
||||
then
|
||||
owm_pango
|
||||
else
|
||||
owm_long
|
||||
fi
|
||||
|
|
|
@ -3,8 +3,8 @@ set -e
|
|||
|
||||
MENU(){
|
||||
if [ -n "$SWAYSOCK" ];then
|
||||
bmenu -i $@
|
||||
# wofi -dIk/dev/null $@
|
||||
# bmenu -i $@
|
||||
wofi -dIk/dev/null $@
|
||||
else
|
||||
rofi -dmenu -i $@
|
||||
fi
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
MENU(){
|
||||
if [ -n "$SWAYSOCK" ];then
|
||||
# wofi -dIk/dev/null $@
|
||||
bmenu -i $@
|
||||
wofi -dIk/dev/null $@
|
||||
# bmenu -i $@
|
||||
else
|
||||
rofi -dmenu -i $@
|
||||
fi
|
||||
|
|
|
@ -17,17 +17,17 @@
|
|||
set $right l
|
||||
|
||||
set $term kitty
|
||||
# set $menu wofi --show drun --allow-images --insensitive -p'Iniciar: '
|
||||
set $menu bmenu run $term
|
||||
set $menu wofi --show drun --allow-images --insensitive -p'Iniciar: '
|
||||
# set $menu bmenu run $term
|
||||
# set $menu j4-dmenu-desktop --dmenu 'bmenu -p Iniciar:' --term $term
|
||||
font Fira Code 14px
|
||||
|
||||
# }}}
|
||||
# Output configuration {{{
|
||||
#
|
||||
output * bg '#252525' solid_color
|
||||
output * bg '#212121' solid_color
|
||||
|
||||
# output HDMI-A-1 resolution 720x576
|
||||
# output HDMI-A-1 resolution 1280x720
|
||||
|
||||
#Disable laptop screen if closed, --reload is important
|
||||
set $laptop eDP-1
|
||||
|
@ -220,6 +220,7 @@
|
|||
|
||||
# Media player controls
|
||||
# playerctl for notifications
|
||||
# bindsym --locked XF86AudioPlay exec playerctl -p mpd play-pause
|
||||
bindsym --locked XF86AudioPlay exec playerctl -p mpd play-pause
|
||||
bindsym --locked XF86AudioNext exec playerctl -p mpd next
|
||||
bindsym --locked XF86AudioPrev exec playerctl -p mpd previous
|
||||
|
@ -273,7 +274,7 @@
|
|||
# for_window [app_id=mpv] floating enable
|
||||
for_window [app_id=weather] floating enable
|
||||
# for_window [app_id=weather] resize set 635px 700px
|
||||
for_window [app_id=weather] resize set 1280px 700px
|
||||
for_window [app_id=weather] resize set 1280px 750px
|
||||
|
||||
# set theme
|
||||
set $gnome-schema org.gnome.desktop.interface
|
||||
|
@ -310,7 +311,7 @@
|
|||
exec swayidle -w \
|
||||
before-sleep 'swaylock -f' \
|
||||
lock swaylock \
|
||||
timeout 900 'swaylock -f' \
|
||||
timeout 1800 'swaylock -f' \
|
||||
# timeout 1800 'swaymsg "output * dpms off"' \
|
||||
# resume 'swaymsg "output * dpms on;reload"' \
|
||||
#}}}
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
},
|
||||
"clock": {
|
||||
"interval":60,
|
||||
"format":"{:%H:%M %a %d}",
|
||||
"format":"<b>{:%H:%M %a %d}</b>",
|
||||
"tooltip":false
|
||||
},
|
||||
"battery": {
|
||||
|
@ -104,7 +104,7 @@
|
|||
},
|
||||
"custom/weather": {
|
||||
"tooltip":false,
|
||||
"exec": "forecast short",
|
||||
"exec": "forecast pango",
|
||||
"interval": 1800,
|
||||
"on-click": "kitty --class weather sh -c 'forecast full;read -n1 -p\"Press Any key to quit \"'",
|
||||
"on-click-right": "xdg-open https://openweathermap.org"
|
||||
|
@ -124,7 +124,7 @@
|
|||
"interval": 43200,
|
||||
"exec-if":"sleep 60s",
|
||||
"exec": "yay -Syuw --noconfirm> /dev/null; yay -Qqu | wc -l | sed 's/^0$//'",
|
||||
"on-click": "kitty sh -c 'ping -qc1 archlinux.org >/dev/null && yay -Syu || yay -Su; pkill -SIGRTMIN+8 waybar'",
|
||||
"on-click": "kitty sh -c 'ping -qc1 archlinux.org >/dev/null && yay -Syu || yay -Su; pkill -SIGRTMIN+8 waybar; read'",
|
||||
"signal": 8
|
||||
},
|
||||
"custom/recording": {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
* {
|
||||
font: 14px Inter;
|
||||
font-weight:bold;
|
||||
font: 14px Inter, Font Awesome;
|
||||
border-radius:0;
|
||||
margin:0;
|
||||
padding: 0;
|
||||
|
|
|
@ -8,12 +8,12 @@ window {
|
|||
|
||||
#input {
|
||||
margin-bottom: 5px ;
|
||||
background-color: #252525;
|
||||
background-color: #202020;
|
||||
}
|
||||
|
||||
#outer-box {
|
||||
margin: 2px;
|
||||
padding: 15px ;
|
||||
padding-bottom:0;
|
||||
background-color: #252525;
|
||||
background-color: #202020;
|
||||
}
|
||||
|
|
|
@ -164,6 +164,7 @@ preexec() { echo -ne '\e[5 q' ;}
|
|||
#
|
||||
abbrev-alias -g v=nvim
|
||||
abbrev-alias -g rv="sudo nvim"
|
||||
abbrev-alias se='nvim $(fzf)'
|
||||
abbrev-alias es="nvim ~/.config/sway/config"
|
||||
abbrev-alias ez="nvim ~/.zshrc"
|
||||
abbrev-alias ev="nvim ~/.config/nvim/init.vim"
|
||||
|
|
Reference in New Issue