From cfdf72a4b0202ddb174d149986614c12d6b0c69a Mon Sep 17 00:00:00 2001 From: dalahast Date: Tue, 26 May 2020 11:59:27 +0200 Subject: [PATCH] add deskop sway configs --- .config/sway/config | 102 +++++++++++++++++++++++++++------------ .config/waybar/config | 73 +++++++++++++++------------- .config/waybar/style.css | 56 ++++++++------------- 3 files changed, 130 insertions(+), 101 deletions(-) diff --git a/.config/sway/config b/.config/sway/config index 11c8367..27bbc71 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -10,13 +10,15 @@ set { $up k $right l $term kitty - $menu rofi -show drun -icon-theme "Papirus-Dark" -show-icons | xargs swaymsg exec -- - $windowmenu rofi -show window -icon-theme "Papirus-Dark" -show-icons + #$menu rofi -show drun -icon-theme "Papirus-Dark" -show-icons | xargs swaymsg exec -- + $menu wofi --show drun | xargs swaymsg exec -- + $runmenu wofi --show run | xargs swaymsg exec -- $gnome-schema org.gnome.desktop.interface $gtk_theme "Adapta-Nokto-Eta" $icon_theme "Papirus-Dark" $bg ~/Pictures/drain.png - $lockscreen exec '~/.local/bin/lockscreen' + #$lockscreen exec '~/.local/bin/lockscreen' + $lockscreen 'swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 10 --effect-blur 7x5 --effect-vignette 0.4:0.4 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2' # Heads # For desktop $primary DP-1 @@ -31,14 +33,20 @@ set { ### Autoruns # exec_always --no-startup-id { + pkill flashfocus gsettings set $gnome-schema gtk-theme $gtk_theme gsettings set $gnome-schema icon-theme $icon_theme - mako --anchor bottom-right > /tmp/mako.log 2>&1 + gsettings set $gnome-schema font-name 'Cantarell 10' + gsettings set $gnome-schema monospace=font-name 'Anka/Coder 11' + mako --anchor top-right > /tmp/mako.log 2>&1 + flashfocus swaymsg focus output $primary - swayidle -w timeout 1200 "$lockscreen"\ + evolution + telegram-desktop + swayidle -w timeout 1200 exec $lockscreen\ timeout 1201 'swaymsg "output * dpms off"'\ resume 'swaymsg "output * dpms on"'\ - before-sleep "$lockscreen" + before-sleep exec $lockscreen } # @@ -56,6 +64,8 @@ output $portrait transform 270 # Set desktop background for all heads output * bg $bg fill + + # ### Key bindings # @@ -69,7 +79,7 @@ output * bg $bg fill # Start your launcher bindsym $mod+d exec $menu - bindsym $mod+shift+d exec $windowmenu + bindsym $mod+shift+d exec $runmenu # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -85,7 +95,7 @@ output * bg $bg fill bindsym $mod+Shift+e exec swaynag -t warning -m 'Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' #Lock the session - bindsym Control+Shift+l $lockscreen + bindsym Control+Shift+l exec $lockscreen # # Program shortcuts @@ -108,6 +118,10 @@ bindsym { bindsym $mod+Up focus up bindsym $mod+Right focus right + bindsym $mod+comma workspace prev_on_output + bindsym $mod+period workspace next_on_output + bindsym $mod+Shift+tab workspace back_and_forth + # Move the focused window with the same, but add Shift bindsym $mod+Shift+$left move left bindsym $mod+Shift+$down move down @@ -159,6 +173,7 @@ bindsym { # bindsym $mod+Control+0 workspace P10 bindsym $mod+t workspace comm + bindsym $mod+m workspace M # Move focused container to workspace bindsym $mod+Shift+1 move container to workspace 1 @@ -171,28 +186,29 @@ bindsym { bindsym $mod+Shift+8 move container to workspace 8 bindsym $mod+Shift+9 move container to workspace 9 bindsym $mod+Shift+0 move container to workspace 10 - bindsym $mod+Shift+Control+1 move container to workspace P1 - bindsym $mod+Shift+Control+2 move container to workspace P2 - bindsym $mod+Shift+Control+3 move container to workspace P3 - bindsym $mod+Shift+Control+4 move container to workspace P4 - bindsym $mod+Shift+Control+5 move container to workspace P5 - bindsym $mod+Shift+Control+6 move container to workspace P6 - bindsym $mod+Shift+Control+7 move container to workspace P7 - bindsym $mod+Shift+Control+8 move container to workspace P8 - bindsym $mod+Shift+Control+9 move container to workspace P9 - bindsym $mod+Shift+Control+0 move container to workspace P10 + bindsym $mod+Shift+Control+1 move container to workspace 1P + bindsym $mod+Shift+Control+2 move container to workspace 2P + bindsym $mod+Shift+Control+3 move container to workspace 3P + bindsym $mod+Shift+Control+4 move container to workspace 4P + bindsym $mod+Shift+Control+5 move container to workspace 5P + bindsym $mod+Shift+Control+6 move container to workspace 6P + bindsym $mod+Shift+Control+7 move container to workspace 7P + bindsym $mod+Shift+Control+8 move container to workspace 8P + bindsym $mod+Shift+Control+9 move container to workspace 9P + bindsym $mod+Shift+Control+0 move container to workspace 10P # Workspace-monitor assignments - workspace P1 output $portrait - workspace P2 output $portrait - workspace P3 output $portrait - workspace P4 output $portrait - workspace P5 output $portrait - workspace P6 output $portrait - workspace P7 output $portrait - workspace P8 output $portrait - workspace P9 output $portrait - workspace P10 output $portrait + workspace 1P output $portrait + workspace 2P output $portrait + workspace 3P output $portrait + workspace 4P output $portrait + workspace 5P output $portrait + workspace 6P output $portrait + workspace 7P output $portrait + workspace 8P output $portrait + workspace 9P output $portrait + workspace 10P output $portrait workspace comm output $portrait + workspace M output $portrait # For single head devices #workspace comm output $primary workspace 1 output $primary @@ -239,7 +255,7 @@ assign [instance="telegram-desktop"] comm # # Media keys and screenshots # - + bindsym XF86PowerOff exec systemctl suspend bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle @@ -289,8 +305,13 @@ bindsym $mod+r mode "resize" # ### Input # +input 1203:12325:CHICONY_USB_NetVista_Full_Width_Keyboard { + xkb_numlock enabled + xkb_options caps:escape +} + focus_follows_mouse yes -focus_wrapping false +focus_wrapping yes popup_during_fullscreen leave_fullscreen focus_on_window_activation focus @@ -305,7 +326,7 @@ gaps outer 4 # Title Bar # titlebar_padding 1 -font "Cantarell 8" +font "Cantarell 10" # # Font # @@ -319,9 +340,20 @@ default_floating_border pixel 2 # Status Bar: # bar { - position top +# output DP-1 swaybar_command waybar } + +# bar { +# position top +# output DVI-D-1 +# status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done +# } + +# +# Window settings +# +for_window [class="Brave-browser"] inhibit_idle focus; layout tabbed # # Floating windows # @@ -334,6 +366,12 @@ for_window [title="ImageMagick.*"] { border normal $border title_format " %title" } +for_window [title="nmtui"] { + border normal $border + resize set width 882 + resize set height 600 + floating enable +} for_window [app_id="nm-connection-editor"] { floating enable resize set width 882px diff --git a/.config/waybar/config b/.config/waybar/config index b70902b..0608078 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,28 +1,38 @@ +[{ + "name": "portrait", + "layer": "top", + "height": 16, + "width": 1050, + "output": "DVI-D-1", + "modules-left": ["sway/workspaces", "sway/mode"], + "modules-center": ["sway/window"], + "modules-right": ["clock#date", "clock#time"], + + // Modules for portrait bar + + "clock#time": { + "interval": 1, + "format": "{:%H:%M:%S}", + "tooltip": false + }, + "clock#date": { + "interval": 10, + "format": "{:%a %b %e %Y}", + "tooltip": false + } +}, { + "output": "DP-1", "layer": "top", // Waybar at top layer "position": "top", // Waybar position (top|bottom|left|right) "height": 16, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width + "width": 1920, // Waybar width // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": ["sway/window"], - "modules-right": ["tray", "pulseaudio", "network", "cpu", "memory", "temperature", "clock#date", "clock#time"], + "modules-right": ["tray", "pulseaudio", "idle_inhibitor", "network", "cpu", "memory", "temperature", "clock#date", "clock#time"], + // Modules configuration -// "sway/workspaces": { -// "disable-scroll": true, -// "all-outputs": true, -// "format": "{name} {icon}", -// "format-icons": { -// "1": "", -// "2": "", -// "3": "", -// "4": "", -// "5": "", -// "urgent": "", -// "focused": "", -// "default": "" -// } -// }, "sway/mode": { "format": "{}" }, @@ -60,18 +70,13 @@ } }, "tray": { - // "icon-size": 21, + "icon-size": 16, "spacing": 10 }, - //"clock": { - // // "timezone": "America/New_York", - // "tooltip-format": "{:%Y %B}\n{calendar}", - // "format-alt": "{:%Y-%m-%d}" - //}, "clock#time": { - "interval": 1, - "format": "{:%H:%M:%S}", - "tooltip": false + "interval": 1, + "format": "{:%H:%M:%S}", + "tooltip": false }, "clock#date": { "interval": 10, @@ -79,11 +84,11 @@ "tooltip": false }, "cpu": { - "format": " {usage}%", + "format": "{usage:3}%", "tooltip": false }, "memory": { - "format": "{}%", + "format": "{:2}%", "on-click": "exec kitty htop" }, "temperature": { @@ -97,7 +102,6 @@ }, "backlight": { // "device": "acpi_video1", - "interval": 5, "format": "{icon} {percent}%", "format-icons": ["", ""] }, @@ -121,15 +125,16 @@ "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": " {essid} ({signalStrength}%)", - //"format-ethernet": "{ifname}: {ipaddr}/{cidr} ", - "format-ethernet": " {ipaddr}/{cidr}", + "format-ethernet": " {ifname} ▲{bandwidthUpBits:8} ▼{bandwidthDownBits:8}", "format-linked": " {ifname} (No IP)", "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}" + "format-alt": "{ipaddr}/{cidr}", + "on-click-right": "exec gnome-terminal nmtui", + "interval": 1 }, "pulseaudio": { // "scroll-step": 1, // %, can be a float - "format": "{icon} {volume}% {format_source}", + "format": "{icon}{volume:3}% {format_source}", "format-bluetooth": "{volume}% {icon} {format_source}", "format-bluetooth-muted": " {icon} {format_source}", "format-muted": " {format_source}", @@ -158,4 +163,4 @@ "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name } -} +}] diff --git a/.config/waybar/style.css b/.config/waybar/style.css index cd0e06c..4c8f543 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -2,8 +2,9 @@ border: none; border-radius: 0; /* `otf-font-awesome` is required to be installed for icons */ - font-family: Cantarell;/*Roboto, Helvetica, Arial, sans-serif; */ + font-family: 'Anka/Coder';/*Roboto, Helvetica, Arial, sans-serif; */ font-size: 14px; + font-weight: bold; min-height: 0; } @@ -20,26 +21,8 @@ window#waybar.hidden { opacity: 0.2; } -/* -window#waybar.empty { - background-color: transparent; -} -window#waybar.solo { - background-color: #FFFFFF; -} -*/ - -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} - #workspaces button { - padding: 0 5px; + padding: 2px 5px 0; background-color: transparent; color: #ffffff; /* border-bottom: 3px solid transparent; */ @@ -55,7 +38,7 @@ window#waybar.chromium { #workspaces button.focused { background-color: #64727D; /* border-bottom: 3px solid #ffffff; */ - padding: 0 2px; + padding: 2px 5px 0; } #workspaces button.urgent { @@ -63,6 +46,7 @@ window#waybar.chromium { } #mode { + padding: 0 5px 0; background-color: #64727D; /* border-bottom: 3px solid #ffffff; */ } @@ -79,13 +63,14 @@ window#waybar.chromium { #tray, #idle_inhibitor, #mpd { - padding: 0 10px; - margin: 0 4px; + padding: 0 10px 0; + margin: 0 4px 0; color: #ffffff; } #clock { - padding: 0 0px; + + padding: 0 0 0; background-color: transparent; } @@ -94,7 +79,7 @@ window#waybar.chromium { min-width: 60px; } #battery { - padding: 1px; + padding: 0 1px 0; background-color: transparent; color: #ffffff; } @@ -126,23 +111,24 @@ label:focus { } #cpu { - padding: 1px; + padding: 0 1px 0; /* background-color: #2ecc71; */ color: #fff; } #memory { - padding: 1px; + padding: 0 1px 0; /* background-color: #9b59b6; */ } #backlight { - padding: 1px; + padding: 0 1px 0; /* background-color: #90b1b1; */ } #network { - padding: 1px; + min-width: 250px; + padding: 0 1px 0; /* background-color: #2980b9; */ } @@ -151,7 +137,7 @@ label:focus { } #pulseaudio { - padding: 1px; + padding: 0 1px 0; /* background-color: #f1c40f; */ /* color: #000000; */ } @@ -162,7 +148,7 @@ label:focus { } #custom-media { - padding: 1px; + padding: 0 1px 0; /* background-color: #66cc99; */ /* color: #2a5c45; */ /* min-width: 100px; */ @@ -177,7 +163,7 @@ label:focus { } #temperature { - padding: 1px; + padding: 0 1px 0; /* background-color: #f0932b; */ } @@ -186,12 +172,12 @@ label:focus { } #tray { - padding: 1px; + padding: 0 1px 0; /* background-color: #2980b9; */ } #idle_inhibitor { - padding: 1px; + padding: 0 1px 0; /* background-color: #2d3436; */ } @@ -201,7 +187,7 @@ label:focus { } #mpd { - padding: 1px; + padding: 0 1px 0; /* background-color: #66cc99; */ /* color: #2a5c45; */ }