Compare commits
4 Commits
691f61dc75
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e53054f29 | |||
| f298612f1f | |||
| c05b21f2a1 | |||
| cb572f63ef |
219
.config/waybar/config.jsonc
Normal file
219
.config/waybar/config.jsonc
Normal file
@@ -0,0 +1,219 @@
|
|||||||
|
// -*- mode: jsonc -*-
|
||||||
|
{
|
||||||
|
// "layer": "top", // Waybar at top layer
|
||||||
|
// "position": "bottom", // Waybar position (top|bottom|left|right)
|
||||||
|
"height": 30, // Waybar height (to be removed for auto height)
|
||||||
|
// "width": 1280, // Waybar width
|
||||||
|
"spacing": 4, // Gaps between modules (4px)
|
||||||
|
// Choose the order of the modules
|
||||||
|
"modules-left": [
|
||||||
|
"sway/workspaces",
|
||||||
|
"sway/mode",
|
||||||
|
"sway/scratchpad",
|
||||||
|
"custom/media"
|
||||||
|
],
|
||||||
|
"modules-center": [
|
||||||
|
"sway/window"
|
||||||
|
],
|
||||||
|
"modules-right": [
|
||||||
|
"mpd",
|
||||||
|
"idle_inhibitor",
|
||||||
|
"pulseaudio",
|
||||||
|
//"network",
|
||||||
|
"power-profiles-daemon",
|
||||||
|
"cpu",
|
||||||
|
"memory",
|
||||||
|
"temperature",
|
||||||
|
"backlight",
|
||||||
|
"keyboard-state",
|
||||||
|
"sway/language",
|
||||||
|
"battery",
|
||||||
|
"battery#bat2",
|
||||||
|
"clock",
|
||||||
|
"tray",
|
||||||
|
"custom/power"
|
||||||
|
],
|
||||||
|
// Modules configuration
|
||||||
|
// "sway/workspaces": {
|
||||||
|
// "disable-scroll": true,
|
||||||
|
// "all-outputs": true,
|
||||||
|
// "warp-on-scroll": false,
|
||||||
|
// "format": "{name}: {icon}",
|
||||||
|
// "format-icons": {
|
||||||
|
// "1": "",
|
||||||
|
// "2": "",
|
||||||
|
// "3": "",
|
||||||
|
// "4": "",
|
||||||
|
// "5": "",
|
||||||
|
// "urgent": "",
|
||||||
|
// "focused": "",
|
||||||
|
// "default": ""
|
||||||
|
// }
|
||||||
|
// },
|
||||||
|
"keyboard-state": {
|
||||||
|
"numlock": true,
|
||||||
|
"capslock": true,
|
||||||
|
"format": "{name} {icon}",
|
||||||
|
"format-icons": {
|
||||||
|
"locked": "",
|
||||||
|
"unlocked": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"sway/mode": {
|
||||||
|
"format": "<span style=\"italic\">{}</span>"
|
||||||
|
},
|
||||||
|
"sway/scratchpad": {
|
||||||
|
"format": "{icon} {count}",
|
||||||
|
"show-empty": false,
|
||||||
|
"format-icons": ["", ""],
|
||||||
|
"tooltip": true,
|
||||||
|
"tooltip-format": "{app}: {title}"
|
||||||
|
},
|
||||||
|
"mpd": {
|
||||||
|
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
|
||||||
|
"format-disconnected": "Disconnected ",
|
||||||
|
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
|
||||||
|
"unknown-tag": "N/A",
|
||||||
|
"interval": 5,
|
||||||
|
"consume-icons": {
|
||||||
|
"on": " "
|
||||||
|
},
|
||||||
|
"random-icons": {
|
||||||
|
"off": "<span color=\"#f53c3c\"></span> ",
|
||||||
|
"on": " "
|
||||||
|
},
|
||||||
|
"repeat-icons": {
|
||||||
|
"on": " "
|
||||||
|
},
|
||||||
|
"single-icons": {
|
||||||
|
"on": "1 "
|
||||||
|
},
|
||||||
|
"state-icons": {
|
||||||
|
"paused": "",
|
||||||
|
"playing": ""
|
||||||
|
},
|
||||||
|
"tooltip-format": "MPD (connected)",
|
||||||
|
"tooltip-format-disconnected": "MPD (disconnected)"
|
||||||
|
},
|
||||||
|
"idle_inhibitor": {
|
||||||
|
"format": "{icon}",
|
||||||
|
"format-icons": {
|
||||||
|
"activated": "",
|
||||||
|
"deactivated": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tray": {
|
||||||
|
// "icon-size": 21,
|
||||||
|
"spacing": 10,
|
||||||
|
// "icons": {
|
||||||
|
// "blueman": "bluetooth",
|
||||||
|
// "TelegramDesktop": "$HOME/.local/share/icons/hicolor/16x16/apps/telegram.png"
|
||||||
|
// }
|
||||||
|
},
|
||||||
|
"clock": {
|
||||||
|
// "timezone": "America/New_York",
|
||||||
|
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
||||||
|
"format-alt": "{:%Y-%m-%d}"
|
||||||
|
},
|
||||||
|
"cpu": {
|
||||||
|
"format": "{usage}% ",
|
||||||
|
"tooltip": false
|
||||||
|
},
|
||||||
|
"memory": {
|
||||||
|
"format": "{}% "
|
||||||
|
},
|
||||||
|
"temperature": {
|
||||||
|
"thermal-zone": 7,
|
||||||
|
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
||||||
|
"critical-threshold": 80,
|
||||||
|
// "format-critical": "{temperatureC}°C {icon}",
|
||||||
|
"format": "{temperatureC}°C {icon}",
|
||||||
|
"format-icons": ["", "", ""]
|
||||||
|
},
|
||||||
|
"backlight": {
|
||||||
|
// "device": "acpi_video1",
|
||||||
|
"format": "{percent}% {icon}",
|
||||||
|
"format-icons": ["", "", "", "", "", "", "", "", ""]
|
||||||
|
},
|
||||||
|
"battery": {
|
||||||
|
"states": {
|
||||||
|
// "good": 95,
|
||||||
|
"warning": 30,
|
||||||
|
"critical": 15
|
||||||
|
},
|
||||||
|
"format": "{capacity}% {icon}",
|
||||||
|
"format-full": "{capacity}% {icon}",
|
||||||
|
"format-charging": "{capacity}% ",
|
||||||
|
"format-plugged": "{capacity}% ",
|
||||||
|
"format-alt": "{time} {icon}",
|
||||||
|
// "format-good": "", // An empty format will hide the module
|
||||||
|
// "format-full": "",
|
||||||
|
"format-icons": ["", "", "", "", ""]
|
||||||
|
},
|
||||||
|
"battery#bat2": {
|
||||||
|
"bat": "BAT2"
|
||||||
|
},
|
||||||
|
"power-profiles-daemon": {
|
||||||
|
"format": "{icon}",
|
||||||
|
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
|
||||||
|
"tooltip": true,
|
||||||
|
"format-icons": {
|
||||||
|
"default": "",
|
||||||
|
"performance": "",
|
||||||
|
"balanced": "",
|
||||||
|
"power-saver": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// "network": {
|
||||||
|
// // "interface": "wlp2*", // (Optional) To force the use of this interface
|
||||||
|
// "format-wifi": "{essid} ({signalStrength}%) ",
|
||||||
|
// "format-ethernet": "{ipaddr}/{cidr} ",
|
||||||
|
// "tooltip-format": "{ifname} via {gwaddr} ",
|
||||||
|
// "format-linked": "{ifname} (No IP) ",
|
||||||
|
// "format-disconnected": "Disconnected ⚠",
|
||||||
|
// "format-alt": "{ifname}: {ipaddr}/{cidr}"
|
||||||
|
// },
|
||||||
|
"pulseaudio": {
|
||||||
|
// "scroll-step": 1, // %, can be a float
|
||||||
|
"format": "{volume}% {icon} {format_source}",
|
||||||
|
"format-bluetooth": "{volume}% {icon} {format_source}",
|
||||||
|
"format-bluetooth-muted": " {icon} {format_source}",
|
||||||
|
"format-muted": " {format_source}",
|
||||||
|
"format-source": "{volume}% ",
|
||||||
|
"format-source-muted": "",
|
||||||
|
"format-icons": {
|
||||||
|
"headphone": "",
|
||||||
|
"hands-free": "",
|
||||||
|
"headset": "",
|
||||||
|
"phone": "",
|
||||||
|
"portable": "",
|
||||||
|
"car": "",
|
||||||
|
"default": ["", "", ""]
|
||||||
|
},
|
||||||
|
"on-click": "pavucontrol"
|
||||||
|
},
|
||||||
|
"custom/media": {
|
||||||
|
"format": "{icon} {text}",
|
||||||
|
"return-type": "json",
|
||||||
|
"max-length": 40,
|
||||||
|
"format-icons": {
|
||||||
|
"spotify": "",
|
||||||
|
"default": "🎜"
|
||||||
|
},
|
||||||
|
"escape": true,
|
||||||
|
"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
|
||||||
|
},
|
||||||
|
"custom/power": {
|
||||||
|
"format" : "⏾",
|
||||||
|
"tooltip": false,
|
||||||
|
"menu": "on-click",
|
||||||
|
"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
|
||||||
|
"menu-actions": {
|
||||||
|
"shutdown": "shutdown",
|
||||||
|
"reboot": "reboot",
|
||||||
|
"suspend": "systemctl suspend",
|
||||||
|
"hibernate": "systemctl hibernate"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
28
.config/waybar/power_menu.xml
Normal file
28
.config/waybar/power_menu.xml
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<interface>
|
||||||
|
<object class="GtkMenu" id="menu">
|
||||||
|
<child>
|
||||||
|
<object class="GtkMenuItem" id="suspend">
|
||||||
|
<property name="label">Suspend</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkMenuItem" id="hibernate">
|
||||||
|
<property name="label">Hibernate</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkMenuItem" id="shutdown">
|
||||||
|
<property name="label">Shutdown</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkSeparatorMenuItem" id="delimiter1"/>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkMenuItem" id="reboot">
|
||||||
|
<property name="label">Reboot</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</interface>
|
||||||
@@ -1,16 +1,19 @@
|
|||||||
|
@define-color primary-bg #191724;
|
||||||
|
|
||||||
|
|
||||||
* {
|
* {
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
/*border-bottom-right-radius: 4px;*/
|
/*border-bottom-right-radius: 4px;*/
|
||||||
/* `ttf-font-awesome` is required to be installed for icons */
|
/* `ttf-font-awesome` is required to be installed for icons */
|
||||||
font-family: "Roboto Mono Medium", Helvetica, Arial, sans-serif;
|
font-family: Inter;
|
||||||
|
|
||||||
/* adjust font-size value to your liking: */
|
/* adjust font-size value to your liking: */
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
|
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
|
||||||
|
|
||||||
|
}
|
||||||
window#waybar {
|
window#waybar {
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
/* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
|
/* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
|
||||||
@@ -35,11 +38,11 @@ window#waybar.solo {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* window#waybar.termite {
|
/* window#waybar.termite {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
window#waybar.chromium {
|
window#waybar.chromium {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
border: none;
|
border: none;
|
||||||
} */
|
} */
|
||||||
|
|
||||||
@@ -83,6 +86,7 @@ window#waybar.chromium {
|
|||||||
#tray,
|
#tray,
|
||||||
#mode,
|
#mode,
|
||||||
#idle_inhibitor,
|
#idle_inhibitor,
|
||||||
|
#custom-power,
|
||||||
#mpd {
|
#mpd {
|
||||||
padding: 0 10px;
|
padding: 0 10px;
|
||||||
margin: 6px 3px;
|
margin: 6px 3px;
|
||||||
@@ -105,18 +109,18 @@ window#waybar.chromium {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#clock {
|
#clock {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
#battery {
|
#battery {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
#battery.charging {
|
#battery.charging {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes blink {
|
@keyframes blink {
|
||||||
@@ -137,26 +141,26 @@ window#waybar.chromium {
|
|||||||
}
|
}
|
||||||
|
|
||||||
label:focus {
|
label:focus {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
#cpu {
|
#cpu {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
#memory {
|
#memory {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
#backlight {
|
#backlight {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color:white;
|
color:white;
|
||||||
}
|
}
|
||||||
|
|
||||||
#network {
|
#network {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color:white;
|
color:white;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -166,12 +170,12 @@ label:focus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#pulseaudio {
|
#pulseaudio {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pulseaudio.muted {
|
#pulseaudio.muted {
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,15 +194,15 @@ label:focus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#temperature {
|
#temperature {
|
||||||
background-color: #f0932b;
|
background-color: #9ccfd8;
|
||||||
}
|
}
|
||||||
|
|
||||||
#temperature.critical {
|
#temperature.critical {
|
||||||
background-color: #eb4d4b;
|
background-color: #eb6f92;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tray {
|
#tray {
|
||||||
background-color: #2980b9;
|
background-color: #26233a;
|
||||||
}
|
}
|
||||||
|
|
||||||
#idle_inhibitor {
|
#idle_inhibitor {
|
||||||
@@ -238,7 +242,11 @@ label:focus {
|
|||||||
#power-profiles-daemon{
|
#power-profiles-daemon{
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
padding: 0 10px 0px 7px;
|
padding: 0 10px 0px 7px;
|
||||||
background-color: #000000;
|
background-color: @primary-bg;
|
||||||
margin: 6px 3px;
|
margin: 6px 3px;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#custom-power{
|
||||||
|
color: #ffffff;
|
||||||
|
background-color: #26233a;
|
||||||
|
}
|
||||||
|
|||||||
1739
.config/zsh_custom/10-p10k.zsh
Normal file
1739
.config/zsh_custom/10-p10k.zsh
Normal file
File diff suppressed because it is too large
Load Diff
10
.gitmodules
vendored
10
.gitmodules
vendored
@@ -1,8 +1,5 @@
|
|||||||
[submodule ".ohmyzsh"]
|
[submodule ".config/zsh_custom/themes/powerlevel10k"]
|
||||||
path = .ohmyzsh
|
path = .config/zsh_custom/themes/powerlevel10k
|
||||||
url = https://github.com/ohmyzsh/ohmyzsh.git
|
|
||||||
[submodule "/home/amy/.config/zsh_custom/themes/powerlevel10k"]
|
|
||||||
path = /home/amy/.config/zsh_custom/themes/powerlevel10k
|
|
||||||
url = https://github.com/romkatv/powerlevel10k.git
|
url = https://github.com/romkatv/powerlevel10k.git
|
||||||
[submodule ".config/zsh_custom/plugins/zsh-syntax-highlighting"]
|
[submodule ".config/zsh_custom/plugins/zsh-syntax-highlighting"]
|
||||||
path = .config/zsh_custom/plugins/zsh-syntax-highlighting
|
path = .config/zsh_custom/plugins/zsh-syntax-highlighting
|
||||||
@@ -10,3 +7,6 @@
|
|||||||
[submodule ".config/zsh_custom/plugins/zsh-autosuggestions"]
|
[submodule ".config/zsh_custom/plugins/zsh-autosuggestions"]
|
||||||
path = .config/zsh_custom/plugins/zsh-autosuggestions
|
path = .config/zsh_custom/plugins/zsh-autosuggestions
|
||||||
url = https://github.com/zsh-users/zsh-autosuggestions
|
url = https://github.com/zsh-users/zsh-autosuggestions
|
||||||
|
[submodule ".ohmyzsh"]
|
||||||
|
path = .ohmyzsh
|
||||||
|
url = https://github.com/ohmyzsh/ohmyzsh.git
|
||||||
|
|||||||
2
.ohmyzsh
2
.ohmyzsh
Submodule .ohmyzsh updated: 9e23925b85...d57775d89e
2
.zshrc
2
.zshrc
@@ -9,7 +9,7 @@ fi
|
|||||||
# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
||||||
|
|
||||||
# Path to your Oh My Zsh installation.
|
# Path to your Oh My Zsh installation.
|
||||||
export ZSH="$HOME/.oh-my-zsh"
|
export ZSH="$HOME/.ohmyzsh"
|
||||||
export ZSH_CUSTOM="$HOME/.config/zsh_custom"
|
export ZSH_CUSTOM="$HOME/.config/zsh_custom"
|
||||||
# Set name of the theme to load --- if set to "random", it will
|
# Set name of the theme to load --- if set to "random", it will
|
||||||
# load a random theme each time Oh My Zsh is loaded, in which case,
|
# load a random theme each time Oh My Zsh is loaded, in which case,
|
||||||
|
|||||||
Reference in New Issue
Block a user