From 097839b7bea8d497e487a5613aada3e31dd2a1a7 Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Mon, 19 Sep 2022 12:51:31 +0200 Subject: [PATCH] Migrate work laptop to wayland/sway --- .config/htop/htoprc | 29 +++- .config/i3/config-laptop-work | 1 + .config/sway/config | 269 ++++++++++++++++++++++++++++++++++ .xinitrc-laptop-work | 5 +- 4 files changed, 295 insertions(+), 9 deletions(-) create mode 100644 .config/sway/config diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 6e1897e..2fd13b0 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,9 +1,10 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 +fields=0 48 17 18 38 39 40 2 46 47 49 1 sort_key=46 sort_direction=1 -hide_threads=0 +tree_sort_key=46 +tree_sort_direction=1 hide_kernel_threads=0 hide_userland_threads=0 shadow_other_users=1 @@ -12,15 +13,27 @@ show_program_path=1 highlight_base_name=1 highlight_megabytes=1 highlight_threads=1 -tree_view=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +tree_view=0 +tree_view_always_by_pid=0 header_margin=1 detailed_cpu_time=1 -cpu_count_from_zero=0 +cpu_count_from_one=1 +show_cpu_usage=1 +show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 update_process_names=0 account_guest_in_cpu_meter=1 color_scheme=0 +enable_mouse=1 delay=15 -left_meters=LeftCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=RightCPUs Tasks LoadAverage Uptime -right_meter_modes=1 2 2 2 +left_meters=LeftCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=RightCPUs Tasks LoadAverage Uptime +right_meter_modes=1 2 2 2 +hide_function_bar=0 diff --git a/.config/i3/config-laptop-work b/.config/i3/config-laptop-work index 87e4bdc..66e4591 100644 --- a/.config/i3/config-laptop-work +++ b/.config/i3/config-laptop-work @@ -225,6 +225,7 @@ for_window [class="pinentry"] floating enable exec --no-startup-id xfce4-power-manager exec --no-startup-id pasystray exec --no-startup-id nm-applet +exec --no-startup-id blueman-applet exec --no-startup-id nextcloud # Set background image diff --git a/.config/sway/config b/.config/sway/config new file mode 100644 index 0000000..3c6256f --- /dev/null +++ b/.config/sway/config @@ -0,0 +1,269 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod1 + +# Home row direction keys, like vim +set $left left +set $down down +set $up up +set $right right + +# Your preferred terminal emulator +set $term xfce4-terminal + +# Your preferred application launcher +# 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 | dmenu | xargs swaymsg exec -- + + +### Output configuration +# +# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) +output * bg /home/jpt/Backgrounds/current fill +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs + +# Screen config network seat +output eDP-1 pos 0 0 res 1920x1080 +output DP-3 pos 3840 0 res 1920x1200 +output DP-4 pos 1920 0 res 1920x1200 +focus output DP-3 + + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms 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. + +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +# Enforce German keyboard layout +input "type:keyboard" { + xkb_layout de + xkb_variant ,nodeadkeys +} + + +### Key bindings +# +# Basics: +# + # Start a terminal + bindsym $mod+Return exec $term + + # Kill focused window + bindsym $mod+Shift+q kill + + # Start your launcher + bindsym $mod+d exec $menu + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # Reload the configuration file + bindsym $mod+Shift+r reload + + # Exit sway (logs you out of your Wayland session) + bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + + # Move the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right +# +# Workspaces: +# + # Switch to workspace + bindsym $mod+1 workspace number 1 + bindsym $mod+2 workspace number 2 + bindsym $mod+3 workspace number 3 + bindsym $mod+4 workspace number 4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 + bindsym $mod+9 workspace number 9 + bindsym $mod+0 workspace number 10 + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8 + bindsym $mod+Shift+9 move container to workspace number 9 + bindsym $mod+Shift+0 move container to workspace number 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. + + + # move focused workspace to other output + bindsym $mod+Shift+Prior move workspace to output left + bindsym $mod+Shift+Next move workspace to output right + +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # Move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+x move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+x scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 5px + bindsym $down resize grow height 5px + bindsym $up resize shrink height 5px + bindsym $right resize grow width 5px + + # Return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym $mod+r mode "resize" + +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position bottom + + # When the status_command prints a new line to stdout, swaybar updates. + # The default just shows the current date and time. + status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done + + colors { + statusline #ffffff + background #323232 + inactive_workspace #32323200 #32323200 #5c5c5c + } +} + + +bindsym $mod+Shift+g mode "nomodkey" +mode "nomodkey" { + bindsym $mod+Shift+g mode "default" +} + + +# screen locking +bindsym Ctrl+Alt+L exec swaylock -c 000000ff +bindsym Ctrl+Alt+Shift+L exec swaylock -i /home/jpt/Backgrounds/current + +# simple screenshot binding +bindsym $mod+Shift+s exec --no-startup-id grim -g "$(slurp)" - | swappy -f - + +# "Presentation tool for screens" +bindsym $mod+Shift+p exec --no-startup-id wdisplays + + +# Pulse Audio controls +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound + +# Screen brightness controls +bindsym XF86MonBrightnessUp exec xbacklight -inc 10 # increase screen brightness +bindsym XF86MonBrightnessDown exec xbacklight -dec 10 # decrease screen brightness + +# Media player controls +bindsym XF86AudioPlay exec playerctl play +bindsym XF86AudioPause exec playerctl pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous + +# Enable or disable floating +for_window [class="pinentry"] floating enable + +# Autostart programs +exec --no-startup-id xfce4-power-manager +exec --no-startup-id pasystray +exec --no-startup-id nm-applet +exec --no-startup-id blueman-applet +exec --no-startup-id nextcloud + +# This is default stuff - do not remove (below) +include /etc/sway/config.d/* diff --git a/.xinitrc-laptop-work b/.xinitrc-laptop-work index 0b5aa02..17c1055 100644 --- a/.xinitrc-laptop-work +++ b/.xinitrc-laptop-work @@ -5,4 +5,7 @@ source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh #nm-applet # Start i3 -exec i3 +#exec i3 + +# Start sway +sway