From 269545c94ccd2de1e872a092c83f6c180c6286e7 Mon Sep 17 00:00:00 2001 From: Sijmen Schoon Date: Sat, 19 Oct 2019 14:11:56 +0200 Subject: [PATCH] many: more sway-related fixes --- Xresources | 2 +- config/fish/functions/fish_prompt.fish | 6 +- config/i3/config | 2 +- config/i3/icons.py | 7 +- config/sway/config | 236 +++++++++++++++++++++++++ 5 files changed, 244 insertions(+), 9 deletions(-) create mode 100644 config/sway/config diff --git a/Xresources b/Xresources index 6aff503..1a85e64 100644 --- a/Xresources +++ b/Xresources @@ -1,2 +1,2 @@ -Xcursor.size: 48 +Xcursor.size: 24 Xft.dpi: 192 diff --git a/config/fish/functions/fish_prompt.fish b/config/fish/functions/fish_prompt.fish index f1a9c69..8f0fd51 100644 --- a/config/fish/functions/fish_prompt.fish +++ b/config/fish/functions/fish_prompt.fish @@ -46,8 +46,8 @@ function fish_prompt echo -n "\$ " end - set_color black - echo -n "" + # set_color black + # echo -n "" set_color normal echo -n " " @@ -62,7 +62,7 @@ function fish_right_prompt echo -n " " set_color black -b $__prompt_bg - echo -n "" + #echo -n "" set_color blue printf " %dm %02ds" (expr $CMD_DURATION / 60000) (expr $CMD_DURATION / 1000 \% 60) set_color normal diff --git a/config/i3/config b/config/i3/config index 55a7fe7..7e0886e 100644 --- a/config/i3/config +++ b/config/i3/config @@ -7,7 +7,7 @@ set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Ubuntu, Icons 10 +font pango:Ubuntu, Icons 11 # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod diff --git a/config/i3/icons.py b/config/i3/icons.py index c349853..8ff83d2 100644 --- a/config/i3/icons.py +++ b/config/i3/icons.py @@ -89,7 +89,7 @@ WAYLAND_ICONS = { "firefox": FA_FIREFOX, "gimp-2.10": FA_PAINT_BRUSH, "gnome-calendar": FA_CALENDAR, - "Gnome-terminal": FA_TERMINAL, + "gnome-terminal-server": FA_TERMINAL, "google-chrome": FA_CHROME, "inkscape": FA_PAINT_BRUSH, "jetbrains-pycharm": FA_CODE, @@ -97,7 +97,6 @@ WAYLAND_ICONS = { "libreoffice": FA_FILE_TEXT_O, "mupdf": FA_FILE_PDF_O, "nautilus": FA_FOLDER, - "notion-nativefier-102b2f": FA_BOOK, "org.gnome.Nautilus": FA_FOLDER, "pulseeffects": FA_VOLUME_UP, "slic3r-gui": FA_CUBE, @@ -106,8 +105,8 @@ WAYLAND_ICONS = { "Steam": FA_STEAM, "subl": FA_CODE, "subl3": FA_CODE, - "telegram-desktop": FA_TELEGRAM, - "Thunar": FA_FOLDER, + "telegramdesktop": FA_TELEGRAM, + "termite": FA_TERMINAL, "thunar": FA_FOLDER, "transmission-gtk": FA_DOWNLOAD, "urxvt": FA_TERMINAL, diff --git a/config/sway/config b/config/sway/config new file mode 100644 index 0000000..910754c --- /dev/null +++ b/config/sway/config @@ -0,0 +1,236 @@ +# i3 config file (v4) +# +# Please see http://i3wm.org/docs/userguide.html for a complete reference! +output eDP-1 scale 2 + +set $mod Mod4 + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:Ubuntu, Icons 11 + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# start a terminal +bindsym $mod+Return exec --no-startup-id termite +bindsym $mod+Ctrl+Return exec --no-startup-id thunar +bindsym $mod+Shift+Return exec --no-startup-id code + +# kill focused window +bindsym $mod+q exec --no-startup-id ~/.config/i3/cursor.sh kill + +# start dmenu (a program launcher) +bindsym $mod+space exec --no-startup-id i3-dmenu-desktop + +# lock the desktop +bindsym $mod+l exec --no-startup-id swaylock -c 000000 -i "/home/sijmen/Pictures/beeg.png" + +# alternatively, you can use the cursor keys: +bindsym $mod+Left exec --no-startup-id ~/.config/i3/cursor.sh focus left +bindsym $mod+Down exec --no-startup-id ~/.config/i3/cursor.sh focus down +bindsym $mod+Up exec --no-startup-id ~/.config/i3/cursor.sh focus up +bindsym $mod+Right exec --no-startup-id ~/.config/i3/cursor.sh focus right + +# move focused window +bindsym $mod+Shift+j exec --no-startup-id ~/.config/i3/cursor.sh move left +bindsym $mod+Shift+k exec --no-startup-id ~/.config/i3/cursor.sh move down +bindsym $mod+Shift+l exec --no-startup-id ~/.config/i3/cursor.sh move up +bindsym $mod+Shift+semicolon exec --no-startup-id ~/.config/i3/cursor.sh move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left exec --no-startup-id ~/.config/i3/cursor.sh move left +bindsym $mod+Shift+Down exec --no-startup-id ~/.config/i3/cursor.sh move down +bindsym $mod+Shift+Up exec --no-startup-id ~/.config/i3/cursor.sh move up +bindsym $mod+Shift+Right exec --no-startup-id ~/.config/i3/cursor.sh move right + +# split in horizontal orientation +bindsym $mod+h split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +# bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +#bindsym $mod+d focus child + +# 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 +bindsym $mod+Ctrl+1 workspace number 11 +bindsym $mod+Ctrl+2 workspace number 12 +bindsym $mod+Ctrl+3 workspace number 13 +bindsym $mod+Ctrl+4 workspace number 14 +bindsym $mod+Ctrl+5 workspace number 15 +bindsym $mod+Ctrl+6 workspace number 16 +bindsym $mod+Ctrl+7 workspace number 17 +bindsym $mod+Ctrl+8 workspace number 18 +bindsym $mod+Ctrl+9 workspace number 19 +bindsym $mod+Ctrl+0 workspace number 20 + +# scroll though workspaces +bindsym $mod+Tab exec --no-startup-id ~/.config/i3/cursor.sh workspace next +bindsym $mod+Shift+Tab exec --no-startup-id ~/.config/i3/cursor.sh workspace previous + +# 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 +bindsym $mod+Ctrl+Shift+1 move container to workspace number 11 +bindsym $mod+Ctrl+Shift+2 move container to workspace number 12 +bindsym $mod+Ctrl+Shift+3 move container to workspace number 13 +bindsym $mod+Ctrl+Shift+4 move container to workspace number 14 +bindsym $mod+Ctrl+Shift+5 move container to workspace number 15 +bindsym $mod+Ctrl+Shift+6 move container to workspace number 16 +bindsym $mod+Ctrl+Shift+7 move container to workspace number 17 +bindsym $mod+Ctrl+Shift+8 move container to workspace number 18 +bindsym $mod+Ctrl+Shift+9 move container to workspace number 19 +bindsym $mod+Ctrl+Shift+0 move container to workspace number 20 + +# move focused container to the next display +bindsym $mod+m exec --no-startup-id ~/.config/i3/cycle-monitor.py + +bindsym $mod+Shift+c reload +bindsym $mod+Shift+r restart +bindsym $mod+Shift+e exec --no-startup-id "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" + +# Media player controls +bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause +bindsym XF86AudioNext exec --no-startup-id playerctl next +bindsym XF86AudioPrev exec --no-startup-id playerctl previous + +bindsym XF86MonBrightnessUp exec --no-startup-id ~/.config/i3/backlight.fish -inc 5 +bindsym XF86MonBrightnessDown exec --no-startup-id ~/.config/i3/backlight.fish -dec 5 +bindsym Shift+XF86MonBrightnessUp exec --no-startup-id ~/.config/i3/backlight.fish -inc 2 +bindsym Shift+XF86MonBrightnessDown exec --no-startup-id ~/.config/i3/backlight.fish -dec 2 + +bindsym XF86AudioRaiseVolume exec --no-startup-id ~/.config/i3/volume.fish -i 5 +bindsym XF86AudioLowerVolume exec --no-startup-id ~/.config/i3/volume.fish -d 5 +bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id ~/.config/i3/volume.fish -i 2 +bindsym Shift+XF86AudioLowerVolume exec --no-startup-id ~/.config/i3/volume.fish -d 2 + +bindsym XF86AudioMute exec --no-startup-id ~/.config/i3/volume.fish -t +bindsym Shift+XF86AudioMute exec --no-startup-id pavucontrol + +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute 1 toggle + +bindsym XF86Calculator exec --no-startup-id gnome-calculator +bindsym Print exec --no-startup-id grim -g "$(slurp)" - | wl-copy && notify-send --urgency=low "Screenshot taken" +bindsym Shift+Print exec --no-startup-id /usr/bin/bash -c 'cd /tmp && f="$(escrotum -s)" && echo "/tmp/$f" | xclip -se c && notify-send --urgency=low "Screenshot taken" "$f"' +bindsym $mod+Print exec --no-startup-id $HOME/.config/i3/screenrecord.sh + +bindsym $mod+t exec --no-startup-id i3-sensible-terminal -t i3tree -- bash -c "perl -Mutf8 -CS $(which i3tree) | less" + +for_window [title="^i3tree$"] floating enable +for_window [class="^Gpick$"] floating enable +for_window [class="^Arandr$"] floating enable +for_window [class="^Pavucontrol$"] floating enable +for_window [class="^Gnome-calculator$"] floating enable + +# Light theme +## class border backgr. text indic. child_border +#client.focused #fafafa #607d8b #ffffff #b0bec5 #4db6ac +#client.focused_inactive #fafafa #37474f #ffffff #78909c #e0f2f1 +#client.unfocused #fafafa #37474f #ffffff #78909c #e0f2f1 +#client.urgent #fafafa #ff5722 #ffffff #ffab91 #bf360c + +# Dark theme +# class border backgr. text indic. child_border +client.focused #292b2e #607d8b #ffffff #b0bec5 #4db6ac +client.focused_inactive #292b2e #37474f #ffffff #78909c #292b2e +client.unfocused #292b2e #37474f #ffffff #78909c #292b2e +client.urgent #292b2e #ff5722 #ffffff #ffab91 #bf360c + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status + colors { + # Light theme + #background #fafafa + #statusline #212121 + #separator #424242 + + #focused_workspace #fafafa #009688 #ffffff + #inactive_workspace #fafafa #fafafa #212121 + #active_workspace #fafafa #424242 #ffffff + #urgent_workspace #fafafa #b71c1c #ffffff + #binding_mode #fafafa #b71c1c #ffffff + + # Dark theme + background #292b2e + statusline #dddddd + separator #292b2e + + focused_workspace #292b2e #009688 #dddddd + inactive_workspace #292b2e #292b2e #dddddd + active_workspace #292b2e #424242 #dddddd + urgent_workspace #292b2e #b71c1c #dddddd + binding_mode #292b2e #b71c1c #dddddd + } +} + +for_window [class="^.*"] border pixel 2 +gaps inner 8 + +output * bg /home/sijmen/Pictures/malta.jpg fill +exec --no-startup-id sh -c "PYTHONUNBUFFERED=1 python $HOME/.config/i3/icons.py 2>&1 > /tmp/icons.log" +#exec --no-startup-id redshift -l 52.37:4.889 -t 6500:3000 + + input "1739:0:Synaptics_TM3276-031" { + dwt disabled + natural_scroll enabled + } +