diff --git a/.dotter/global.toml b/.dotter/global.toml index 6607a62..89368c7 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -40,13 +40,16 @@ depends = ["theme"] "systemd/user/ssh-agent.service" = "~/.config/systemd/user/ssh-agent.service" [waybar] -depends = ["theme"] +depends = ["theme", "system"] [waybar.files] "waybar/config" = "~/.config/waybar/config" "waybar/style.css" = "~/.config/waybar/style.css" "waybar/mediaplayer.py" = "~/.config/waybar/mediaplayer.py" +[system.variables] +has_battery = false + [theme.variables] # These are specified in bg-fg pairs, background and text color. The _fg color # is the color of text that would be readable on this color background. diff --git a/sway/config b/sway/config index af5b637..6ed0b46 100644 --- a/sway/config +++ b/sway/config @@ -25,9 +25,11 @@ set $menu rofi -i -show drun -modi drun -show-icons ### Output configuration # -# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +output eDP-1 { + bg $HOME/.config/sway/middle.avif fill + scale 1.5 +} output DP-1 { resolution 2560x1440@74.971Hz position 0,0 @@ -123,6 +125,9 @@ input "5426:136:Razer_Razer_Basilisk_Ultimate_Dongle" { input "1452:613:Apple_Inc._Magic_Trackpad" { accel_profile adaptive } +input "1:1:AT_Translated_Set_2_keyboard" { + xkb_options ctrl:swapcaps +} input "type:keyboard" { xkb_layout us,tr } diff --git a/waybar/config b/waybar/config index cfab31c..75fe22e 100644 --- a/waybar/config +++ b/waybar/config @@ -7,7 +7,11 @@ // Choose the order of the modules "modules-left": ["custom/launcher", "sway/workspaces", "sway/mode", "custom/windows"], "modules-center": ["sway/window"], - "modules-right": ["custom/media", "pulseaudio", "cpu", "memory", "temperature", "sway/language", "clock", "tray", "custom/exit"], + "modules-right": ["custom/media", "pulseaudio", + {{#if has_battery}} + "battery", + {{/if}} + "cpu", "memory", "temperature", "sway/language", "clock", "tray", "custom/exit"], // Modules configuration "sway/workspaces": { "disable-scroll": true,