Merge branch 'anor-londo'

merge desktop config into master
This commit is contained in:
dalahast 2020-05-26 19:11:16 +02:00
commit b5b5c9b056
3 changed files with 158 additions and 214 deletions

@ -10,13 +10,15 @@ set {
$up k $up k
$right l $right l
$term kitty $term kitty
$menu rofi -show drun -icon-theme "Papirus-Dark" -show-icons | xargs swaymsg exec -- #$menu rofi -show drun -icon-theme "Papirus-Dark" -show-icons | xargs swaymsg exec --
$windowmenu rofi -show window -icon-theme "Papirus-Dark" -show-icons $menu wofi --show drun | xargs swaymsg exec --
$runmenu wofi --show run | xargs swaymsg exec --
$gnome-schema org.gnome.desktop.interface $gnome-schema org.gnome.desktop.interface
$gtk_theme "Adapta-Nokto-Eta" $gtk_theme "Adapta-Nokto-Eta"
$icon_theme "Papirus-Dark" $icon_theme "Papirus-Dark"
$bg ~/Pictures/drain.png $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 # Heads
# For desktop # For desktop
$primary DP-1 $primary DP-1
@ -31,14 +33,20 @@ set {
### Autoruns ### Autoruns
# #
exec_always --no-startup-id { exec_always --no-startup-id {
pkill flashfocus
gsettings set $gnome-schema gtk-theme $gtk_theme gsettings set $gnome-schema gtk-theme $gtk_theme
gsettings set $gnome-schema icon-theme $icon_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 swaymsg focus output $primary
swayidle -w timeout 1200 "$lockscreen"\ evolution
telegram-desktop
swayidle -w timeout 1200 exec $lockscreen\
timeout 1201 'swaymsg "output * dpms off"'\ timeout 1201 'swaymsg "output * dpms off"'\
resume 'swaymsg "output * dpms on"'\ 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 # Set desktop background for all heads
output * bg $bg fill output * bg $bg fill
# #
### Key bindings ### Key bindings
# #
@ -69,7 +79,7 @@ output * bg $bg fill
# Start your launcher # Start your launcher
bindsym $mod+d exec $menu 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. # Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod. # 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' 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 #Lock the session
bindsym Control+Shift+l $lockscreen bindsym Control+Shift+l exec $lockscreen
# #
# Program shortcuts # Program shortcuts
@ -108,6 +118,12 @@ bindsym {
bindsym $mod+Up focus up bindsym $mod+Up focus up
bindsym $mod+Right focus right 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
bindsym $mod+Shift+comma focus output left
bindsym $mod+Shift+period focus output right
# Move the focused window with the same, but add Shift # Move the focused window with the same, but add Shift
bindsym $mod+Shift+$left move left bindsym $mod+Shift+$left move left
bindsym $mod+Shift+$down move down bindsym $mod+Shift+$down move down
@ -159,6 +175,7 @@ bindsym {
# bindsym $mod+Control+0 workspace P10 # bindsym $mod+Control+0 workspace P10
bindsym $mod+t workspace comm bindsym $mod+t workspace comm
bindsym $mod+m workspace M
# Move focused container to workspace # Move focused container to workspace
bindsym $mod+Shift+1 move container to workspace 1 bindsym $mod+Shift+1 move container to workspace 1
@ -171,28 +188,29 @@ bindsym {
bindsym $mod+Shift+8 move container to workspace 8 bindsym $mod+Shift+8 move container to workspace 8
bindsym $mod+Shift+9 move container to workspace 9 bindsym $mod+Shift+9 move container to workspace 9
bindsym $mod+Shift+0 move container to workspace 10 bindsym $mod+Shift+0 move container to workspace 10
bindsym $mod+Shift+Control+1 move container to workspace P1 bindsym $mod+Shift+Control+1 move container to workspace 1P
bindsym $mod+Shift+Control+2 move container to workspace P2 bindsym $mod+Shift+Control+2 move container to workspace 2P
bindsym $mod+Shift+Control+3 move container to workspace P3 bindsym $mod+Shift+Control+3 move container to workspace 3P
bindsym $mod+Shift+Control+4 move container to workspace P4 bindsym $mod+Shift+Control+4 move container to workspace 4P
bindsym $mod+Shift+Control+5 move container to workspace P5 bindsym $mod+Shift+Control+5 move container to workspace 5P
bindsym $mod+Shift+Control+6 move container to workspace P6 bindsym $mod+Shift+Control+6 move container to workspace 6P
bindsym $mod+Shift+Control+7 move container to workspace P7 bindsym $mod+Shift+Control+7 move container to workspace 7P
bindsym $mod+Shift+Control+8 move container to workspace P8 bindsym $mod+Shift+Control+8 move container to workspace 8P
bindsym $mod+Shift+Control+9 move container to workspace P9 bindsym $mod+Shift+Control+9 move container to workspace 9P
bindsym $mod+Shift+Control+0 move container to workspace P10 bindsym $mod+Shift+Control+0 move container to workspace 10P
# Workspace-monitor assignments # Workspace-monitor assignments
workspace P1 output $portrait workspace 1P output $portrait
workspace P2 output $portrait workspace 2P output $portrait
workspace P3 output $portrait workspace 3P output $portrait
workspace P4 output $portrait workspace 4P output $portrait
workspace P5 output $portrait workspace 5P output $portrait
workspace P6 output $portrait workspace 6P output $portrait
workspace P7 output $portrait workspace 7P output $portrait
workspace P8 output $portrait workspace 8P output $portrait
workspace P9 output $portrait workspace 9P output $portrait
workspace P10 output $portrait workspace 10P output $portrait
workspace comm output $portrait workspace comm output $portrait
workspace M output $portrait
# For single head devices # For single head devices
#workspace comm output $primary #workspace comm output $primary
workspace 1 output $primary workspace 1 output $primary
@ -239,7 +257,7 @@ assign [instance="telegram-desktop"] comm
# #
# Media keys and screenshots # Media keys and screenshots
# #
bindsym XF86PowerOff exec systemctl suspend
bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
bindsym XF86AudioLowerVolume 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 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
@ -289,8 +307,13 @@ bindsym $mod+r mode "resize"
# #
### Input ### Input
# #
input 1203:12325:CHICONY_USB_NetVista_Full_Width_Keyboard {
xkb_numlock enabled
xkb_options caps:escape
}
focus_follows_mouse yes focus_follows_mouse yes
focus_wrapping false focus_wrapping yes
popup_during_fullscreen leave_fullscreen popup_during_fullscreen leave_fullscreen
focus_on_window_activation focus focus_on_window_activation focus
@ -305,7 +328,7 @@ gaps outer 4
# Title Bar # Title Bar
# #
titlebar_padding 1 titlebar_padding 1
font "Cantarell 8" font "Cantarell 10"
# #
# Font # Font
# #
@ -319,9 +342,20 @@ default_floating_border pixel 2
# Status Bar: # Status Bar:
# #
bar { bar {
position top # output DP-1
swaybar_command waybar 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 # Floating windows
# #
@ -334,6 +368,12 @@ for_window [title="ImageMagick.*"] {
border normal $border border normal $border
title_format " %title" 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"] { for_window [app_id="nm-connection-editor"] {
floating enable floating enable
resize set width 882px resize set width 882px

@ -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 "layer": "top", // Waybar at top layer
"position": "top", // Waybar position (top|bottom|left|right) "position": "top", // Waybar position (top|bottom|left|right)
"height": 16, // Waybar height (to be removed for auto height) "height": 16, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width "width": 1920, // Waybar width
// Choose the order of the modules // Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode"], "modules-left": ["sway/workspaces", "sway/mode"],
"modules-center": ["sway/window"], "modules-center": ["sway/window"],
"modules-right": ["tray", "pulseaudio", "network", "cpu", "memory", "temperature", "clock#date", "clock#time"], "modules-right": ["tray", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock#date", "clock#time"],
// Modules configuration // 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": { "sway/mode": {
"format": "<span style=\"italic\">{}</span>" "format": "<span style=\"italic\">{}</span>"
}, },
@ -60,72 +70,83 @@
} }
}, },
"tray": { "tray": {
// "icon-size": 21, "icon-size": 16,
"spacing": 10 "spacing": 10
}, },
//"clock": {
// // "timezone": "America/New_York",
// "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
// "format-alt": "{:%Y-%m-%d}"
//},
"clock#time": { "clock#time": {
"interval": 1, "interval": 1,
"format": "{:%H:%M:%S}", "format": "{:%H:%M:%S}",
"tooltip": false "tooltip": false
}, },
"clock#date": { "clock#date": {
"interval": 10, "interval": 10,
"format": "{:%a %b %e %Y}", "format": "{:%a %b %e}",
"tooltip": false "tooltip": true,
"tooltip-format": "{:%a %b %e %Y}"
}, },
"cpu": { "cpu": {
"format": " {usage}%", "format": " {usage}%",
"tooltip": false "tooltip": true,
"interval": 2
}, },
"memory": { "memory": {
"format": "{}%", "format": "{:2}%",
"on-click": "exec kitty htop" "on-click": "exec kitty htop"
}, },
"temperature": { "temperature": {
// "thermal-zone": 2, // "thermal-zone": 2,
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80, "critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{icon} {temperatureC}°C", "format": "{icon} {temperatureC}°C",
"format-icons": ["", "", ""], "format-icons": ["", "", ""],
"on-click": "exec kitty watch -n 5 sensors" "on-click": "exec kitty watch -n 5 sensors",
"tooltip": true
}, },
"backlight": { "backlight": {
// "device": "acpi_video1", // "device": "acpi_video1",
"interval": 5, "format": "{icon}{percent}",
"format": "{icon} {percent}%", "format-icons": [""]
"format-icons": ["", ""]
}, },
"battery": { "battery": {
"bat": "BAT0",
"states": { "states": {
// "good": 95, "good": 95,
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
"format": "{capacity}% {icon}", "format": "{icon}{capacity}%",
"format-charging": " {capacity}%", "format-charging": "{capacity:3}%",
"format-plugged": " {capacity}%", "format-plugged": "{capacity:3}%",
"format-alt": "{icon}{time}", "format-alt": "{icon}{time}",
// "format-good": "", // An empty format will hide the module "format-good": "", // An empty format will hide the module
// "format-full": "", "format-full": "",
"format-icons": ["", "", "", "", ""] "format-icons": ["", "", "", "", ""]
}, },
"battery#bat2": { "battery#bat2": {
"bat": "BAT2" "bat": "BAT1",
"states": {
"good": 95,
"warning": 30,
"critical": 15
},
"format": "{icon}{capacity}%",
"format-charging": "{capacity:3}%",
"format-plugged": "{capacity:3}%",
"format-alt": "{icon}{time}",
"format-good": "", // An empty format will hide the module
"format-full": "",
"format-icons": ["", "", "", "", ""]
}, },
"network": { "network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface // "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": " {essid} ({signalStrength}%)", "format-wifi": " {essid} ({signalStrength}%)",
//"format-ethernet": "{ifname}: {ipaddr}/{cidr} ", "format-ethernet": "",
"format-ethernet": " {ipaddr}/{cidr}",
"format-linked": " {ifname} (No IP)", "format-linked": " {ifname} (No IP)",
"format-disconnected": "Disconnected ⚠", "format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}" "format-alt": "{ifname} {ipaddr}/{cidr} ▲{bandwidthUpBits}▼{bandwidthDownBits}",
"on-click-right": "exec kitty nmtui",
"interval": 1,
"tooltip-format": "{ifname} {ipaddr}/{cidr} ▲{bandwidthUpBits}▼{bandwidthDownBits}"
}, },
"pulseaudio": { "pulseaudio": {
// "scroll-step": 1, // %, can be a float // "scroll-step": 1, // %, can be a float
@ -158,4 +179,4 @@
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder "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 // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
} }
} }]

@ -1,17 +1,16 @@
* { * {
border: none;
border-radius: 0; border-radius: 0;
/* `otf-font-awesome` is required to be installed for icons */ /* `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-size: 14px;
font-weight: bold;
min-height: 0; min-height: 0;
} }
window#waybar { window#waybar {
background-color: transparent; background-color: transparent;
/*background-color: rgba(43, 48, 59, 0.5);*/ /* background-color: #002b36; */
/* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */ color: #a6baba;
color: #ffffff;
transition-property: background-color; transition-property: background-color;
transition-duration: .5s; transition-duration: .5s;
} }
@ -20,42 +19,23 @@ window#waybar.hidden {
opacity: 0.2; 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 { #workspaces button {
padding: 0 5px; padding: 1px 5px 0px;
background-color: transparent; background-color: transparent;
color: #ffffff; color: #a6baba;
/* border-bottom: 3px solid transparent; */ border-top: 2px solid transparent;
} }
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
#workspaces button:hover { #workspaces button:hover {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
box-shadow: inherit; box-shadow: inherit;
/* border-bottom: 3px solid #ffffff; */
} }
#workspaces button.focused { #workspaces button.focused {
background-color: #64727D; background-color: #073642; /*#64727D;*/
/* border-bottom: 3px solid #ffffff; */ border-top: 2px solid #839496;
padding: 0 2px; padding: 1px 5px 0px;
} }
#workspaces button.urgent { #workspaces button.urgent {
@ -63,8 +43,8 @@ window#waybar.chromium {
} }
#mode { #mode {
background-color: #64727D; padding: 1px 5px 0px;
/* border-bottom: 3px solid #ffffff; */ background-color: #073642;
} }
#clock, #clock,
@ -75,33 +55,25 @@ window#waybar.chromium {
#backlight, #backlight,
#network, #network,
#pulseaudio, #pulseaudio,
#custom-media,
#tray, #tray,
#idle_inhibitor, #idle_inhibitor,
#mpd { #mpd {
padding: 0 10px; padding: 0 1px 0;
margin: 0 4px; margin: 0 4px 0;
color: #ffffff; color: #a6baba;
background-color: transparent;
} }
#clock { #clock {
padding: 0 0px; padding: 0 0 0;
background-color: transparent;
} }
#clock.time { #clock.time {
background-color: transparent;
min-width: 60px; min-width: 60px;
} }
#battery {
padding: 1px;
background-color: transparent;
color: #ffffff;
}
#battery.charging { #battery.charging {
color: #26A65B; color: #26A65B;
/* background-color: #26A65B; */
} }
@keyframes blink { @keyframes blink {
@ -121,99 +93,10 @@ window#waybar.chromium {
animation-direction: alternate; animation-direction: alternate;
} }
label:focus {
background-color: #000000;
}
#cpu {
padding: 1px;
/* background-color: #2ecc71; */
color: #fff;
}
#memory {
padding: 1px;
/* background-color: #9b59b6; */
}
#backlight {
padding: 1px;
/* background-color: #90b1b1; */
}
#network {
padding: 1px;
/* background-color: #2980b9; */
}
#network.disconnected { #network.disconnected {
/* background-color: #f53c3c; */ color: #f53c3c;
}
#pulseaudio {
padding: 1px;
/* background-color: #f1c40f; */
/* color: #000000; */
}
#pulseaudio.muted {
/* background-color: #90b1b1; */
/* color: #2a5c45; */
}
#custom-media {
padding: 1px;
/* background-color: #66cc99; */
/* color: #2a5c45; */
/* min-width: 100px; */
}
#custom-media.custom-spotify {
background-color: #66cc99;
}
#custom-media.custom-vlc {
background-color: #ffa000;
}
#temperature {
padding: 1px;
/* background-color: #f0932b; */
} }
#temperature.critical { #temperature.critical {
background-color: #eb4d4b; background-color: #eb4d4b;
} }
#tray {
padding: 1px;
/* background-color: #2980b9; */
}
#idle_inhibitor {
padding: 1px;
/* background-color: #2d3436; */
}
#idle_inhibitor.activated {
/* background-color: #ecf0f1; */
/* color: #2d3436; */
}
#mpd {
padding: 1px;
/* background-color: #66cc99; */
/* color: #2a5c45; */
}
#mpd.disconnected {
/* background-color: #f53c3c; */
}
#mpd.stopped {
/* background-color: #90b1b1; */
}
#mpd.paused {
/* background-color: #51a37a; */
}