trude/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved waybar and new music player

Browse Source
This commit is contained in:
TrudeEH
2024-05-11 00:30:24 +01:00
parent af1e260dc2
commit 9612bdf24f
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dotfiles/.bashrc
View File

@@ -99,6 +99,7 @@ alias ll='ls -lhi'
alias ta='tmux attach' alias ta='tmux attach'
alias t='tmux' alias t='tmux'
alias v='nvim' alias v='nvim'
alias mp='ncmpcpp' #Music Player
set completion-ignore-case On set completion-ignore-case On

6
dotfiles/.config/waybar/config
View File

@@ -9,7 +9,7 @@
"margin-left": 5, "margin-left": 5,
"margin-bottom": 0, "margin-bottom": 0,
// Choose the order of the modules // Choose the order of the modules
"modules-left": ["clock", "backlight", "battery", "tray"], "modules-left": ["clock", "backlight", "battery", "sway/scratchpad", "mpd", "tray"],
"modules-center": ["sway/workspaces"], "modules-center": ["sway/workspaces"],
"modules-right": ["wireplumber", "network", "cpu", "memory", "temperature"], "modules-right": ["wireplumber", "network", "cpu", "memory", "temperature"],
// Modules configuration // Modules configuration
@@ -48,7 +48,7 @@
"mpd": { "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} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
"format-disconnected": "Disconnected ", "format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon} Stopped ",
"unknown-tag": "N/A", "unknown-tag": "N/A",
"interval": 2, "interval": 2,
"consume-icons": { "consume-icons": {
@@ -126,7 +126,7 @@
// "thermal-zone": 2, // "thermal-zone": 2,
"hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
"critical-threshold": 80, "critical-threshold": 80,
"format-critical": "{temperatureC}°C 󰈸", "format-critical": "{temperatureC}°C 󰈸",
"format": "{temperatureC}°C {icon}", "format": "{temperatureC}°C {icon}",
"format-icons": ["󱃃", "󰔏"], "format-icons": ["󱃃", "󰔏"],
"interval": 1 "interval": 1

21
dotfiles/.config/waybar/style.css
View File

@@ -186,11 +186,11 @@ label:focus {
} }
#backlight { #backlight {
color: @pink; color: @yellow;
} }
#network { #network {
color: @cyan; color: @pink;
} }
#network.disconnected { #network.disconnected {
@@ -198,7 +198,7 @@ label:focus {
} }
#pulseaudio { #pulseaudio {
color: @green; color: @cyan;
} }
#pulseaudio.muted { #pulseaudio.muted {
@@ -206,7 +206,7 @@ label:focus {
} }
#wireplumber { #wireplumber {
color: @pink; color: @cyan;
} }
#wireplumber.muted { #wireplumber.muted {
@@ -264,20 +264,21 @@ label:focus {
} }
#mpd { #mpd {
background-color: #66cc99;
color: @purple; color: @purple;
} }
#mpd.disconnected { #mpd.disconnected {
background-color: #f53c3c; background-color: @red;
color: @base;
box-shadow: inset 0px 0px 0px 3px @base;
} }
#mpd.stopped { #mpd.stopped {
background-color: #90b1b1; color: @red;
} }
#mpd.paused { #mpd.paused {
background-color: #51a37a; color: @yellow;
} }
#language { #language {
@@ -299,9 +300,9 @@ label:focus {
} }
#scratchpad { #scratchpad {
background: rgba(0, 0, 0, 0.2); color: @yellow;
} }
#scratchpad.empty { #scratchpad.empty {
background-color: transparent; color: @cyan;
} }

16
dwl/config.def.h
View File

@@ -53,9 +53,8 @@ static const Layout layouts[] = {
/* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */ /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
static const MonitorRule monrules[] = { static const MonitorRule monrules[] = {
/* name mfact nmaster scale layout rotate/reflect x y */ /* name mfact nmaster scale layout rotate/reflect x y */
/* example of a HiDPI laptop monitor: /* example of a HiDPI monitor: */
{ "eDP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, { "DP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
*/
/* defaults */ /* defaults */
{ NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, { NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
}; };
@@ -67,6 +66,7 @@ static const struct xkb_rule_names xkb_rules = {
.options = "ctrl:nocaps", .options = "ctrl:nocaps",
*/ */
.options = NULL, .options = NULL,
.layout = "pt",
}; };
static const int repeat_rate = 25; static const int repeat_rate = 25;
@@ -76,7 +76,7 @@ static const int repeat_delay = 600;
static const int tap_to_click = 1; static const int tap_to_click = 1;
static const int tap_and_drag = 1; static const int tap_and_drag = 1;
static const int drag_lock = 1; static const int drag_lock = 1;
static const int natural_scrolling = 1; static const int natural_scrolling = 0;
static const int disable_while_typing = 1; static const int disable_while_typing = 1;
static const int left_handed = 0; static const int left_handed = 0;
static const int middle_button_emulation = 1; static const int middle_button_emulation = 1;
@@ -136,8 +136,8 @@ static const Key keys[] = {
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XKB_KEY_p, spawn, {.v = menucmd} }, { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_q, spawn, {.v = lockcmd} }, { MODKEY, XKB_KEY_q, spawn, {.v = lockcmd} },
{ MODKEY, XKB_KEY_b, togglebar, {0} }, { MODKEY, XKB_KEY_b, togglebar, {0} },
{ MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
{ MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
@@ -145,10 +145,10 @@ static const Key keys[] = {
{ MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
{ MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} }, { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
{ MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
{ MODKEY, XKB_KEY_Return, zoom, {0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, zoom, {0} },
{ MODKEY, XKB_KEY_Tab, view, {0} }, { MODKEY, XKB_KEY_Tab, view, {0} },
{ MODKEY, XKB_KEY_g, togglegaps, {0} }, { MODKEY, XKB_KEY_g, togglegaps, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, { MODKEY, XKB_KEY_c, killclient, {0} },
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },

16
dwl/config.h
View File

@@ -53,9 +53,8 @@ static const Layout layouts[] = {
/* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */ /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
static const MonitorRule monrules[] = { static const MonitorRule monrules[] = {
/* name mfact nmaster scale layout rotate/reflect x y */ /* name mfact nmaster scale layout rotate/reflect x y */
/* example of a HiDPI laptop monitor: /* example of a HiDPI monitor: */
{ "eDP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, { "DP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
*/
/* defaults */ /* defaults */
{ NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, { NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
}; };
@@ -67,6 +66,7 @@ static const struct xkb_rule_names xkb_rules = {
.options = "ctrl:nocaps", .options = "ctrl:nocaps",
*/ */
.options = NULL, .options = NULL,
.layout = "pt",
}; };
static const int repeat_rate = 25; static const int repeat_rate = 25;
@@ -76,7 +76,7 @@ static const int repeat_delay = 600;
static const int tap_to_click = 1; static const int tap_to_click = 1;
static const int tap_and_drag = 1; static const int tap_and_drag = 1;
static const int drag_lock = 1; static const int drag_lock = 1;
static const int natural_scrolling = 1; static const int natural_scrolling = 0;
static const int disable_while_typing = 1; static const int disable_while_typing = 1;
static const int left_handed = 0; static const int left_handed = 0;
static const int middle_button_emulation = 1; static const int middle_button_emulation = 1;
@@ -136,8 +136,8 @@ static const Key keys[] = {
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XKB_KEY_p, spawn, {.v = menucmd} }, { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, { MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_q, spawn, {.v = lockcmd} }, { MODKEY, XKB_KEY_q, spawn, {.v = lockcmd} },
{ MODKEY, XKB_KEY_b, togglebar, {0} }, { MODKEY, XKB_KEY_b, togglebar, {0} },
{ MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
{ MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
@@ -145,10 +145,10 @@ static const Key keys[] = {
{ MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
{ MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} }, { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
{ MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
{ MODKEY, XKB_KEY_Return, zoom, {0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, zoom, {0} },
{ MODKEY, XKB_KEY_Tab, view, {0} }, { MODKEY, XKB_KEY_Tab, view, {0} },
{ MODKEY, XKB_KEY_g, togglegaps, {0} }, { MODKEY, XKB_KEY_g, togglegaps, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, { MODKEY, XKB_KEY_c, killclient, {0} },
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },

3
install.sh
View File

@@ -15,7 +15,8 @@ fi
paru -Sy curl git stow bat fzf less nextcloud-client paru -Sy curl git stow bat fzf less nextcloud-client
# Install DE # Install DE
paru -Sy dunst xdg-desktop-portal-wlr xdg-desktop-portal swaybg swaylock waybar wofi foot grim slurp wl-clipboard wlroots wayland-protocols xorg-xwayland paru -Sy mpd ncmpcpp dunst xdg-desktop-portal-wlr xdg-desktop-portal swaybg swaylock waybar wofi foot grim slurp wl-clipboard wlroots wayland-protocols xorg-xwayland
sudo systemctl enable mpd
cd dwl cd dwl
sudo make clean install sudo make clean install
cd .. cd ..