malacology/dotconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make waybar works better and add tilix to replace terminator

Browse source
This commit is contained in:
kuoi 2022-08-21 17:25:07 +01:00
parent 57dd7694ab
commit 10d900a9e4
7 changed files with 138 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dot_config/nwg-launchers/nwgbar/bar.json
View file

@ -6,7 +6,7 @@
}, },
{ {
"name": "Logout", "name": "Logout",
"exec": "wayland-logout", "exec": "loginctl terminate-user guoyi",
"icon": "/home/guoyi/.config/nwg-launchers/nwgbar/images/system-log-out.svg" "icon": "/home/guoyi/.config/nwg-launchers/nwgbar/images/system-log-out.svg"
}, },
{ {

4
dot_config/tilix/sh Normal file
View 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
View 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='默认'

68
dot_config/waybar/config
View file

@ -2,35 +2,41 @@
"layer": "top", "layer": "top",
"position": "top", "position": "top",
"height": 17, "height": 17,
"spacing": 4, "spacing": 0,
"margin-top": 3, "margin-top": 5,
"margin-bottom": 3, "margin-bottom": 3,
// Choose the order of the modules // Choose the order of the modules
"modules-left":[ "custom/launcher", "cpu", "memory", "custom/update"],
"modules-left":[ "idle_inhibitor", "cpu", "memory", "temperature"], "modules-center": [ "wlr/taskbar"],
"modules-center": [ "custom/launcher", "wlr/taskbar", "custom/update"],
"modules-right":[ "battery", "pulseaudio", "network", "bluetooth", "clock", "tray", "custom/power"], "modules-right":[ "battery", "pulseaudio", "network", "bluetooth", "clock", "tray", "custom/power"],
// Modules configuration
// Modules configuration
"wlr/taskbar": { "wlr/taskbar": {
"format": "{icon}", "format": "{icon}",
"icon-size": 23, "icon-size": 25,
"icon-theme": ["hicolor", "Tela"], "icon-theme": "Tela",
"tooltip-format": "{title}", "tooltip-format": "{title}",
"on-click": "minimize", "on-click": "minimize",
"on-click-middle": "close", "on-click-middle": "close",
"on-click-right": "activate" "on-click-right": "activate",
}, "app_ids-mapping": {
"idle_inhibitor": { "NewsFlashGTK": "com.gitlab.newsflash",
"format": "{icon}", "blueberry.py": "blueberry",
"format-icons": { "au-org-ala-delta-editor-DeltaEditor": "delta",
"activated": "", "evince": "org.gnome.Evince",
"deactivated": "" "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": { "tray": {
"icon-size": 20, "icon-size": 22,
"spacing": 10 "spacing": 10
}, },
"clock": { "clock": {
@ -39,25 +45,17 @@
"format": "{:%Y-%m-%d %H:%M}" "format": "{:%Y-%m-%d %H:%M}"
}, },
"cpu": { "cpu": {
"format": "{usage}% ", "format": "{usage}% CPU",
"tooltip": false, "tooltip": false,
"on-click": "tilix -e 'htop'" "on-click": "tilix -e 'htop'"
}, },
"memory": { "memory": {
"format": "{}% ", "format": "{}% RAM",
"on-click": "tilix -e 'htop'" "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": { "battery": {
"states": { "states": {
// "good": 95, "good": 95,
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
@ -69,12 +67,12 @@
}, },
"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} ",
"format-ethernet": "Connected  ", "format-ethernet": "Connected  ",
"tooltip-format": "{ifname} via {gwaddr} ", // "tooltip-format": "{ifname} via {gwaddr} ",
"format-linked": "{ifname} (No IP) ", "format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠", "format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}: {ipaddr}/{cidr}", // "format-alt": "{ifname}: {ipaddr}/{cidr}",
"on-click": "tilix -e 'nmtui'" "on-click": "tilix -e 'nmtui'"
}, },
@ -103,13 +101,17 @@
"on-click": "pavucontrol" "on-click": "pavucontrol"
}, },
"custom/launcher":{ "custom/launcher":{
"format": "", "format": "",
"on-click": "nwggrid", "on-click": "nwggrid",
"on-click-right": "killall nwggrid" "on-click-right": "killall nwggrid"
}, },
"custom/update":{ "custom/update":{
"format": "", "format": "{} ",
"on-click": "tilix -e 'sudo pacman -Syu'" "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":{ "custom/power":{
"format": "⏻", "format": "⏻",

98
dot_config/waybar/style.css
View file

@ -2,28 +2,27 @@
border: none; border: none;
border-radius: 0px; border-radius: 0px;
/* `otf-font-awesome` is required to be installed for icons */ /* `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; font-size: 13px;
min-height: 0; min-height: 0;
} }
window#waybar { window#waybar {
background-color: transparent; background-color: black;
color: white; /* color: white;*/
transition-property: background-color; transition-property: background-color;
transition-duration: .5s; transition-duration: .5s;
opacity: 0.7;
} }
window#waybar.hidden { window#waybar.hidden {
opacity: 0.2; opacity: 0.7;
} }
#workspaces button { #workspaces button {
background: #f9f06b; background: #f9f06b;
color: white; color: white;
border-radius: 20px; border-radius: 20px;
} }
/* 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 */
@ -71,7 +70,6 @@ window#waybar.hidden {
#taskbar, #taskbar,
#tray, #tray,
#mode, #mode,
#idle_inhibitor,
#bluetoth { #bluetoth {
padding: 0 10px; padding: 0 10px;
color: black; color: black;
@ -79,7 +77,7 @@ window#waybar.hidden {
#window, #window,
#workspaces { #workspaces {
margin: 0px 4px; margin: 0px 0px;
} }
/* If workspaces is the leftmost module, omit left margin */ /* If workspaces is the leftmost module, omit left margin */
@ -93,33 +91,30 @@ window#waybar.hidden {
} }
#clock { #clock {
background-color: #268bd2;
color: white; color: white;
} }
#custom-power { #custom-power {
background-color: #268bd2;
color: white; color: white;
border-radius: 0px 20px 20px 0px; border-radius: 0px 20px 20px 0px;
margin-right: 4px;
} }
#bluetooth { #bluetooth {
background-color: #268bd2;
color: white; color: white;
} }
#battery { #battery {
background-color: #268bd2;
color: white; color: white;
border-radius: 20px 0px 0px 20px; border-radius: 20px 0px 0px 20px;
margin-left: 4px;
} }
#battery.charging, #battery.plugged { #battery.charging, #battery.plugged {
color: white; color: white;
background-color: #268bd2;
} }
@keyframes blink { @keyframes blink {
@ -130,7 +125,7 @@ window#waybar.hidden {
} }
#battery.critical:not(.charging) { #battery.critical:not(.charging) {
background-color: #268bd2;
color: white; color: white;
animation-name: blink; animation-name: blink;
animation-duration: 0.5s; animation-duration: 0.5s;
@ -144,84 +139,67 @@ label:focus {
} }
#cpu { #cpu {
background-color: #268bd2;
color: white; color: white;
} }
#memory { #memory {
background-color: #268bd2;
color: white; color: white;
} }
#disk { #disk {
background-color: #268bd2;
color: white; color: white;
} }
#network { #network {
background-color: #268bd2;
color: white; color: white;
} }
#network.disconnected { #network.disconnected {
background-color: #268bd2;
color: white; color: white;
} }
#pulseaudio { #pulseaudio {
background-color: #268bd2;
color: white; color: white;
} }
#pulseaudio.muted { #pulseaudio.muted {
background-color: #268bd2;
color: white; color: white;
} }
#custom-update{ #custom-update{
background-color: #268bd2;
color: white; color: white;
font-size: 18px; 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; 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 { #tray {
background-color: #268bd2;
color: white; 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;
}

15
dot_config/wayfire.ini
View file

@ -33,7 +33,7 @@ output = eDP-1
mode = 2400x1350@60000 mode = 2400x1350@60000
position = 0,0 position = 0,0
transform = normal transform = normal
scale = 1.000000 scale = 1.00000
# #
# You can get the names of your outputs with wlr-randr. # You can get the names of your outputs with wlr-randr.
# https://github.com/emersion/wlr-randr # https://github.com/emersion/wlr-randr
@ -90,7 +90,7 @@ vwidth = 3
vheight = 3 vheight = 3
# Prefer client-side decoration or server-side decoration # Prefer client-side decoration or server-side decoration
preferred_decoration_mode = client preferred_decoration_mode = server
# Mouse bindings ─────────────────────────────────────────────────────────────── # 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 # https://github.com/WayfireWM/wf-shell
# #
# These are started by the autostart_wf_shell option above. # These are started by the autostart_wf_shell option above.
background = wf-background # background = wf-background
# background = swaybg -i $HOME/.config/swaylock/bg.png background = swaybg -i $HOME/.config/swaylock/bg.png
panel = wf-panel # panel = wf-panel
bar = waybar
# dock = wf-dock # dock = wf-dock
# Output configuration # Output configuration
@ -167,7 +168,7 @@ keyring = gnome-keyring
# Idle configuration # Idle configuration
# https://github.com/swaywm/swayidle # https://github.com/swaywm/swayidle
# https://github.com/swaywm/swaylock # https://github.com/swaywm/swaylock
idle = swayidle before-sleep swaylock # idle = swayidle before-sleep swaylock
# XDG desktop portal # XDG desktop portal
# Needed by some GTK applications # Needed by some GTK applications
@ -354,6 +355,8 @@ duration = 300
[decoration] [decoration]
title_height = 0 title_height = 0
title_size = 0
ignore_views = all
#broder_size = 1 #broder_size = 1
#active_color = \#f9f06bAA #active_color = \#f9f06bAA
#inactive_color = \#268bd2AA #inactive_color = \#268bd2AA

5
executable_dot_zshrc
View file

@ -27,3 +27,8 @@ alias malag="ssh guoyi@malacology.net"
alias malar="ssh root@malacology.net" alias malar="ssh root@malacology.net"
alias biob="ssh bio@bioarchlinux.org" alias biob="ssh bio@bioarchlinux.org"
alias bior="ssh root@bioarchlinux.org" alias bior="ssh root@bioarchlinux.org"
# tilix
if [[ $TILIX_ID ]]; then
source /etc/profile.d/vte.sh
fi