Compare commits
2 Commits
13a662b060
...
51e4e345e2
Author | SHA1 | Date | |
---|---|---|---|
51e4e345e2 | |||
941b07bc3e |
@ -75,7 +75,7 @@ checkconflict() {
|
|||||||
error "Could not read directory: $1" 2
|
error "Could not read directory: $1" 2
|
||||||
fi
|
fi
|
||||||
# Get our list of files
|
# Get our list of files
|
||||||
local files="$(find "$1" -type f -o -type l)"
|
local files="$(find "$1" ! -name "*.swp" -type f -o -type l)"
|
||||||
local directories="$(find "$1" -type d)"
|
local directories="$(find "$1" -type d)"
|
||||||
local -a conflict
|
local -a conflict
|
||||||
# Iterate over them
|
# Iterate over them
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
{
|
[{
|
||||||
"layer": "top",
|
"layer": "top",
|
||||||
"height": 40,
|
"height": 40,
|
||||||
|
"id": "top",
|
||||||
"modules-left": ["sway/workspaces", "sway/mode"],
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
"modules-center": ["clock"],
|
"modules-center": ["sway/window"],
|
||||||
"modules-right": ["network", "pulseaudio", "backlight", "battery", "tray", "mpris", "idle_inhibitor"],
|
"modules-right": ["tray"],
|
||||||
"sway/workspaces": {
|
"sway/workspaces": {
|
||||||
"all-outputs": false,
|
"all-outputs": false,
|
||||||
"disable-scroll": true,
|
"disable-scroll": true,
|
||||||
@ -20,22 +21,30 @@
|
|||||||
"10": ["eDP-1", "DP-2"]
|
"10": ["eDP-1", "DP-2"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idle_inhibitor": {
|
"sway/window": {
|
||||||
"format": "{icon}",
|
|
||||||
"format-icons": {
|
|
||||||
"activated": "",
|
|
||||||
"deactivated": ""
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"tray": {
|
"tray": {
|
||||||
"icon-size": 16,
|
"icon-size": 16,
|
||||||
"spacing": 10
|
"spacing": 10
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "bottom",
|
||||||
|
"layer": "top",
|
||||||
|
"position": "bottom",
|
||||||
|
"height": 40,
|
||||||
|
"modules-left": ["idle_inhibitor", "gamemode", "mpris"],
|
||||||
|
"modules-center": ["clock"],
|
||||||
|
"modules-right": ["network", "pulseaudio", "backlight", "battery"],
|
||||||
"clock": {
|
"clock": {
|
||||||
"format": "{:%a %b %d %I:%M %p}",
|
"format": "{:%a %b %d %I:%M %p}",
|
||||||
"format-alt": "{:%Y-%m-%d}",
|
"format-alt": "{:%Y-%m-%d}",
|
||||||
"tooltip": false
|
"tooltip": false
|
||||||
},
|
},
|
||||||
|
"network": {
|
||||||
|
"interval": 1,
|
||||||
|
"format": " {bandwidthUpBytes} {bandwidthDownBytes}"
|
||||||
|
},
|
||||||
"battery": {
|
"battery": {
|
||||||
"states": {
|
"states": {
|
||||||
"good": 100,
|
"good": 100,
|
||||||
@ -51,9 +60,35 @@
|
|||||||
"format": "{icon} {percent}%",
|
"format": "{icon} {percent}%",
|
||||||
"format-icons": ["", ""]
|
"format-icons": ["", ""]
|
||||||
},
|
},
|
||||||
|
"idle_inhibitor": {
|
||||||
|
"format": "{icon}",
|
||||||
|
"format-icons": {
|
||||||
|
"activated": "",
|
||||||
|
"deactivated": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"gamemode": {
|
||||||
|
"hide-not-running": false,
|
||||||
|
"format": "{glyph}",
|
||||||
|
"glyph": "",
|
||||||
|
"use-icon": false,
|
||||||
|
"icon-spacing": 0,
|
||||||
|
"icon-size": 0
|
||||||
|
},
|
||||||
|
"pulseaudio": {
|
||||||
|
"scroll-step": 5,
|
||||||
|
"format": "{icon} {volume}%",
|
||||||
|
"format-icons": {
|
||||||
|
"default": ["", "", ""]
|
||||||
|
},
|
||||||
|
"on-scroll-up": "/usr/libexec/sway/volume-helper --limit 100 --increase 5",
|
||||||
|
"on-scroll-down": "/usr/libexec/sway/volume-helper --limit 100 --decrease 5",
|
||||||
|
"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle && /usr/libexec/sway/volume-helper"
|
||||||
|
},
|
||||||
"mpris": {
|
"mpris": {
|
||||||
"interval": 1,
|
"interval": 1,
|
||||||
"format": "{player_icon}",
|
"max-length": 100,
|
||||||
|
"format": "{player_icon} - {dynamic}",
|
||||||
"ignored-players": [
|
"ignored-players": [
|
||||||
"firefox"
|
"firefox"
|
||||||
],
|
],
|
||||||
@ -65,19 +100,5 @@
|
|||||||
"paused": "⏸",
|
"paused": "⏸",
|
||||||
"stopped": "⏹"
|
"stopped": "⏹"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"network": {
|
|
||||||
"interval": 1,
|
|
||||||
"format": " {bandwidthUpBytes} {bandwidthDownBytes}"
|
|
||||||
},
|
|
||||||
"pulseaudio": {
|
|
||||||
"scroll-step": 5,
|
|
||||||
"format": "{icon} {volume}%",
|
|
||||||
"format-icons": {
|
|
||||||
"default": ["", "", ""]
|
|
||||||
},
|
|
||||||
"on-scroll-up": "/usr/libexec/sway/volume-helper --limit 100 --increase 5",
|
|
||||||
"on-scroll-down": "/usr/libexec/sway/volume-helper --limit 100 --decrease 5",
|
|
||||||
"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle && /usr/libexec/sway/volume-helper"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}]
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
* {
|
* {
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
font-family: "IBM Plex Sans Medium";
|
font-family: "IBM Plex Sans", "Font Awesome 6 Free", sans-serif;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,6 +48,9 @@ window#waybar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* widgets */
|
/* widgets */
|
||||||
|
#window {
|
||||||
|
color: #ebdbb2;
|
||||||
|
}
|
||||||
#pulseaudio {
|
#pulseaudio {
|
||||||
padding: 0 1em;
|
padding: 0 1em;
|
||||||
color: #ebdbb2;
|
color: #ebdbb2;
|
||||||
@ -69,6 +72,7 @@ window#waybar {
|
|||||||
color: #504945;
|
color: #504945;
|
||||||
}
|
}
|
||||||
#network {
|
#network {
|
||||||
|
padding: 0 1em;
|
||||||
color: #928374;
|
color: #928374;
|
||||||
font-size: 10;
|
font-size: 10;
|
||||||
}
|
}
|
||||||
@ -85,6 +89,13 @@ window#waybar {
|
|||||||
padding: 0 1em;
|
padding: 0 1em;
|
||||||
color: #fabd2f;
|
color: #fabd2f;
|
||||||
}
|
}
|
||||||
|
#gamemode {
|
||||||
|
padding: 0 1em;
|
||||||
|
color: #504945;
|
||||||
|
}
|
||||||
|
#gamemode.running {
|
||||||
|
color: #b8bb26;
|
||||||
|
}
|
||||||
#battery {
|
#battery {
|
||||||
padding: 0 1em;
|
padding: 0 1em;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user