summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2023-11-24 13:34:44 +0100
committerRaymaekers Luca <raymaekers.luca@gmail.com>2023-11-24 13:34:44 +0100
commit371d31749bde435783bf44fd032edcbae577146f (patch)
tree216a80d15c184919af7410ee6c6155e976f2075d
parent0a84c3d984349e96ddd8077cf2bdd9e08ccb4300 (diff)
parent78d0fc01dfea453d1c23649f6353bd4ee5a8f2a1 (diff)
Merge branch 'main' of debuc.com:dotfiles
-rw-r--r--.gitignore3
-rw-r--r--[l---------]config/wayland/waybar/config.jsonc79
-rw-r--r--config/wayland/waybar/configs/dwm.jsonc16
-rw-r--r--config/wayland/waybar/configs/hyprland.jsonc78
-rwxr-xr-xconfig/wayland/waybar/scripts/status.sh2
-rw-r--r--config/wayland/waybar/styles/base16.css181
-rw-r--r--config/wayland/waybar/styles/colors/colors-nord29
l---------config/wayland/waybar/styles/colors/colors.css1
-rw-r--r--config/wayland/waybar/styles/dwm.css20
-rw-r--r--config/wayland/waybar/styles/nord.css142
10 files changed, 80 insertions, 471 deletions
diff --git a/.gitignore b/.gitignore
index 11392b4..6f3df81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,12 @@ config/common/mpd/pid
config/common/mpv/playfile.txt
config/common/mpv/watch_later/*
config/essentials/gnupg/*
+config/essentials/nvim/lazy-lock.json
config/essentials/nvim/lua/.luarc.json
config/essentials/nvim/plugin/
config/essentials/nvim/spell/
-config/essentials/zsh/.zcompdump
config/essentials/zsh/histfile
+config/essentials/zsh/zcompcache/
config/extra/jftui/settings
config/extra/jftui/watch_later/*
config/extra/mutt/muttrc
diff --git a/config/wayland/waybar/config.jsonc b/config/wayland/waybar/config.jsonc
index 1d795fc..9d60915 120000..100644
--- a/config/wayland/waybar/config.jsonc
+++ b/config/wayland/waybar/config.jsonc
@@ -1 +1,78 @@
-configs/hyprland.jsonc \ No newline at end of file
+{
+ "layer": "top",
+ "modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
+ "modules-center": ["clock"],
+ "modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "custom/bluetooth", "tray"],
+ "mpd": {
+ "format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
+ "artist-len": 24,
+ "format-disconnected": "s",
+ "format-stopped": "",
+ "state-icons": {
+ "playing": "",
+ "paused": "",
+ },
+ "tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
+ "on-click": "mpc toggle",
+ "on-scroll-up": "mpc volume +5",
+ "on-scroll-down": "mpc volume -5",
+ },
+ "battery": {
+ "format-charging": " {capacity}%",
+ "on-click": "mpower",
+ "interval": 10,
+ },
+ "hyprland/window": {
+ "format": " {}",
+ "separate-outputs": true,
+ },
+ "pulseaudio": {
+ "scroll-step": 1,
+ "format": "{icon} {volume:3}%",
+ "format-icons": {
+ "default": ["", "", ""]
+ },
+ "on-click": "pavucontrol",
+ },
+ "temperature": {
+ "interval": 3,
+ "format": "{icon} {temperatureC}°C",
+ "format-icons": {
+ "default":["", "", "", "", ""]
+ },
+ },
+ "custom/wireguard": {
+ "exec": "ip addr show dev wg0",
+ "format": "wg0",
+ "restart-interval": 3,
+ },
+ "network": {
+ "format-wifi": " ",
+ "tooltip-format-wifi": "{ifname} {essid}",
+ "format-ethernet": "",
+ "tooltip-format-ethernet": "{ifname} {ipaddr}",
+ "format-disconnected": "",
+ },
+ "cpu": {
+ "format": " {usage:2}%",
+ "interval": 3,
+ },
+ "custom/memory": {
+ "exec": "free -h | awk '(NR==2){ print $3 }'",
+ "format": "{}",
+ "restart-interval": 3,
+ },
+ "clock": {
+ "format": "{:%R}",
+ "format-alt": "{:(%T) %A %d %B}",
+ "interval": 1,
+ },
+ "custom/bluetooth": {
+ "exec": "bluetoothctl info",
+ "format": "",
+ "interval": 3,
+ },
+ "tray": {
+ "spacing": 5,
+ }
+}
diff --git a/config/wayland/waybar/configs/dwm.jsonc b/config/wayland/waybar/configs/dwm.jsonc
deleted file mode 100644
index 211f776..0000000
--- a/config/wayland/waybar/configs/dwm.jsonc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "modules-left": ["hyprland/workspaces", "custom/layout", "hyprland/window"],
- "modules-right": ["custom/status"],
- "hyprland/window": {
- "format": " {} "
- },
- "custom/layout": {
- "format": " []= ",
- "interval": "once",
- },
- "custom/status": {
- "exec": "~/.config/waybar/scripts/status.sh",
- "format": " {} ",
- "interval": 1
- }
-}
diff --git a/config/wayland/waybar/configs/hyprland.jsonc b/config/wayland/waybar/configs/hyprland.jsonc
deleted file mode 100644
index 9d60915..0000000
--- a/config/wayland/waybar/configs/hyprland.jsonc
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "layer": "top",
- "modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
- "modules-center": ["clock"],
- "modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "custom/bluetooth", "tray"],
- "mpd": {
- "format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
- "artist-len": 24,
- "format-disconnected": "s",
- "format-stopped": "",
- "state-icons": {
- "playing": "",
- "paused": "",
- },
- "tooltip-format": "{songPosition}/{queueLength} ({volume}%)",
- "on-click": "mpc toggle",
- "on-scroll-up": "mpc volume +5",
- "on-scroll-down": "mpc volume -5",
- },
- "battery": {
- "format-charging": " {capacity}%",
- "on-click": "mpower",
- "interval": 10,
- },
- "hyprland/window": {
- "format": " {}",
- "separate-outputs": true,
- },
- "pulseaudio": {
- "scroll-step": 1,
- "format": "{icon} {volume:3}%",
- "format-icons": {
- "default": ["", "", ""]
- },
- "on-click": "pavucontrol",
- },
- "temperature": {
- "interval": 3,
- "format": "{icon} {temperatureC}°C",
- "format-icons": {
- "default":["", "", "", "", ""]
- },
- },
- "custom/wireguard": {
- "exec": "ip addr show dev wg0",
- "format": "wg0",
- "restart-interval": 3,
- },
- "network": {
- "format-wifi": " ",
- "tooltip-format-wifi": "{ifname} {essid}",
- "format-ethernet": "",
- "tooltip-format-ethernet": "{ifname} {ipaddr}",
- "format-disconnected": "",
- },
- "cpu": {
- "format": " {usage:2}%",
- "interval": 3,
- },
- "custom/memory": {
- "exec": "free -h | awk '(NR==2){ print $3 }'",
- "format": "{}",
- "restart-interval": 3,
- },
- "clock": {
- "format": "{:%R}",
- "format-alt": "{:(%T) %A %d %B}",
- "interval": 1,
- },
- "custom/bluetooth": {
- "exec": "bluetoothctl info",
- "format": "",
- "interval": 3,
- },
- "tray": {
- "spacing": 5,
- }
-}
diff --git a/config/wayland/waybar/scripts/status.sh b/config/wayland/waybar/scripts/status.sh
deleted file mode 100755
index 3b658e5..0000000
--- a/config/wayland/waybar/scripts/status.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-printf 'Hyprland %s' "$(expac %v hyprland)"
diff --git a/config/wayland/waybar/styles/base16.css b/config/wayland/waybar/styles/base16.css
deleted file mode 100644
index 639b590..0000000
--- a/config/wayland/waybar/styles/base16.css
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-@import "styles/colors/colors.css";
-
-* {
- border: none;
- border-radius: 0;
- font-family: monospace;
- font-weight: bold;
- font-size: 12px;
- min-height: 24px;
-}
-
-window#waybar {
- background: transparent;
-}
-
-window#waybar.hidden {
- opacity: 0.2;
-}
-
-tooltip {
- background: @background;
- color: @foreground;
- border: 2px solid @color0;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
- color: @background;
- background: @color7;
-}
-
-.modules-right * {
- padding: 0 16px;
-}
-
-.modules-right {
- margin-right: 2px;
-}
-.modules-left {
- margin-left: 3px;
-}
-
-#workspaces, #tags, #mpd, #battery,
-#clock,
-#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #custom-bluetooth, #tray {
- border: solid @background;
- border-width: 2px 2px 2px 0;
- margin-top: 4px;
- margin-bottom: 2px;
- transition: none;
-}
-
-#battery {
- color: @color6;
- background: @background;
- border-color: @color4;
- border-width: 2px;
- padding: 0 12px;
- margin-right: 16px;
-}
-
-#workspaces, #tags {
- border: solid @background 2px;
- background: @color3;
-}
-
-#workspaces button, #tags button {
- transition: none;
- background: transparent;
- color: @background;
-}
-
-#tags button.occupied {
- background: @color2;
-}
-
-#workspaces button.active, #tags button.focused {
- background-color: @color6;
-}
-
-#workspaces button:hover, #tags button:hover {
- transition: none;
- color: @color8;
-}
-
-#tags button {
- margin: 0;
- padding-left: 5px;
- padding-right: 5px;
-}
-
-#mpd {
- color: @background;
- padding: 0 16px;
- background: @color6;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
- color: @foreground;
- background: @background;
- border-color: @color4;
-}
-
-#clock {
- border: solid @color4 2px;
- padding: 0 16px;
- color: @color3;
- background: @background;
-}
-
-#window {
- margin-left: 16px;
- padding: 0;
- color: @color5;
-}
-
-#custom-wireguard {
- color: @color5;
- border: 2px solid @color8;
- background: @background;
-}
-
-#network {
- color: @background;
- border-left: 2px solid @background;
- background: @color5;
-}
-
-#pulseaudio {
- color: @background;
- background: @color4;
-}
-
-#temperature {
- color: @background;
- background: @color3;
-}
-
-#cpu {
- color: @background;
- background: @color4;
-}
-
-#custom-memory {
- padding: 0 16px;
- color: @background;
- background: @color5;
-}
-
-#custom-bluetooth {
- color: @color6;
- background: @color8;
-}
-
-#tray * {
- padding: unset;
-}
-
-#tray > .needs-attention {
- -gtk-icon-effect: highlight;
- background-color: @color1;
-}
-
-#tray > .passive {
- -gtk-icon-effect: dim;
-}
diff --git a/config/wayland/waybar/styles/colors/colors-nord b/config/wayland/waybar/styles/colors/colors-nord
deleted file mode 100644
index 9622792..0000000
--- a/config/wayland/waybar/styles/colors/colors-nord
+++ /dev/null
@@ -1,29 +0,0 @@
-@define-color foreground #d8dee9;
-@define-color background #2e3440;
-
-@define-color color0 #3b4252;
-@define-color color1 #bf616a;
-@define-color color2 #a3be8c;
-@define-color color3 #ebcb8b;
-@define-color color4 #81a1c1;
-@define-color color5 #b48ead;
-@define-color color6 #88c0d0;
-@define-color color7 #e5e9f0;
-
-@define-color color8 #4c566a;
-@define-color color9 #bf616a;
-@define-color color10 #a3be8c;
-@define-color color11 #ebcb8b;
-@define-color color12 #81a1c1;
-@define-color color13 #b48ead;
-@define-color color14 #d08770;
-@define-color color15 #eceff4;
-
-@define-color color16 #373e4d;
-@define-color color17 #94545d;
-@define-color color18 #809575;
-@define-color color19 #b29e75;
-@define-color color20 #68809a;
-@define-color color21 #8c738c;
-@define-color color22 #6d96a5;
-@define-color color23 #aeb3bb;
diff --git a/config/wayland/waybar/styles/colors/colors.css b/config/wayland/waybar/styles/colors/colors.css
deleted file mode 120000
index 801cf92..0000000
--- a/config/wayland/waybar/styles/colors/colors.css
+++ /dev/null
@@ -1 +0,0 @@
-colors-nord \ No newline at end of file
diff --git a/config/wayland/waybar/styles/dwm.css b/config/wayland/waybar/styles/dwm.css
deleted file mode 100644
index 31eacf0..0000000
--- a/config/wayland/waybar/styles/dwm.css
+++ /dev/null
@@ -1,20 +0,0 @@
-* {
- border: none;
- border-radius: 0;
- font-family: monospace;
- font-size: 14px;
- min-height: 16px;
-}
-
-window#waybar, #workspaces button.active {
- background-color: #4c566a;
-}
-
-#workspaces button, #custom-layout, #custom-status {
- background-color: #2e3440;
-}
-
-#workspaces button {
- padding: 0 2px;
- margin: 0;
-}
diff --git a/config/wayland/waybar/styles/nord.css b/config/wayland/waybar/styles/nord.css
deleted file mode 100644
index 3b7b7f6..0000000
--- a/config/wayland/waybar/styles/nord.css
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
-/* https://github.com/jakehamilton/dotfiles */
-/* Amazing I love it :))) */
-
-* {
- border: none;
- border-radius: 0;
- font-family: JetBrains Mono;
- font-weight: bold;
- font-size: 14px;
- min-height: 24px;
-}
-
-window#waybar {
- background: transparent;
-}
-
-window#waybar.hidden {
- opacity: 0.2;
-}
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
- color: #2e3440;
- background: #e6e6e6;
-}
-
-#mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory {
- margin-left: 8px;
- padding-left: 16px;
- padding-right: 16px;
-}
-
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
- margin-top: 4px;
- margin-bottom: 2px;
- transition: none;
- border-radius: 6px;
-}
-
-#battery {
- color: #b48ead;
- background: #4c566a;
-}
-
-#workspaces {
- margin-left: 12px;
- background: #2e3440;
-}
-
-#workspaces button {
- transition: none;
- color: #d8dee9;
- background: transparent;
- font-size: 16px;
-}
-
-#workspaces button.active {
- color: #a3be8c;
- text-shadow: 0px 0px 1px #a3be8c;
-}
-
-#workspaces button:hover {
- transition: none;
- color: #d08770;
-}
-
-#mpd {
- color: #2e3440;
- background: #88c0d0;
-}
-
-#mpd.disconnected,
-#mpd.stopped {
- color: #d8dee9;
- background: #2e3440;
-}
-
-#window {
- color: #88c0d0;
-}
-
-#network {
- color: #2e3440;
- background: #5e81ac;
-}
-
-#pulseaudio {
- color: #2e3440;
- background: #b48ead;
-}
-
-#temperature {
- color: #2e3440;
- background: #d08770;
-}
-
-#cpu {
- color: #2e3440;
- background: #ebcb8b;
-}
-
-#custom-memory {
- color: #2e3440;
- background: #a3be8c;
-}
-
-#clock {
- margin-left: 8px;
- margin-right: 12px;
- padding-left: 16px;
- padding-right: 16px;
- color: #d8dee9;
- background: #2e3440;
-}
-
-#tray {
- margin-right: 12px;
- color: #d8dee9;
- background: transparent;
-}
-
-#tray > .needs-attention {
- -gtk-icon-effect: highlight;
- background-color: #bf616a;
-}
-
-#tray > .passive {
- -gtk-icon-effect: dim;
-}