make waybar works better and add tilix to replace terminator
This commit is contained in:
parent
57dd7694ab
commit
10d900a9e4
7 changed files with 138 additions and 101 deletions
|
@ -6,7 +6,7 @@
|
|||
},
|
||||
{
|
||||
"name": "Logout",
|
||||
"exec": "wayland-logout",
|
||||
"exec": "loginctl terminate-user guoyi",
|
||||
"icon": "/home/guoyi/.config/nwg-launchers/nwgbar/images/system-log-out.svg"
|
||||
},
|
||||
{
|
||||
|
|
4
dot_config/tilix/sh
Normal file
4
dot_config/tilix/sh
Normal file
|
@ -0,0 +1,4 @@
|
|||
# export
|
||||
dconf dump /com/gexperts/Tilix/ > tilix.dconf
|
||||
# import
|
||||
dconf load /com/gexperts/Tilix/ < tilix.dconf
|
45
dot_config/tilix/tilix.dconf
Normal file
45
dot_config/tilix/tilix.dconf
Normal file
|
@ -0,0 +1,45 @@
|
|||
[/]
|
||||
close-with-last-session=true
|
||||
prompt-on-close-process=false
|
||||
quake-specific-monitor=0
|
||||
terminal-title-style='none'
|
||||
theme-variant='dark'
|
||||
unsafe-paste-alert=false
|
||||
warn-vte-config-issue=false
|
||||
window-style='normal'
|
||||
|
||||
[keybindings]
|
||||
session-add-auto='disabled'
|
||||
session-add-down='<Primary><Shift>h'
|
||||
session-add-right='<Primary><Shift>v'
|
||||
session-close='<Primary><Shift>q'
|
||||
session-name='disabled'
|
||||
terminal-close='<Primary><Shift>w'
|
||||
terminal-copy='<Primary>c'
|
||||
terminal-find='<Primary>f'
|
||||
terminal-find-previous='disabled'
|
||||
terminal-page-down='disabled'
|
||||
terminal-page-up='disabled'
|
||||
terminal-paste='<Primary>v'
|
||||
terminal-paste-primary='disabled'
|
||||
terminal-select-all='<Primary>a'
|
||||
terminal-zoom-in='<Primary>equal'
|
||||
terminal-zoom-out='<Primary>minus'
|
||||
|
||||
[profiles/2b7c4080-0ddd-46c5-8f23-563fd3ba789d]
|
||||
background-color='#282828282828'
|
||||
background-transparency-percent=14
|
||||
badge-text='${iconTitle}'
|
||||
cursor-blink-mode='off'
|
||||
cursor-shape='ibeam'
|
||||
exit-action='hold'
|
||||
font='JetBrains Mono 12'
|
||||
foreground-color='#EBEBDBDBB2B2'
|
||||
login-shell=true
|
||||
palette=['#4444A4A4E8E8', '#F6F661615151', '#D7D7F1F10303', '#F9F9EFEF6B6B', '#26268A8AD2D2', '#D3D336368181', '#2929A1A19898', '#F6F6F5F5F4F4', '#00002A2A3636', '#CBCB4B4B1616', '#58586E6E7575', '#65657A7A8383', '#838394949696', '#6C6C7171C4C4', '#9393A1A1A1A1', '#FFFFFFFFFFFF']
|
||||
scrollback-unlimited=true
|
||||
terminal-bell='none'
|
||||
use-custom-command=false
|
||||
use-system-font=false
|
||||
use-theme-colors=false
|
||||
visible-name='默认'
|
|
@ -2,35 +2,41 @@
|
|||
"layer": "top",
|
||||
"position": "top",
|
||||
"height": 17,
|
||||
"spacing": 4,
|
||||
"margin-top": 3,
|
||||
"spacing": 0,
|
||||
"margin-top": 5,
|
||||
"margin-bottom": 3,
|
||||
|
||||
// Choose the order of the modules
|
||||
|
||||
"modules-left":[ "idle_inhibitor", "cpu", "memory", "temperature"],
|
||||
"modules-center": [ "custom/launcher", "wlr/taskbar", "custom/update"],
|
||||
"modules-left":[ "custom/launcher", "cpu", "memory", "custom/update"],
|
||||
"modules-center": [ "wlr/taskbar"],
|
||||
"modules-right":[ "battery", "pulseaudio", "network", "bluetooth", "clock", "tray", "custom/power"],
|
||||
// Modules configuration
|
||||
|
||||
// Modules configuration
|
||||
"wlr/taskbar": {
|
||||
"format": "{icon}",
|
||||
"icon-size": 23,
|
||||
"icon-theme": ["hicolor", "Tela"],
|
||||
"icon-size": 25,
|
||||
"icon-theme": "Tela",
|
||||
"tooltip-format": "{title}",
|
||||
"on-click": "minimize",
|
||||
"on-click-middle": "close",
|
||||
"on-click-right": "activate"
|
||||
},
|
||||
"idle_inhibitor": {
|
||||
"format": "{icon}",
|
||||
"format-icons": {
|
||||
"activated": "",
|
||||
"deactivated": ""
|
||||
"on-click-right": "activate",
|
||||
"app_ids-mapping": {
|
||||
"NewsFlashGTK": "com.gitlab.newsflash",
|
||||
"blueberry.py": "blueberry",
|
||||
"au-org-ala-delta-editor-DeltaEditor": "delta",
|
||||
"evince": "org.gnome.Evince",
|
||||
"org.jabref.gui.JabRefMain": "jabref",
|
||||
"FortiClient": "forticlient",
|
||||
"Mega": "mega",
|
||||
"com-ggvaidya-TaxonDNA-SequenceMatrix-SequenceMatrix": "java",
|
||||
"tpsdig2.exe": "tpsDig",
|
||||
"tpsutil.exe": "tpsUtil",
|
||||
"winclada.exe": "winclada",
|
||||
"wpsoffice": "wps-office2019-wpsmain"
|
||||
}
|
||||
},
|
||||
"tray": {
|
||||
"icon-size": 20,
|
||||
"icon-size": 22,
|
||||
"spacing": 10
|
||||
},
|
||||
"clock": {
|
||||
|
@ -39,25 +45,17 @@
|
|||
"format": "{:%Y-%m-%d %H:%M}"
|
||||
},
|
||||
"cpu": {
|
||||
"format": "{usage}% ",
|
||||
"format": "{usage}% CPU",
|
||||
"tooltip": false,
|
||||
"on-click": "tilix -e 'htop'"
|
||||
},
|
||||
"memory": {
|
||||
"format": "{}% ",
|
||||
"format": "{}% RAM",
|
||||
"on-click": "tilix -e 'htop'"
|
||||
},
|
||||
"temperature": {
|
||||
// "thermal-zone": 2,
|
||||
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
||||
"critical-threshold": 80,
|
||||
// "format-critical": "{temperatureC}°C {icon}",
|
||||
"format": "{temperatureC}°C {icon}",
|
||||
"format-icons": ["", "", ""]
|
||||
},
|
||||
"battery": {
|
||||
"states": {
|
||||
// "good": 95,
|
||||
"good": 95,
|
||||
"warning": 30,
|
||||
"critical": 15
|
||||
},
|
||||
|
@ -69,12 +67,12 @@
|
|||
},
|
||||
"network": {
|
||||
// "interface": "wlp2*", // (Optional) To force the use of this interface
|
||||
"format-wifi": "{essid} ({signalStrength}%) ",
|
||||
"format-wifi": "{essid} ",
|
||||
"format-ethernet": "Connected ",
|
||||
"tooltip-format": "{ifname} via {gwaddr} ",
|
||||
// "tooltip-format": "{ifname} via {gwaddr} ",
|
||||
"format-linked": "{ifname} (No IP) ",
|
||||
"format-disconnected": "Disconnected ⚠",
|
||||
"format-alt": "{ifname}: {ipaddr}/{cidr}",
|
||||
// "format-alt": "{ifname}: {ipaddr}/{cidr}",
|
||||
"on-click": "tilix -e 'nmtui'"
|
||||
|
||||
},
|
||||
|
@ -103,13 +101,17 @@
|
|||
"on-click": "pavucontrol"
|
||||
},
|
||||
"custom/launcher":{
|
||||
"format": "",
|
||||
"format": "",
|
||||
"on-click": "nwggrid",
|
||||
"on-click-right": "killall nwggrid"
|
||||
},
|
||||
"custom/update":{
|
||||
"format": "",
|
||||
"on-click": "tilix -e 'sudo pacman -Syu'"
|
||||
"format": "{} ",
|
||||
"interval": 3600,
|
||||
"exec": "checkupdates | wc -l",
|
||||
"exec-if": "exit 0",
|
||||
"on-click": "tilix -e 'sudo pacman -Syu'; pkill -SIGRTMIN+8 waybar",
|
||||
"signal": 8
|
||||
},
|
||||
"custom/power":{
|
||||
"format": "⏻",
|
||||
|
|
|
@ -2,28 +2,27 @@
|
|||
border: none;
|
||||
border-radius: 0px;
|
||||
/* `otf-font-awesome` is required to be installed for icons */
|
||||
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||
font-family: JetBrains Mono, Roboto, Helvetica, Arial, sans-serif;
|
||||
font-size: 13px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: transparent;
|
||||
color: white;
|
||||
background-color: black;
|
||||
/* color: white;*/
|
||||
transition-property: background-color;
|
||||
transition-duration: .5s;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
window#waybar.hidden {
|
||||
opacity: 0.2;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
|
||||
#workspaces button {
|
||||
background: #f9f06b;
|
||||
color: white;
|
||||
border-radius: 20px;
|
||||
|
||||
}
|
||||
|
||||
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
||||
|
@ -71,7 +70,6 @@ window#waybar.hidden {
|
|||
#taskbar,
|
||||
#tray,
|
||||
#mode,
|
||||
#idle_inhibitor,
|
||||
#bluetoth {
|
||||
padding: 0 10px;
|
||||
color: black;
|
||||
|
@ -79,7 +77,7 @@ window#waybar.hidden {
|
|||
|
||||
#window,
|
||||
#workspaces {
|
||||
margin: 0px 4px;
|
||||
margin: 0px 0px;
|
||||
}
|
||||
|
||||
/* If workspaces is the leftmost module, omit left margin */
|
||||
|
@ -93,33 +91,30 @@ window#waybar.hidden {
|
|||
}
|
||||
|
||||
#clock {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
border-radius: 0px 20px 20px 0px;
|
||||
margin-right: 4px;
|
||||
|
||||
}
|
||||
|
||||
#bluetooth {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#battery {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
border-radius: 20px 0px 0px 20px;
|
||||
margin-left: 4px;
|
||||
}
|
||||
|
||||
#battery.charging, #battery.plugged {
|
||||
color: white;
|
||||
background-color: #268bd2;
|
||||
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
|
@ -130,7 +125,7 @@ window#waybar.hidden {
|
|||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
|
@ -144,84 +139,67 @@ label:focus {
|
|||
}
|
||||
|
||||
#cpu {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#memory {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#disk {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#network {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#custom-update{
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
font-size: 18px;
|
||||
border-radius: 20px;
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
#custom-launcher{
|
||||
background-color: #268bd2;
|
||||
color: white;
|
||||
font-size: 25px;
|
||||
border-radius: 20px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
#taskbar {
|
||||
background-color: #f9f06b;
|
||||
border-radius: 20px;
|
||||
|
||||
}
|
||||
|
||||
#temperature {
|
||||
background-color: #268bd2;
|
||||
color: white;
|
||||
border-radius: 0px 20px 20px 0px;
|
||||
}
|
||||
|
||||
#custom-launcher{
|
||||
|
||||
color: white;
|
||||
font-size: 25px;
|
||||
border-radius: 20px 0px 0px 20px;;
|
||||
}
|
||||
|
||||
#taskbar {
|
||||
|
||||
border-radius: 20px 20px 20px 20px;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: #268bd2;
|
||||
|
||||
color: white;
|
||||
}
|
||||
|
||||
#idle_inhibitor {
|
||||
background-color: #268bd2;
|
||||
color: white;
|
||||
border-radius: 20px 0px 0px 20px;
|
||||
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
background-color: #268bd2;
|
||||
color: white;
|
||||
border-radius: 20px 0px 0px 20px;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ output = eDP-1
|
|||
mode = 2400x1350@60000
|
||||
position = 0,0
|
||||
transform = normal
|
||||
scale = 1.000000
|
||||
scale = 1.00000
|
||||
#
|
||||
# You can get the names of your outputs with wlr-randr.
|
||||
# https://github.com/emersion/wlr-randr
|
||||
|
@ -90,7 +90,7 @@ vwidth = 3
|
|||
vheight = 3
|
||||
|
||||
# Prefer client-side decoration or server-side decoration
|
||||
preferred_decoration_mode = client
|
||||
preferred_decoration_mode = server
|
||||
|
||||
# Mouse bindings ───────────────────────────────────────────────────────────────
|
||||
|
||||
|
@ -138,9 +138,10 @@ xdg = sleep 1 && (XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=sway /usr/lib/xdg
|
|||
# https://github.com/WayfireWM/wf-shell
|
||||
#
|
||||
# These are started by the autostart_wf_shell option above.
|
||||
background = wf-background
|
||||
# background = swaybg -i $HOME/.config/swaylock/bg.png
|
||||
panel = wf-panel
|
||||
# background = wf-background
|
||||
background = swaybg -i $HOME/.config/swaylock/bg.png
|
||||
# panel = wf-panel
|
||||
bar = waybar
|
||||
# dock = wf-dock
|
||||
|
||||
# Output configuration
|
||||
|
@ -167,7 +168,7 @@ keyring = gnome-keyring
|
|||
# Idle configuration
|
||||
# https://github.com/swaywm/swayidle
|
||||
# https://github.com/swaywm/swaylock
|
||||
idle = swayidle before-sleep swaylock
|
||||
# idle = swayidle before-sleep swaylock
|
||||
|
||||
# XDG desktop portal
|
||||
# Needed by some GTK applications
|
||||
|
@ -354,6 +355,8 @@ duration = 300
|
|||
|
||||
[decoration]
|
||||
title_height = 0
|
||||
title_size = 0
|
||||
ignore_views = all
|
||||
#broder_size = 1
|
||||
#active_color = \#f9f06bAA
|
||||
#inactive_color = \#268bd2AA
|
||||
|
|
|
@ -27,3 +27,8 @@ alias malag="ssh guoyi@malacology.net"
|
|||
alias malar="ssh root@malacology.net"
|
||||
alias biob="ssh bio@bioarchlinux.org"
|
||||
alias bior="ssh root@bioarchlinux.org"
|
||||
|
||||
# tilix
|
||||
if [[ $TILIX_ID ]]; then
|
||||
source /etc/profile.d/vte.sh
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue