mirror of
https://github.com/ivabus/dotfiles
synced 2024-11-21 23:55:07 +03:00
Update dotfiles to linux.org.ru version
Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
This commit is contained in:
parent
da5af9fb94
commit
ecf5f1438b
6 changed files with 51 additions and 33 deletions
|
@ -44,10 +44,12 @@ alias vi="nvim"
|
||||||
alias vim="nvim"
|
alias vim="nvim"
|
||||||
alias ls="ls --color=always"
|
alias ls="ls --color=always"
|
||||||
alias la="ls -la"
|
alias la="ls -la"
|
||||||
|
alias rh="rehash"
|
||||||
alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh"
|
alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh"
|
||||||
alias timestamp='date -u +%FT%TZ'
|
alias timestamp='date -u +%FT%TZ'
|
||||||
alias yt-dlp-opus="yt-dlp -f 251 -x"
|
alias yt-dlp-opus="yt-dlp -f 251 -x"
|
||||||
alias ltcp="cp ~/.dotfiles/latex_template/{macros,preamble,template,letterfonts}.tex ."
|
alias ltcp="cp ~/.dotfiles/latex_template/{macros,preamble,template,letterfonts}.tex ."
|
||||||
|
alias jekyll_export="jekyll b -d ./_archive && cd _archive && tar cf ../site.tar ./ && cd .. && gzip -9 -f site.tar && rm -rf _archive"
|
||||||
|
|
||||||
# ffmpeg section
|
# ffmpeg section
|
||||||
|
|
||||||
|
@ -57,12 +59,22 @@ ffmpeg_convert() {
|
||||||
ffmpeg -i $2 -c:v ${1}_videotoolbox $(if [ ! -z $4 ]; then echo "-q:v $4"; fi ) $3
|
ffmpeg -i $2 -c:v ${1}_videotoolbox $(if [ ! -z $4 ]; then echo "-q:v $4"; fi ) $3
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Usage: ffmpeg_telegram_video_sticker: <video_in> <time <= 3> [<chromakey color in hex>] [<chromakey similarity>]
|
||||||
|
ffmpeg_telegram_video_sticker() {
|
||||||
|
PWD_START=$(pwd)
|
||||||
|
TMPDIR=/tmp/sticker-$(date +%Y-%m-%d-%H:%M:%S)
|
||||||
|
mkdir $TMPDIR
|
||||||
|
cp $1 $TMPDIR/
|
||||||
|
cd $TMPDIR
|
||||||
|
ffmpeg -i $1 $(if [[ ! -z $3 && ! -z $4 ]]; then echo -vf "chromakey=\#$3:$4:0"; fi) -c copy -c:v png -t $2 tmp.mov
|
||||||
|
ffmpeg -y -i tmp.mov -r 30 -t $2 -an -c:v libvpx-vp9 -pix_fmt yuva420p -vf 'scale=512:512:force_original_aspect_ratio=decrease' -b:v 400K ${1}_sticker.webm
|
||||||
|
cp ${1}_sticker.webm $PWD_START/
|
||||||
|
cd $PWD_START
|
||||||
|
#rm -rf $TMP_DIR
|
||||||
|
}
|
||||||
# AsahiLinux useful aliases
|
# AsahiLinux useful aliases
|
||||||
alias reload_net="sudo systemctl restart NetworkManager wpa_supplicant" # iwd"
|
alias reload_net="sudo systemctl restart NetworkManager wpa_supplicant" # iwd"
|
||||||
|
|
||||||
# Diskutil aliases
|
# Diskutil aliases
|
||||||
alias dadc="diskutil apfs deleteContainer"
|
alias dadc="diskutil apfs deleteContainer"
|
||||||
alias devff="diskutil eraseVolume free free"
|
alias devff="diskutil eraseVolume free free"
|
||||||
source /opt/homebrew/opt/chruby/share/chruby/chruby.sh
|
|
||||||
source /opt/homebrew/opt/chruby/share/chruby/auto.sh
|
|
||||||
chruby ruby-3.1.3 # run chruby to see actual version
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 p
|
||||||
set $menu exec $term --option window.opacity=1 --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop"
|
set $menu exec $term --option window.opacity=1 --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop"
|
||||||
set $filemgr nemo
|
set $filemgr nemo
|
||||||
|
|
||||||
output * bg ~/Pictures/bg/bg.png fill
|
output * bg ~/Pictures/bg/sonoma.jpg fill
|
||||||
|
|
||||||
input type:keyboard {
|
input type:keyboard {
|
||||||
xkb_layout us,ru
|
xkb_layout us,ru
|
||||||
|
@ -22,6 +22,10 @@ input type:touchpad {
|
||||||
natural_scroll enabled
|
natural_scroll enabled
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input "1452:849:Apple_MTP_multi-touch" {
|
||||||
|
scroll_factor 0.25
|
||||||
|
}
|
||||||
|
|
||||||
bar swaybar_command waybar
|
bar swaybar_command waybar
|
||||||
xwayland enable
|
xwayland enable
|
||||||
|
|
||||||
|
@ -48,8 +52,8 @@ bindsym $mod+p exec (slurp | grim -g- $screenshot_file)
|
||||||
# Recordings
|
# Recordings
|
||||||
|
|
||||||
set $rec_file \"$HOME/Videos/recording-$(date '+%Y-%m-%d_%H-%M-%S').mp4\"
|
set $rec_file \"$HOME/Videos/recording-$(date '+%Y-%m-%d_%H-%M-%S').mp4\"
|
||||||
bindsym $mod+Shift+o exec wf-recorder --file $rec_file
|
bindsym $mod+Shift+o exec wf-recorder -a --file $rec_file
|
||||||
bindsym $mod+Shift+p exec (wf-recorder -g "$(slurp)" --file $rec_file)
|
bindsym $mod+Shift+p exec (wf-recorder -a -g "$(slurp)" --file $rec_file)
|
||||||
bindsym $mod+Shift+BackSpace exec killall -s SIGINT wf-recorder
|
bindsym $mod+Shift+BackSpace exec killall -s SIGINT wf-recorder
|
||||||
|
|
||||||
# Symbols bind
|
# Symbols bind
|
||||||
|
@ -139,8 +143,8 @@ bindsym XF86Search exec $menu
|
||||||
|
|
||||||
# Trackpad gestures
|
# Trackpad gestures
|
||||||
|
|
||||||
bindgesture swipe:3:right workspace next
|
bindgesture swipe:3:right workspace prev
|
||||||
bindgesture swipe:3:left workspace prev
|
bindgesture swipe:3:left workspace next
|
||||||
|
|
||||||
bindgesture swipe:4:up move up
|
bindgesture swipe:4:up move up
|
||||||
bindgesture swipe:4:down move down
|
bindgesture swipe:4:down move down
|
||||||
|
@ -149,6 +153,9 @@ bindgesture swipe:4:right move right
|
||||||
|
|
||||||
bindgesture pinch:4:inward exec $menu # launchpad like
|
bindgesture pinch:4:inward exec $menu # launchpad like
|
||||||
|
|
||||||
|
# Lid binds
|
||||||
|
|
||||||
|
bindswitch lid:on exec $HOME/.config/sway/lock.sh
|
||||||
|
|
||||||
# Floating
|
# Floating
|
||||||
for_window [app_id="pavucontrol"] floating enable, resize 600 300, move absolute position 25ppt 25ppt
|
for_window [app_id="pavucontrol"] floating enable, resize 600 300, move absolute position 25ppt 25ppt
|
||||||
|
@ -157,7 +164,6 @@ for_window [app_id="nm-connection-editor"] floating enable, resize 300 150, move
|
||||||
# Autostart
|
# Autostart
|
||||||
exec alacritty --class bottom -e btm
|
exec alacritty --class bottom -e btm
|
||||||
for_window [app_id="bottom"] move container to workspace number 10
|
for_window [app_id="bottom"] move container to workspace number 10
|
||||||
for_window [app_id="bottom"] fullscreen
|
|
||||||
exec keepassxc
|
exec keepassxc
|
||||||
for_window [class="KeePassXC"] move container to workspace 9
|
for_window [class="KeePassXC"] move container to workspace 9
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
# Times the screen off and puts it to background
|
# Times the screen off and puts it to background
|
||||||
swayidle \
|
swayidle \
|
||||||
timeout 10 'swaymsg "output * dpms off" && brightnessctl -d kbd_backlight set 0%' \
|
timeout 10 'swaymsg "output * dpms off" && brightnessctl -d kbd_backlight set 0%' \
|
||||||
resume 'swaymsg "output * dpms on" && brightnessctl -d kbd_backlight set 30%' &
|
resume 'swaymsg "output * dpms on"' \
|
||||||
|
before-sleep 'swaylock -c 181924 --font JetBrains\ Mono' &
|
||||||
# Locks the screen immediately
|
# Locks the screen immediately
|
||||||
swaylock -c 181924 -s stretch --font JetBrains\ Mono
|
swaylock -c 181924 -s stretch --font JetBrains\ Mono
|
||||||
# Kills last background task so idle timer doesn't keep running
|
# Kills last background task so idle timer doesn't keep running
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
seat seat0 xcursor_theme "Simp1e-Catppuccin-Macchiato"
|
seat seat0 xcursor_theme "Catppuccin-Macchiato-Dark-Cursors"
|
||||||
|
|
||||||
set $gnome-schema org.gnome.desktop.interface
|
set $gnome-schema org.gnome.desktop.interface
|
||||||
exec_always {
|
exec_always {
|
||||||
gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-Dark'
|
gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-Dark'
|
||||||
gsettings set $gnome-schema icon-theme 'Mint-Y-Dark'
|
gsettings set $gnome-schema icon-theme 'Mint-Y-Dark'
|
||||||
gsettings set $gnome-schema cursor-theme 'Simp1e-Catppuccin-Macchiato'
|
gsettings set $gnome-schema cursor-theme 'Catppuccin-Macchiato-Dark-Cursors'
|
||||||
gsettings set $gnome-schema font-name 'Noto Sans 9'
|
gsettings set $gnome-schema font-name 'Ubuntu 9'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Property Name Border BG Text Indicator Child_border
|
# Property Name Border BG Text Indicator Child_border
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{
|
{
|
||||||
|
"height": 32,
|
||||||
"position": "top",
|
"position": "top",
|
||||||
"modules-left": ["sway/workspaces", "sway/mode"],
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
"modules-center": [],
|
"modules-center": [],
|
||||||
"modules-right": ["tray", "idle_inhibitor", "cpu", "memory", "custom/uptime", "pulseaudio", "battery", "sway/language", "clock"],
|
"modules-right": ["tray", "idle_inhibitor", "cpu", "memory", "wireplumber", "battery", "sway/language", "clock"],
|
||||||
"sway/mode": {
|
"sway/mode": {
|
||||||
"format": "<span style=\"italic\">{}</span>"
|
"format": "<span style=\"italic\">{}</span>"
|
||||||
},
|
},
|
||||||
|
@ -17,15 +18,13 @@
|
||||||
"spacing": 10
|
"spacing": 10
|
||||||
},
|
},
|
||||||
"clock": {
|
"clock": {
|
||||||
"format": "{:%H:%M:%S %d.%m.%Y}",
|
"format": "{:%H:%M:%S %Y-%m-%d}",
|
||||||
"interval": 1
|
"interval": 1
|
||||||
},
|
},
|
||||||
"pulseaudio": {
|
"wireplumber": {
|
||||||
"scroll-step": 1,
|
"scroll-step": 1,
|
||||||
"format": "Volume: {volume}%",
|
"format": "Vol: {volume}%",
|
||||||
"format-bluetooth": "Volume: {volume}% (BT)",
|
"format-muted": "Vol: muted",
|
||||||
"format-bluetooth-muted": "Volume: {icon} (BT)",
|
|
||||||
"format-muted": "Vol: {volume}%",
|
|
||||||
"on-click": "pavucontrol"
|
"on-click": "pavucontrol"
|
||||||
},
|
},
|
||||||
"cpu": {
|
"cpu": {
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
@import "macchiato.css";
|
@import "macchiato.css";
|
||||||
* {
|
* {
|
||||||
font-family: "Ubuntu", "JetBrains Mono", "Noto Sans";
|
font-family: "JetBrains Mono", "Noto Sans";
|
||||||
font-size: 9pt;
|
font-size: 6pt;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
padding: 1px 1px;
|
padding: 1px 1px;
|
||||||
}
|
}
|
||||||
|
@ -11,18 +10,12 @@
|
||||||
window#waybar {
|
window#waybar {
|
||||||
color: transparent;
|
color: transparent;
|
||||||
background: @base;
|
background: @base;
|
||||||
|
opacity: 0.75;
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces {
|
|
||||||
transition: none;
|
|
||||||
color: @text;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover {
|
button:hover {
|
||||||
color: @red;
|
color: @red;
|
||||||
|
@ -39,18 +32,25 @@ button:hover {
|
||||||
}
|
}
|
||||||
#mode {
|
#mode {
|
||||||
background-color: @mantle;
|
background-color: @mantle;
|
||||||
|
color: @text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modules-left {
|
||||||
|
padding-left: 4px;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
.modules-right {
|
.modules-right {
|
||||||
transition: none;
|
transition: none;
|
||||||
background: @base;
|
background: @base;
|
||||||
color: @text;
|
color: @text;
|
||||||
padding-left: 4px;
|
|
||||||
padding-right: 4px;
|
padding-right: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd, #custom-loadavg, #custom-uptime {
|
#worspaces, #language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd, #custom-loadavg, #custom-uptime, #wireplumber {
|
||||||
padding: 0 8px;
|
padding: 0 4px;
|
||||||
|
margin: 2 1px;
|
||||||
|
background-color: @mantle;
|
||||||
|
border-radius: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#window {
|
#window {
|
||||||
|
|
Loading…
Reference in a new issue