diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml index 1d66f6e..75d4e14 100644 --- a/.config/i3status-rust/config.toml +++ b/.config/i3status-rust/config.toml @@ -1,71 +1,49 @@ -# note: pinned on 0.22.0-1 (extra/i3status-rust) +icons_format = "{icon}" -theme = "bad-wolf" +[theme] +theme = "nord-dark" +#[theme.overrides] +#idle_bg = "#123456" +#idle_fg = "#abcdef" [icons] -name = "awesome" -[icons.overrides] -seperator = "" -#time = "" -#update = "" -#uptime = "" +icons = "awesome6" +#[icons.overrides] +#bat = ["|E|", "|_|", "|=|", "|F|"] +#bat_charging = "|^| " [[block]] -block = "focused_window" -max_width=80 -show_marks="visible" +block = "cpu" +info_cpu = 20 +warning_cpu = 50 +critical_cpu = 90 [[block]] block = "disk_space" path = "/" -alias = "/" -info_type = "used" -unit = "GB" +info_type = "available" +alert_unit = "GB" interval = 20 -warning = 900.0 -alert = 940.0 -format="ssd {available} ({percentage})" - -[[block]] -block = "disk_space" -path = "/hdd" -alias = "/hdd" -info_type = "used" -unit = "GB" -interval = 20 -warning = 2800.0 -alert = 2950.0 -format="hdd {available} ({percentage})" +warning = 20.0 +alert = 10.0 +format = " $icon root: $available.eng(w:2) " [[block]] block = "memory" -display_type = "memory" -format_mem = "{mem_used_percents}" -format_swap = "{swap_used_percents}" -warning_mem = 75.0 -critical_swap = 80.0 - -[[block]] -block = "cpu" -interval = 1 -warning = 50 +format = " $icon $mem_total_used_percents.eng(w:2) " +format_alt = " $icon_swap $swap_used_percents.eng(w:2) " [[block]] block = "sound" - -[[block]] -block = "pacman" -interval = 600 -format = "{pacman} updates" -hide_when_uptodate = true -on_click = "fakeroot pacman -Qu --dbpath /tmp/checkup-db-andy/ | dmenu -l 25 -f -p 'to be installed'" - -[[block]] -block = "uptime" +[[block.click]] +button = "left" +cmd = "pavucontrol" [[block]] block = "time" interval = 5 -format = "%a %b %d : %Y-%m-%d : %l:%M:%S %p" - +format = " $timestamp.datetime(f:'%a %d/%m %R') " +[[block]] +block = "battery" +format = " $icon $percentage " diff --git a/.config/sway/config b/.config/sway/config index b557e3e..41139d4 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -24,7 +24,7 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec -- # # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) #output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill -output * bg ~/Documents/media/wallpapers/kestrel1.jpg fill +#output * bg ~/Documents/media/wallpapers/kestrel1.jpg fill # # Example configuration: # @@ -60,61 +60,6 @@ output * bg ~/Documents/media/wallpapers/kestrel1.jpg fill # Read `man 5 sway-input` for more information about this section. ### options - -output HDMI-A-1 { - mode 1920x1080 - pos 0,1080 -} - -output DP-2 { - mode 1920x1080 - pos 1920,600 - transform 90 - - bg /home/andy/Documents/media/wallpapers/su30-1.jpg fill -} - -# mac (over vnc) -# enable with `swaymsg create_output HEADLESS-1` -# start vnc with `wayvnc --output=HEADLESS-1 --max-fps=20 0.0.0.0 5900` -# note: wayvnc is compiled against libplacebo 4.208, freeze that until a wayvnc update (ffmpeg conflict) -output HEADLESS-3 { - #pos 1920,180 - pos 3000,1920 - # mac resolution - mode 1440x900 - #transform 90 -} -# TODO: find the correct syntax for this -#exec swaymsg create_output HEADLESS-1 -#exec wayvnc --output=HEADLESS-1 0.0.0.0 5900 - -# kindle (over vnc) -# enable with `swaymsg create_output HEADLESS-2` -# start vnc with `firevnc` (after starting sp3vnc) -output HEADLESS-2 { - pos 1480 2160 - # native - #mode 1024x600 - mode 751x440 - transform 90 - #scale 1.25 - - bg /home/andy/Documents/media/wallpapers/su30-2.jpg fill -} -#exec swaymsg create_output HEADLESS-2 -#exec wayvnc --output=HEADLESS-2 0.0.0.0 5901 - -# sp3 (over vnc) -# start vnc with `sp3vnc` -output HEADLESS-1 { - pos 400,2160 - # mac resolution - mode 2160x1440 - scale 2 - #mode 1080x720 - # 4k is detrimental over vnc + super-retina -} #exec swaymsg create_output HEADLESS-3 #exec wayvnc --output=HEADLESS-3 0.0.0.0 5902 @@ -165,6 +110,10 @@ bindsym --locked XF86AudioPlay exec "playerctl --player=spotify,pragha,%any play bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +3% bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -3% +# brightness +bindsym XF86MonBrightnessUp exec light -A 5 +bindsym XF86MonBrightnessDown exec light -U 5 + # use msft keys for first 5 spaces bindsym XF86Launch5 workspace number 1 bindsym XF86Launch6 workspace number 2 @@ -176,9 +125,9 @@ bindsym XF86Favorites scratchpad show bindsym Print move container to workspace f -bindsym $mod+Shift+r exec wf-recorder -g "$(slurp)" -f /home/andy/Documents/media/screenshots/"$(date +%Y-%m-%d-%H:%M:%S)".webm +#bindsym $mod+Shift+r exec wf-recorder -g "$(slurp)" -f /home/andy/Documents/media/screenshots/"$(date +%Y-%m-%d-%H:%M:%S)".webm bindsym $mod+Shift+t exec killall -SIGINT wf-recorder -bindsym $mod+Shift+f exec grim -g "$(slurp)" /home/andy/Documents/media/screenshots/"$(date +%Y-%m-%d-%H:%M:%S)".png +#bindsym $mod+Shift+f exec grim -g "$(slurp)" /home/andy/Documents/media/screenshots/"$(date +%Y-%m-%d-%H:%M:%S)".png bindsym $mod+Control+Shift+$right move workspace to output right bindsym $mod+Control+Shift+$left move workspace to output left @@ -233,16 +182,16 @@ bindsym $mod+Shift+s exec bash ~/.config/sway/fancelock.sh # --inside-clear-color ff212f70 \ # --key-hl-color 1111f160 # screen locking -exec_always killall swayidle -exec_always swayidle -w \ - timeout 545 'notify-send "sleep:" "blanking in 15s"' \ - timeout 550 'notify-send "sleep:" "blanking in 10s"' \ - timeout 555 'notify-send "sleep:" "blanking in 5s"' \ - timeout 600 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160' \ - timeout 660 'swaymsg "output * dpms off"' \ - resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160' - +#exec_always killall swayidle +#exec_always swayidle -w \ +# timeout 545 'notify-send "sleep:" "blanking in 15s"' \ +# timeout 550 'notify-send "sleep:" "blanking in 10s"' \ +# timeout 555 'notify-send "sleep:" "blanking in 5s"' \ +# timeout 600 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160' \ +# timeout 660 'swaymsg "output * dpms off"' \ +# resume 'swaymsg "output * dpms on"' \ +# before-sleep 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160' +# #exec swayidle -w before-sleep 'swaylock -f -c 000000' @@ -400,10 +349,12 @@ bar { #swaybar_command i3status-rs - font pango: FontAwesome, Noto Sans Mono 10 + font pango: FontAwesome 15px, Noto Sans Mono 12px status_command i3status-rs + height 15 + #status_command i3blocks #status_command while date +'%a %b %d : %Y-%m-%d : %l:%M:%S %p'; do sleep 1;done @@ -419,4 +370,8 @@ bar { } } +input type:touchpad { + tap enabled +} + include /etc/sway/config.d/* diff --git a/.config/sway/fancelock.sh b/.config/sway/fancelock.sh index 9ba8510..0aab7d9 100755 --- a/.config/sway/fancelock.sh +++ b/.config/sway/fancelock.sh @@ -3,22 +3,21 @@ # based on https://gist.github.com/singulared/7c6d53c1b84fbb7cf22d07c5c7d3e945?permalink_comment_id=3179677#gistcomment-3179677 swayidle \ - timeout 14 'swaymsg "output * dpms off" ; ssh sp3 DISPLAY=:0 xset dpms force off' \ - resume 'swaymsg "output * dpms on" ; ssh sp3 "export DISPLAY=:0 && xset dpms 0 0 0 && xset -dpms && xset s off && xset s noblank"' & + timeout 14 'swaymsg "output * dpms off"' \ + resume 'swaymsg "output * dpms on"' & IMAGE=/tmp/i3lock.png LOCK=~/stow/bin/assets/stop.png LOCKARGS=" --ring-color 1108ee08 \ --inside-color 1108ee02 \ - --indicator-x-position 1343 \ - --indicator-y-position 680 \ --indicator-radius 220 \ --indicator-thickness 20 \ --ring-clear-color 1100ff10 \ --inside-clear-color 1f41ff70 \ --ring-wrong-color ff000010 \ --inside-clear-color ff212f70 \ - --key-hl-color 1111f160 " + --key-hl-color 1111f160 \ + --fingerprint" for OUTPUT in `swaymsg -t get_outputs | jq -r '.[] | select(.active == true) | .name'` do diff --git a/.config/wluma/config.toml b/.config/wluma/config.toml new file mode 100644 index 0000000..085010c --- /dev/null +++ b/.config/wluma/config.toml @@ -0,0 +1,30 @@ +[als.iio] +path = "/sys/bus/iio/devices" +thresholds = { 0 = "night", 20 = "dark", 80 = "dim", 250 = "normal", 500 = "bright", 800 = "outdoors" } + +# [als.webcam] +# video = 0 +# thresholds = { 0 = "night", 15 = "dark", 30 = "dim", 45 = "normal", 60 = "bright", 75 = "outdoors" } + +# [als.time] +# thresholds = { 0 = "night", 7 = "dark", 9 = "dim", 11 = "normal", 13 = "bright", 16 = "normal", 18 = "dark", 20 = "night" } + +# [als.none] + +[[output.backlight]] +name = "eDP-1" +path = "/sys/class/backlight/amdgpu_bl1" +capturer = "wlroots" + +# [[output.ddcutil]] +# name = "Dell Inc. DELL P2415Q" +# capturer = "none" + +#[[keyboard]] +#name = "keyboard-dell" +#path = "/sys/bus/platform/devices/dell-laptop/leds/dell::kbd_backlight" + +# [[keyboard]] +# name = "keyboard-thinkpad" +# path = "/sys/bus/platform/devices/thinkpad_acpi/leds/tpacpi::kbd_backlight" + diff --git a/.zshenv b/.zshenv deleted file mode 100644 index c2f3182..0000000 --- a/.zshenv +++ /dev/null @@ -1 +0,0 @@ -. "$HOME/.cargo/env" diff --git a/.zshrc b/.zshrc index 26f5fad..c4d8a2c 100644 --- a/.zshrc +++ b/.zshrc @@ -25,6 +25,8 @@ export PATH=$PATH:$HOME/.local/bin export PATH=$PATH:$HOME/.nix-profile/bin +export PATH=$PATH:$HOME/.cargo/bin + # from mac PS1='%(?.%F{green}%?%f.%F{red}%?%f) %2~ %# ' RPROMPT='%D{%l%M.%S}' @@ -85,3 +87,6 @@ function did() { local rx=$1; shift grog tag -fnt todo -T done --rx $rx -a done $* } + +export WLR_DRM_NO_MODIFIERS=1 +export QT_QPA_PLATFORM=wayland diff --git a/cat b/cat new file mode 100644 index 0000000..c3362b4 --- /dev/null +++ b/cat @@ -0,0 +1 @@ +188 /sys/class/backlight/amdgpu_bl1/brightness diff --git a/synced b/synced index cf925d6..2935f2b 100644 --- a/synced +++ b/synced @@ -8,5 +8,5 @@ .config/helix/config.toml .config/helix/languages.toml .zshrc -.zshenv .vitetris +.config/wluma/config.toml