diff --git a/configs/sway/config b/configs/sway/config index f947048..98b78d7 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -28,7 +28,7 @@ default_border pixel 1 gaps inner 8 font "JetBrains Mono" 9 -output * scale 1.5 +output * scale 2 include ~/.config/sway/themes/catppuccin-macchiato @@ -41,8 +41,8 @@ exec swayidle -w timeout 60 '$HOME/.config/sway/lock.sh' # Screenshots set $screenshot_file \"$HOME/Pictures/screenshot-$(date '+%Y-%m-%d_%H-%M-%S').png\" -bindsym $mod+o exec grim -s1 $screenshot_file -bindsym $mod+p exec (slurp | grim -g- -s1 $screenshot_file) +bindsym $mod+o exec grim $screenshot_file +bindsym $mod+p exec (slurp | grim -g- $screenshot_file) # Recordings diff --git a/configs/sway/themes/catppuccin-macchiato b/configs/sway/themes/catppuccin-macchiato index dcb575d..e0b10b8 100644 --- a/configs/sway/themes/catppuccin-macchiato +++ b/configs/sway/themes/catppuccin-macchiato @@ -2,7 +2,7 @@ seat seat0 xcursor_theme "Simp1e-Catppuccin-Macchiato" set $gnome-schema org.gnome.desktop.interface exec_always { - gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato' + gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-Dark' gsettings set $gnome-schema icon-theme 'Mint-Y-Dark' gsettings set $gnome-schema cursor-theme 'Simp1e-Catppuccin-Macchiato' gsettings set $gnome-schema font-name 'Noto Sans 9' diff --git a/configs/waybar/config b/configs/waybar/config index 244288d..d664bbe 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -2,15 +2,15 @@ "position": "top", "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": [], - "modules-right": ["idle_inhibitor", "cpu", "temperature", "memory", "custom/loadavg", "custom/uptime", "network", "pulseaudio", "battery", "sway/language", "clock", "tray"], + "modules-right": ["idle_inhibitor", "cpu", "memory", "custom/loadavg", "custom/uptime", "network", "pulseaudio", "battery", "sway/language", "custom/absclock", "clock", "tray"], "sway/mode": { "format": "{}" }, "idle_inhibitor": { "format": "{icon}", "format-icons": { - "activated": "0", - "deactivated": "O" + "activated": "No idling", + "deactivated": "Idling" } }, "tray": { @@ -36,6 +36,12 @@ "format": "RAM: {}%", "interval": 1 }, + "custom/absclock": { + "exec": "date +%s", + "return-type": "{}", + "format": "{}", + "interval": 1 + }, "custom/loadavg": { "exec": "cat /proc/loadavg | head -c 14", "return-type": "{}", @@ -63,6 +69,6 @@ "tooltip-format": "{ipaddr}/{cidr}", "format-linked": "Network (No IP) via {ifname}", "format-disconnected": "No network", - "on-click": "iwgtk" + "on-click": "nm-connection-editor" }, } diff --git a/configs/waybar/style.css b/configs/waybar/style.css index b2b7772..c78d067 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,6 +1,6 @@ @import "macchiato.css"; * { - font-family: "JetBrains Mono", "Noto Sans"; + font-family: "Ubuntu", "JetBrains Mono", "Noto Sans"; font-size: 9pt; border: none; border-radius: 0; diff --git a/tools/relink.sh b/tools/relink.sh index 5cb2bf5..c833e01 100755 --- a/tools/relink.sh +++ b/tools/relink.sh @@ -3,13 +3,12 @@ # script that (re)links all dotfiles during the installation or upgrade. # do not run manually -mkdir -p $HOME/.config/nvim $HOME/.config/alacritty $HOME/.config/mako >/dev/null 2>&1 ln -sf $HOME/.dotfiles/configs/.zshrc $HOME/.zshrc ln -sf $HOME/.dotfiles/configs/.profile $HOME/.profile -ln -sF $HOME/.dotfiles/configs/nvim $HOME/.config/ -ln -sF $HOME/.dotfiles/configs/alacritty $HOME/.config/ -ln -sF $HOME/.dotfiles/configs/sway $HOME/.config/ -ln -sF $HOME/.dotfiles/configs/waybar $HOME/.config/ -ln -sF $HOME/.dotfiles/configs/mako $HOME/.config/ -ln -sF $HOME/.dotfiles/configs/qt5ct $HOME/.config/ +ln -sf $HOME/.dotfiles/configs/nvim $HOME/.config/ +ln -sf $HOME/.dotfiles/configs/alacritty $HOME/.config/ +ln -sf $HOME/.dotfiles/configs/sway $HOME/.config/ +ln -sf $HOME/.dotfiles/configs/waybar $HOME/.config/ +ln -sf $HOME/.dotfiles/configs/mako $HOME/.config/ +ln -sf $HOME/.dotfiles/configs/qt5ct $HOME/.config/ echo "Dotfiles linked."