feat: updates for mako, sway, waybar

master
Tim 6 months ago
parent 745c642c84
commit 075f462446
  1. 7
      config/mako/config
  2. 68
      config/rofi/themes/music.rasi
  3. 3
      config/sway/apps.conf
  4. 2
      config/sway/colorscheme.conf
  5. 3
      config/sway/config
  6. 18
      config/sway/input.conf
  7. 2
      config/tmux/general.tmux
  8. 70
      config/waybar/config
  9. 7
      config/waybar/scripts/mako.sh
  10. 1
      packages/zsh.sym/aliases.zsh

@ -1,4 +1,4 @@
#font
font=Inconsolata 10
default-timeout=2500
layer=overlay
anchor=top-right
@ -8,7 +8,7 @@ border-radius=2
border-size=2
max-icon-size=128
text-alignment=center
background-color=#bbbbbb
background-color=#cccccc
text-color=#444444
[urgency=low]
@ -21,3 +21,6 @@ border-color=#764e37
border-color=#ea6962
[mode=do-not-disturb]
invisible=1

@ -0,0 +1,68 @@
/**
* This theme is intended for a 6 items option menu with a headerbar.
*/
@import "shared/option-menu.rasi"
#window {
font: @text-font;
padding: @music-window-padding;
children: [ inputbar, horibox ];
}
#inputbar {
children: [ textbox-prompt-colon, prompt ];
margin: @music-inputbar-margin;
}
prompt,
textbox-prompt-colon {
font: @text-font;
padding: @music-prompt-padding;
border: 2px;
border-color: @accent;
}
#prompt {
margin: @music-prompt-margin;
background-color: @background-light;
text-color: @accent;
}
#textbox-prompt-colon {
expand: false;
str: "music";
background-color: @accent;
text-color: @background;
}
#horibox {
padding: 0px;
}
#listview {
spacing: @option-6-listview-spacing;
lines: 6;
}
#element {
font: @icon-font;
border: @music-element-border;
padding: @music-element-padding;
border-color: @background-light;
}
#element.selected {
border-color: @accent;
}
element.alternate.active,
element.normal.active,
element.selected.urgent {
background-color: @on;
text-color: @background;
border-color: @on;
}
element.selected.urgent {
border-color: @accent;
}
element.alternate.urgent,
element.normal.urgent,
element.selected.active {
background-color: @off;
text-color: @background;
border-color: @off;
}
element.selected.active {
border-color: @accent;
}

@ -19,6 +19,7 @@ for_window [class=".*wine.*"] floating enable
for_window [app_id="pavucontrol"] floating enable
for_window [app_id="feh"] floating enable
for_window [window_role="pop-up"] floating enable
for_window [app_id="custom-pop-up"] floating enable, resize set width 600 height 300, move position 1900 -5
for_window [title="Picture-in-Picture"] floating enable
for_window [window_role="bubble"] floating enable
for_window [window_role="task_dialog"] floating enable
@ -36,6 +37,6 @@ exec mako
exec i3-focus-last server
# Start our Apps
exec firefox
exec firefox-bin
exec signal-desktop
exec alacritty

@ -2,7 +2,7 @@
# Color scheme (Gruvbox dark)
set $color_normal_white #a89984
set $color_bright_white #ebdbb2
set $color_normal_gray #222222
set $color_normal_gray #ffffff
set $color_bright_gray #3c3836
set $color_bright_yellow #d79921
set $color_normal_black #282828

@ -32,11 +32,10 @@ exec swayidle -w \
### Window configs
gaps inner 5
gaps outer 50
gaps outer 20
default_border pixel 5
default_floating_border none
#hide_edge_borders --i3 smart
#smart_borders on
#smart_gaps on

@ -1,13 +1,13 @@
# Input
input "type:keyboard" {
repeat_rate 30
repeat_delay 300
xkb_options caps:escape
}
#input "type:keyboard" {
# repeat_rate 30
# repeat_delay 300
# xkb_options caps:escape
#}
input "type:mouse" {
accel_profile "flat"
}
#input "type:mouse" {
# accel_profile "flat"
#}
seat * hide_cursor when-typing enable
#seat * hide_cursor when-typing enable

@ -5,7 +5,7 @@ set -g default-terminal tmux-256color
set -ga terminal-overrides ,*256col*:Tc
set -g history-limit 262144
# Start window and pane numbering at 1, (0 is too hard to reach).
set -g base-index 1
set -g base-index 0
set -g pane-base-index 1
# Don't wait for an escape sequence after seeing C-a.

@ -2,12 +2,29 @@
"layer": "top", // Waybar at top layer
"position": "top", // 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", "custom/media", "mpd", "custom/scratchpad-indicator"],
"modules-left": [
"sway/workspaces",
"sway/mode",
"custom/media",
"mpd",
"custom/scratchpad-indicator"],
"modules-center": ["sway/window"],
"modules-right": [ "idle_inhibitor", "custom/dunst", "pulseaudio", "network", "cpu", "memory", "temperature", "temperature#GPU", "custom/blog-stats", "clock", "tray"],
"modules-right": [
"custom/launcher",
"idle_inhibitor",
"pulseaudio",
"network",
"cpu",
"memory",
"temperature",
"temperature#GPU",
"custom/blog-stats",
"clock",
"tray",
"custom/power"
],
// Modules configuration
"sway/workspaces": {
"format": "{name}: {icon}",
@ -20,10 +37,10 @@
"focused": "",
"default": ""
},
"persistent_workspaces": {
"1": "[DP-1]",
"2": "[HDMI-A-1]"
}
//"persistent_workspaces": {
// "1": "[DP-1]",
// "2": "[HDMI-A-1]"
//}
},
"keyboard-state": {
"numlock": true,
@ -38,7 +55,7 @@
"format": "<span style=\"italic\">{}</span>"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) {songPosition}|{queueLength} {volume}% ",
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) {songPosition}|{queueLength} {volume}% ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
@ -61,7 +78,7 @@
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
"tooltip-format-disconnected": "MPD (disconnected)",
},
"idle_inhibitor": {
"format": "{icon}",
@ -71,29 +88,29 @@
}
},
"tray": {
// "icon-size": 21,
"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}"
"format-alt": " {:%Y-%m-%d}"
},
"cpu": {
"format": "{usage}% ",
"on-click": "alacritty htop",
"on-click": "exec alacritty --class custom-pop-up -e glances",
"tooltip": false
},
"memory": {
"on-click": "alacritty htop",
"on-click": "exec alacritty --class custom-pop-up -e htop",
"format": "{}% "
},
"temperature": {
"thermal-zone": 1,
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
"critical-threshold": 40,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-critical": "{temperatureC}°C {icon}",
"format": "",
"format-icons": ["", "", ""]
},
"temperature#GPU": {
@ -101,7 +118,7 @@
"hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 60,
"format-critical": "{temperatureC}°C {icon}",
"format": "G: {temperatureC}°C {icon}",
"format": "",
"format-icons": ["", "", ""]
},
"backlight": {
@ -190,6 +207,13 @@
"format": " {} ",
"restart-interval": 1
},
"custom/mako": {
"exec": "~/.config/waybar/scripts/mako.sh",
"on-click": "makoctl set-mode do-not-disturb",
"on-click-right": "makoctl set-mode default",
"format": " {} ",
"restart-interval": 1
},
"custom/gpu-usage": {
"exec": "cat /sys/class/hwmon/hwmon2/device/gpu_busy_percent",
"format": "GPU: {}%",
@ -201,6 +225,16 @@
"format": " {} ",
"return-type": "json",
"interval": 360
}
},
"custom/launcher": {
"format":" ",
"on-click": "exec rofi -show drun",
"tooltip": false,
},
"custom/power": {
"format":" ⏻ ",
"on-click": "exec wlogout",
"tooltip": false,
}
}

@ -0,0 +1,7 @@
#!/bin/bash
COUNT=$(makoctl count waiting)
ENABLED=
DISABLED=
if [ $COUNT != 0 ]; then DISABLED=" $COUNT"; fi
if dunstctl is-paused | grep -q "false" ; then echo $ENABLED; else echo $DISABLED; fi

@ -42,6 +42,7 @@ alias df='df -h'
alias du='du -h -c'
alias digs='dig +short'
alias more='less'
alias gcm="git checkout main"
# Custom Git
alias gbclean='echo "Removing Merged Branches"; sleep 2; git checkout master && git branch --merged | egrep -v "(^\*|master|dev)" | while read b; do git branch -d $b; done'

Loading…
Cancel
Save