Skip to content

Commit

Permalink
moving to waybar from i3status-rust
Browse files Browse the repository at this point in the history
  • Loading branch information
hypergig committed Feb 21, 2020
1 parent e623f1d commit c4429d3
Show file tree
Hide file tree
Showing 4 changed files with 183 additions and 104 deletions.
71 changes: 0 additions & 71 deletions config/i3status-rs.toml

This file was deleted.

16 changes: 1 addition & 15 deletions config/sway/config.d/overrides.config
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,7 @@ titlebar_border_thickness 1


# bar
bar bar-0 {
font $default_font
position top
status_command exec i3status-rs ~/repos/workstation/config/i3status-rs.toml
colors {
background $trans
statusline $base0
separator $orange
# border background text
focused_workspace $orange $base03 $base1
active_workspace $base02 $base01 $base1
inactive_workspace $base02 $base03 $base0
urgent_workspace $red $red $base0
}
}
bar bar-0 swaybar_command waybar


# theme
Expand Down
147 changes: 147 additions & 0 deletions config/waybar/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"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
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
"modules-center": ["sway/window"],
"modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
// 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": {
"format": "<span style=\"italic\">{}</span>"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 2,
"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
},
"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": 2,
// "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-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"
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
"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} {}",
"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
}
}
53 changes: 35 additions & 18 deletions playbooks/sway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,24 @@
- swayidle
- swaylock
- wl-clipboard
# prereqs for i3-status-rust
- cargo
# prereqs waybar (as per 19.10)
- fonts-font-awesome
- fonts-powerline
- libdbus-1-dev
- libgtkmm-3.0-dev
- libjsoncpp-dev
- libinput-dev
- libsigc++-2.0-dev
- libpulse-dev
- libnl-3-dev
- libdbusmenu-gtk3-dev
- libnl-genl-3-dev
- libfmt-dev
- clang-tidy
- libmpdclient-dev
- libwayland-dev
- libgtk-3-dev
- gobject-introspection
- libgirepository1.0-dev
- scdoc
become: true

- name: link sway config
Expand All @@ -27,30 +40,34 @@
dest: /etc/sway/config.d
become: true

- name: add jordan to docker group
- name: add jordan to video group so he can control brightness
user:
name: jordan
groups: video
append: yes
become: true

- name: clone i3status-rust repo
- name: clone waybar repo
git:
repo: [email protected]:greshake/i3status-rust.git
dest: ~/repos/i3status-rust
# pinning version until upgrade to cargo 2
version: dae7dd0f6f4ab87bf268b0d745a38d505bb7ed20
repo: [email protected]:Alexays/Waybar.git
dest: ~/repos/Waybar

- name: build i3-status-rust
shell: cargo build --release
- name: build waybar
shell: meson build && ninja -C build
args:
chdir: ~/repos/i3status-rust
chdir: ~/repos/Waybar
register: result
changed_when: "'Compiling' in result.stderr"
changed_when: "'ninja: no work to do.' not in result.stdout"

- name: linking i3status-rs bin
- name: install waybar
shell: ninja -C build install
args:
chdir: /home/jordan/repos/Waybar
become: true
changed_when: result.changed

- name: linking waybar config
file:
state: link
src: /home/jordan/repos/i3status-rust/target/release/i3status-rs
dest: /usr/local/bin/i3status-rs
become: true
src: "{{playbook_dir}}/config/waybar"
dest: ~/.config/waybar

0 comments on commit c4429d3

Please sign in to comment.