this will probably cause a merge conflict

This commit is contained in:
Paul Fey 2025-01-01 16:34:16 +01:00
parent e4d4ea30cf
commit 6d65a574df
5 changed files with 469 additions and 50 deletions

View file

@ -23,8 +23,9 @@ set $filemanager nemo
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
#set $menu dmenu_path | wmenu | xargs swaymsg exec --
set $menu j4-dmenu-desktop --no-generic
set $background /home/pauljako/Pictures/Wallpaper/Canada.jpg
set $dmenu dmenu
set $menu j4-dmenu-desktop --no-generic --dmenu=$dmenu
set $background ~/.wallpaper
### Output configuration
#
# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
@ -40,15 +41,15 @@ output * bg $background fill
#
# Example configuration:
#
# exec swayidle -w \
# timeout 300 'swaylock -f -c 000000' \
# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
#exec swayidle -w \
# timeout 10 'swaylock -f -c 000000' \
# timeout 20 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
# before-sleep 'swaylock -f -c 000000'
#
# This will lock your screen after 300 seconds of inactivity, then turn off
# your displays after another 300 seconds, and turn your screens back on when
# resumed. It will also lock your screen before your computer goes to sleep.
exec_always /home/pauljako/.config/dotfiles/sway/lock.sh
exec_always ~/.config/dotfiles/sway/lock.sh
exec_always libinput-gestures
### Input configuration
#
@ -76,6 +77,8 @@ input "type:touchpad" {
input "type:pointer" {
natural_scroll enabled
}
# Set the font
font pango:JetBrainsMonoNerdFont 9
### Key bindings
#
# Basics:
@ -91,6 +94,7 @@ input "type:pointer" {
# Start your launcher
bindsym $mod+Space exec $menu
bindsym $mod+Shift+B exec --no-startup-id DMENU_BLUETOOTH_LAUNCHER=$dmenu ~/.config/dotfiles/sway/dmenu-bluetooth.sh
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
@ -237,7 +241,7 @@ bar {
# When the status_command prints a new line to stdout, swaybar updates.
# The default just shows the current date and time.
status_command bash /home/pauljako/.config/dotfiles/sway/statusbar.sh
status_command bash ~/.config/dotfiles/sway/statusbar.sh
colors {
statusline #ffffff