diff --git a/sway/.config/alacritty/alacritty.yml b/sway/.config/alacritty/alacritty.yml index e70e17d..97c9ea9 100644 --- a/sway/.config/alacritty/alacritty.yml +++ b/sway/.config/alacritty/alacritty.yml @@ -1,17 +1,13 @@ font: - size: 9 # whatever this number actually means... + size: 10 # whatever this number actually means... normal: - family: JuliaMono - style: Regular + family: Iosevka bold: - family: JuliaMono - style: Bold + family: Iosevka italic: - family: JuliaMono - style: Italic + family: Iosevka bold_italic: - family: JuliaMono - style: BoldItalic + family: Iosevka #draw_bold_text_with_bright_colors: true diff --git a/sway/.config/i3status-rust/config.toml b/sway/.config/i3status-rust/config.toml index 40ad52a..b58f86e 100644 --- a/sway/.config/i3status-rust/config.toml +++ b/sway/.config/i3status-rust/config.toml @@ -1,8 +1,8 @@ [theme] -name = "moonfly" +theme = "moonfly" [icons] -name = "awesome6" +icons = "awesome6" [[block]] block = "maildir" @@ -10,7 +10,9 @@ interval = 60 inboxes = ["/home/grue/mail/dump@dvb.solutions/INBOX", "/home/grue/mail/grigory@tlm.solutions/INBOX" ] threshold_critical = 1 display_type = "new" -on_click = "alacritty --class floating-foot -o \"window.dimensions.columns=150\" -o \"window.dimensions.rows=50\" -e zsh -c neomutt" +[[block.click]] +button = "left" +cmd = "alacritty --class floating-foot -o \"window.dimensions.columns=150\" -o \"window.dimensions.lines=50\" -e zsh -c neomutt" [[block]] block = "maildir" @@ -19,7 +21,9 @@ inboxes = ["/home/grue/mail/mail@oxapentane.com/INBOX", "/home/grue/mail/mail@ox threshold_warning = 1 threshold_critical = 10 display_type = "new" -on_click = "alacritty --class floating-foot -o \"window.dimensions.columns=150\" -o \"window.dimensions.rows=50\" -e zsh -c neomutt" +[[block.click]] +button = "left" +cmd = "alacritty --class floating-foot -o \"window.dimensions.columns=150\" -o \"window.dimensions.lines=50\" -e zsh -c neomutt" [[block]] block = "backlight" @@ -30,42 +34,41 @@ cycle = [ 100, 50, 10 ] [[block]] block = "net" device = "wlan0" -format = "{ssid} {signal_strength}" +format = " $icon $ssid $signal_strength " [[block]] block = "net" -device = "james" +device = "enp1s0f0" [[block]] block = "memory" -display_type = "memory" -format_mem = "{mem_used_percents}" -format_swap = "{swap_used_percents}" +format = " $icon $mem_used_percents " [[block]] block = "cpu" -format = "{frequency} {barchart} {utilization}" +format = " $icon $frequency $barchart "# $utilization" [[block]] block = "load" -format = "{1m} {5m} {15m}" +format = " $1m $5m $15m " [[block]] block = "sound" -on_click = "alacritty --class floating-foot -e zsh -c pulsemixer" headphones_indicator = true +[[block.click]] +button = "left" +cmd = "alacritty --class floating-foot -e zsh -c pulsemixer" [[block]] block = "keyboard_layout" driver = "sway" -format = "{layout}" [[block]] block = "battery" driver = "upower" -format = "{percentage} {time}" +format = " $icon $percentage $time " if_command = "test -e /sys/class/power_supply/BAT0" [[block]] block = "time" -format = "%a %F %R" +format = " $icon $timestamp.datetime(f:'%a %F %R', l:nl_NL) " diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 9121674..734bd63 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -15,7 +15,7 @@ set $up k set $right l # Your preferred terminal emulator set $term alacritty -set $floatterm alacritty --class floating-foot +set $floatterm alacritty --class floating-foot -e set $lock $HOME/.config/sway/lock.sh # Your preferred application launcher @@ -61,7 +61,7 @@ exec swayidle -w \ } input type:keyboard { - xkb_layout "65-percent-en-us,ru" + xkb_layout "us,ru" xkb_options "caps:ctrl_modifier,grp:alt_space_toggle" } # @@ -105,8 +105,8 @@ seat * hide_cursor 5000 bindsym --to-code $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' # Brightness - bindsym --to-code XF86MonBrightnessDown exec "brightnessctl set 1%-" - bindsym --to-code XF86MonBrightnessUp exec "brightnessctl set +1%" + bindsym --to-code XF86MonBrightnessDown exec "brightnessctl set 5%-" + bindsym --to-code XF86MonBrightnessUp exec "brightnessctl set +5%" # Volume bindsym --to-code XF86AudioRaiseVolume exec 'pamixer -i 1' bindsym --to-code XF86AudioLowerVolume exec 'pamixer -d 1' @@ -281,7 +281,7 @@ client.focused $color06 $color06 $color00 $color07 $color06 # Read `man 5 sway-bar` for more information about this section. bar { position top - font pango:JuliaMono, Font Awesome 6 Free 8 + font pango:Iosevka Regular 9 icon_theme "Adwaita" status_command /run/current-system/sw/bin/i3status-rs colors { @@ -297,7 +297,7 @@ bar { # default border default_border pixel 2 # Set font -font pango:JuliaMono 8 +font pango:Iosevka Regular 9 # bindsym --to-code $mod+t input type:touchpad toggle diff --git a/sway/.config/sway/lock.sh b/sway/.config/sway/lock.sh index d75cc01..cdf38af 100755 --- a/sway/.config/sway/lock.sh +++ b/sway/.config/sway/lock.sh @@ -4,8 +4,8 @@ img="$HOME/.cache/swaylock.png" #img="$HOME/.files/sway/.config/sway/lock-fullhd.png" grim $img -#gm convert $img -scale 5% -scale 2000% $img -gm convert $img -blur 0x10 $img -swaylock -eFfk -i $img -s fill +gm convert $img -scale 5% -scale 2000% $img +#gm convert $img -blur 0x10 $img +swaylock -Ffk -i $img -s fill rm -f $img