diff --git a/linux/.config/i3/config b/linux/.config/i3/config index 253c6f3..6f9959f 100644 --- a/linux/.config/i3/config +++ b/linux/.config/i3/config @@ -62,7 +62,7 @@ bindsym $mod+Control+j workspace prev bindsym $mod+Tab workspace back_and_forth # start rofi (a program launcher) -bindsym $mod+d exec --no-startup-id rofi -no-config -no-lazy-grab -show drun -modi drun -dpi 120 +bindsym $mod+d exec --no-startup-id rofi -config ~/.config/rofi/gruvbox-soft.rasi -no-lazy-grab -show drun -modi drun -dpi 120 # change focus bindsym $mod+j focus left @@ -209,63 +209,8 @@ bindsym $mod+r mode "resize" # status_command i3blocks #} -# wait for init displays -# exec --no-startup-id sleep 1 - -# setup displays (xrandr) -exec_always --no-startup-id ~/scripts/bin/setup_displays - -# logi mx ergo -# exec_always --no-startup-id xinput --set-prop "pointer:Logitech MX Ergo Multi-Device Trackball " 'libinput Accel Speed' -0.2 - -# dpi fix -exec --no-startup-id xrdb -merge ~/.Xresources - -# polybar -exec_always --no-startup-id ~/.config/polybar/launch.sh - -# mullvad -exec --no-startup-id mullvad-vpn - -# solaar -exec --no-startup-id solaar --window=hide & - -# caffeine -exec --no-startup-id caffeine start & - -# backlight -# supports only intel -#exec --no-startup-id xbacklight -set 90 & - -# nm-applet -exec --no-startup-id nm-applet & - -# blueman -# exec --no-startup-id blueman-applet & - -exec --no-startup-id nitrogen --restore; sleep 1; picom --config ~/.picom.conf - -# dropbox -# exec --no-startup-id ~/.dropbox-dist/dropboxd & - -# megasync -exec --no-startup-id megasync & - -# vorta -# exec --no-startup-id vorta & - -# keyboard layout -# @TODO move it to another file -exec --no-startup-id setxkbmap -layout us,ru -option 'grp:alt_space_toggle' - -# power manager -#exec_always --no-startup-id xfce4-power-manager - -# polkit -exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - # default gaps -gaps inner 10 +gaps inner 5 gaps outer 1 # colors @@ -276,7 +221,7 @@ set $text #ffffff set $u-bgcolor #ff0000 set $indicator #ffffff set $in-text #969696 -set $focused-ws #F0C674 +set $focused-ws #d79921 set $bar-color #523d640D # border background text indicator (a line which shows where the next window will be placed) client.focused $focused-ws $focused-ws $text $indicator @@ -294,3 +239,5 @@ default_floating_border pixel 1 for_window [title="Picture-in-Picture"] sticky enable for_window [class="MEGAsync" title="Add sync"] floating disable + +exec --no-startup-id ~/.config/i3/autostart.sh diff --git a/linux/.config/polybar/config.ini b/linux/.config/polybar/config.ini index d663bf3..2528f61 100644 --- a/linux/.config/polybar/config.ini +++ b/linux/.config/polybar/config.ini @@ -16,19 +16,43 @@ ; ;========================================================== +; [colors] +; background = #dd282A2E +; background-alt = #373B41 +; foreground = #C5C8C6 +; primary = #F0C674 +; secondary = #8ABEB7 +; alert = #A54242 +; disabled = #707880 [colors] -background = #dd282A2E -background-alt = #373B41 -foreground = #C5C8C6 -primary = #F0C674 -secondary = #8ABEB7 -alert = #A54242 -disabled = #707880 +background = #dd282828 +background-alt = #3c3836 +bg-darker = #1d2021 +foreground = #fbf1c7 + +blue = #83a598 +cyan = #8ec07c +green = #b8bb26 +orange = #fe8019 +purple = #d3869b +red = #fb4934 +yellow = #fabd2f + +bg-blue = #458588 +bg-cyan = #689d6a +bg-green = #98971a +bg-orange = #d65d0e +bg-purple = #b16268 +bg-red = #cc241d +bg-yellow = #d79921 + +black = #000 +white = #FFF [bar/fz0x1] monitor = ${env:MONITOR:HDMI-1-0} width = 100% -height = 24pt +height = 22pt radius = 6 dpi = 120 @@ -47,10 +71,10 @@ padding-right = 1 module-margin = 1 separator = ⟨ -separator-foreground = ${colors.disabled} +separator-foreground = ${colors.yellow} font-0 = JetBrainsMono Nerd Font Mono:size=9:style=Regular;2 -font-1 = JetBrainsMono Nerd Font Mono:size=18:style=Regular;3 +font-1 = JetBrainsMono Nerd Font Mono:size=16:style=Regular;5 ; font-0 = BigBlueTermPlus Nerd Font:size=10:style=Regular;2 font-2 = "Font Awesome 6 Free" ; font-3 = "Font Awesome 6 Free:style=Solid:pixelsize=10;2" @@ -90,27 +114,28 @@ label-urgent-font = 3 label-focused = %icon% label-focused-foreground = #ffffff -label-focused-background = #3f3f3f -label-focused-underline = #fba922 +label-focused-background = ${colors.background} +label-focused-underline = ${colors.red} label-focused-padding = 2 label-unfocused = %icon% label-unfocused-padding = 2 -label-visible = %icon% -label-visible-underline = #555555 -label-visible-padding = 2 +; label-visible = %icon% +; label-visible-underline = #555555 +; label-visible-padding = 2 -label-urgent = %icon% -label-urgent-foreground = #000000 -label-urgent-background = #bd2c40 -label-urgent-padding = 2 +; label-urgent = %icon% +; label-urgent-foreground = #000000 +; label-urgent-background = #bd2c40 +; label-urgent-padding = 2 -label-mode-padding = 2 +; label-mode-padding = 2 ; label-separator = | ; label-separator-padding = 2 ; label-separator-foreground = #ffb52a + ws-icon-0 = 1; ws-icon-1 = 2;󰈹 ws-icon-2 = 3; @@ -122,26 +147,26 @@ ws-icon-default = 󰇀 type = internal/tray tray-padding = 3px -#tray-background = #dd576574 +; tray-background = #dd576574 tray-size = 50% [module/xworkspaces] type = internal/xworkspaces label-active = %name% -label-active-background = ${colors.background-alt} -label-active-underline= ${colors.primary} +label-active-background = ${colors.background} +label-active-underline= ${colors.red} label-active-padding = 1 label-occupied = %name% label-occupied-padding = 1 label-urgent = %name% -label-urgent-background = ${colors.alert} +label-urgent-background = ${colors.bg-yellow} label-urgent-padding = 1 label-empty = %name% -label-empty-foreground = ${colors.disabled} +label-empty-foreground = ${colors.red} label-empty-padding = 1 [module/xwindow] @@ -151,32 +176,32 @@ label = %title:0:60:...% [module/pulseaudio] type = internal/pulseaudio -format-volume-prefix = "VOL " -format-volume-prefix-foreground = ${colors.primary} +format-volume-prefix = "vol " +format-volume-prefix-foreground = ${colors.yellow} format-volume = label-volume = %percentage%% label-muted = muted -label-muted-foreground = ${colors.disabled} +label-muted-foreground = ${colors.red} [module/xkeyboard] type = internal/xkeyboard blacklist-0 = num lock label-layout = %layout% -label-layout-foreground = ${colors.primary} +label-layout-foreground = ${colors.green} label-indicator-padding = 2 label-indicator-margin = 1 -label-indicator-foreground = ${colors.background} -label-indicator-background = ${colors.secondary} +label-indicator-foreground = ${colors.foreground} +label-indicator-background = ${colors.background} [module/memory] type = internal/memory interval = 2 format-prefix = "RAM " -format-prefix-foreground = ${colors.primary} +format-prefix-foreground = ${colors.white} label = %percentage_used:2%% [network-base] @@ -189,7 +214,7 @@ label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected [module/wlan] inherit = network-base interface-type = wireless -label-connected = %{A1:nm-connection-editor:}%{F#F0C674}%ifname%%{F-} %essid% %{A} +label-connected = %{A1:nm-connection-editor:}%{F#fabd2f}%ifname%%{F-} %essid% %{A} [module/date] type = internal/date @@ -199,7 +224,7 @@ date = %H:%M date-alt = %Y-%m-%d %H:%M:%S label = %date% -label-foreground = ${colors.primary} +label-foreground = ${colors.white} [module/backlight] type = internal/backlight @@ -262,16 +287,16 @@ bar-indicator = | bar-fill = ─ bar-empty = ─ -[module/system-bluetooth-bluetoothctl] -type = custom/script -exec = ~/.config/polybar/scripts/system-bluetooth-bluetoothctl.sh -tail = true -click-left = ~/.config/polybar/scripts/system-bluetooth-bluetoothctl.sh --toggle & +; [module/system-bluetooth-bluetoothctl] +; type = custom/script +; exec = ~/.config/polybar/scripts/system-bluetooth-bluetoothctl.sh +; tail = true +; click-left = ~/.config/polybar/scripts/system-bluetooth-bluetoothctl.sh --toggle & -[module/bluetooth] -type = custom/text -click-left = blueman-manager -content = "bt" +; [module/bluetooth] +; type = custom/text +; click-left = blueman-manager +; content = "bt" [settings] screenchange-reload = true diff --git a/linux/.config/polybar/launch.sh b/linux/.config/polybar/launch.sh index 50bf014..637e5df 100755 --- a/linux/.config/polybar/launch.sh +++ b/linux/.config/polybar/launch.sh @@ -1,9 +1,5 @@ -# Terminate already running bar instances killall -q polybar -# Wait until the processes have been shut down while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -sleep 1 - MONITOR="HDMI-1-0" polybar --reload fz0x1 -c ~/.config/polybar/config.ini &