From dce6a6cafb0c08d4b0abc7043bff44a5a18a3343 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Fri, 21 Aug 2026 11:20:15 +0200 Subject: [PATCH] feat: prepare for DMS removal --- TODO.md | 8 - config/gtk-3.0/gtk.css | 1 + config/gtk-4.0/gtk.css | 0 config/hypr/hyprland/binds/device.lua | 19 --- config/hypr/hyprland/binds/main.lua | 5 +- config/hypr/hyprland/binds/notifications.lua | 12 +- config/hypr/hyprland/execs.lua | 5 +- config/hypr/hyprlauncher.conf | 3 + config/matugen/README.md | 21 ++- config/matugen/config.toml | 22 +++ .../post-hook-scripts/gtk-themes-reload.sh | 13 ++ config/matugen/templates/gtk/colors.css | 22 +++ .../matugen/templates/hyprland/hyprpaper.conf | 5 + .../templates/hyprland/hyprtoolkit.conf | 4 + config/matugen/templates/qt/colors.colors | 149 ++++++++++++++++++ config/matugen/templates/swaync/colors.css | 7 + config/matugen/templates/waybar/colors.css | 7 + config/qt5ct/qt5ct.conf | 4 + config/qt6ct/qt6ct.conf | 4 + config/swaync/style.css | 1 + config/waybar/config.jsonc | 26 ++- config/waybar/quickactions.xml | 28 ++++ config/waybar/style.css | 115 ++++++++++++++ setup.sh | 12 +- 24 files changed, 432 insertions(+), 61 deletions(-) create mode 100644 config/gtk-3.0/gtk.css create mode 100644 config/gtk-4.0/gtk.css create mode 100644 config/hypr/hyprlauncher.conf create mode 100644 config/matugen/post-hook-scripts/gtk-themes-reload.sh create mode 100644 config/matugen/templates/gtk/colors.css create mode 100644 config/matugen/templates/hyprland/hyprpaper.conf create mode 100644 config/matugen/templates/qt/colors.colors create mode 100644 config/matugen/templates/swaync/colors.css create mode 100644 config/matugen/templates/waybar/colors.css create mode 100644 config/qt5ct/qt5ct.conf create mode 100644 config/qt6ct/qt6ct.conf create mode 100644 config/swaync/style.css create mode 100644 config/waybar/quickactions.xml create mode 100644 config/waybar/style.css diff --git a/TODO.md b/TODO.md index e817dfc..945c24c 100644 --- a/TODO.md +++ b/TODO.md @@ -1,16 +1,8 @@ # TODOs -- [X] Notifications management via dms -- [X] Launcher via dms -- [X] DMS screenshots -- [X] Hyprland theming using mutagen with dms integration -- [ ] DMS config sync to here using script - [ ] Remove `decman` because it's a pain and use smaller scope `archmgr` (only copy all files to locations always and package diff) - [ ] Generate matugen stuff from colour in new script -- [X] Binds for other DMS features (with subcommand) - [X] Finish decman config -- [X] Remove wlogout and replace with dms setup - [ ] Yazi theming - [X] Kitty theming - [ ] Fish theming - [ ] Fastfetch theming -- [X] DMS instead of Hyprlock for locker? diff --git a/config/gtk-3.0/gtk.css b/config/gtk-3.0/gtk.css new file mode 100644 index 0000000..23668bd --- /dev/null +++ b/config/gtk-3.0/gtk.css @@ -0,0 +1 @@ +@import 'colors.css'; diff --git a/config/gtk-4.0/gtk.css b/config/gtk-4.0/gtk.css new file mode 100644 index 0000000..e69de29 diff --git a/config/hypr/hyprland/binds/device.lua b/config/hypr/hyprland/binds/device.lua index 31dd063..6091e4e 100644 --- a/config/hypr/hyprland/binds/device.lua +++ b/config/hypr/hyprland/binds/device.lua @@ -33,31 +33,12 @@ hl.define_submap("device", function() hl.dispatch(hl.dsp.exec_cmd("notify-send 'Enabled Trackpad' --app-name='Hyprctl'")) end, { description = "Enable trackpad" }) - -- ── DMS controls ───────────────────────────────────────────────── -- clipboard history hl.bind("h", function() hl.dispatch(hl.dsp.exec_cmd("dms ipc call clipboard toggle")) exit_submap() end, { description = "Toggle clipboard history panel" }) - -- Dash - hl.bind("d", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call dash toggle")) - exit_submap() - end, { description = "Toggle DMS dash (top left)" }) - - -- Wallpaper - hl.bind("w", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call dankdash wallpaper")) - exit_submap() - end, { description = "Open DMS wallpaper picker" }) - - -- Settings - hl.bind("s", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call settings toggle")) - exit_submap() - end, { description = "Toggle DMS settings" }) - hl.bind("Escape", function() exit_submap() end) diff --git a/config/hypr/hyprland/binds/main.lua b/config/hypr/hyprland/binds/main.lua index edf7d3e..5357b50 100644 --- a/config/hypr/hyprland/binds/main.lua +++ b/config/hypr/hyprland/binds/main.lua @@ -8,8 +8,5 @@ hl.bind("SUPER + A", hl.dsp.submap("workspace"), { description = "Workspace cont hl.bind("SUPER + P", hl.dsp.submap("groupedlaunch"), { description = "Launch groups of programs" }) hl.bind("SUPER + Q", hl.dsp.window.close(), { description = "Close active window" }) -hl.bind("SUPER + Space", hl.dsp.exec_cmd("dms ipc call spotlight toggle"), { description = "Toggle app launcher" }) -hl.bind("SUPER + SHIFT + Space", hl.dsp.exec_cmd("dms ipc call spotlight-bar toggle"), { description = "Toggle app launcher as small bar" }) +hl.bind("SUPER + Space", hl.dsp.exec_cmd("hyprlauncher"), { description = "Toggle app launcher" }) hl.bind("SUPER + Escape", hl.dsp.exec_cmd("wlogout"), { description = "Toggle logout screen" }) -hl.bind("SUPER + I", hl.dsp.exec_cmd("dms ipc call control-center open"), { description = "Toggle control centre" }) -hl.bind("SUPER + CTRL + H", hl.dsp.exec_cmd("dms ipc call keybinds toggle hyprland"), { description = "Toggle keybinds panel" }) diff --git a/config/hypr/hyprland/binds/notifications.lua b/config/hypr/hyprland/binds/notifications.lua index 51c1fb8..e673428 100644 --- a/config/hypr/hyprland/binds/notifications.lua +++ b/config/hypr/hyprland/binds/notifications.lua @@ -4,32 +4,32 @@ end hl.define_submap("notifications", function() hl.bind("c", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call notifications dismissAllPopups")) + hl.dispatch(hl.dsp.exec_cmd("swaync-client --hide-all")) exit_submap() end, { description = "Hide notifications" }) hl.bind("d", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call notifications clearAll")) + hl.dispatch(hl.dsp.exec_cmd("swaync-client --close-all")) exit_submap() end, { description = "Delete all notifications" }) hl.bind("m", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call notifications toggleDoNotDisturb")) + hl.dispatch(hl.dsp.exec_cmd("swaync-client -d")) exit_submap() end, { description = "Toggle Do Not Disturb" }) hl.bind("h", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call notifications close")) + hl.dispatch(hl.dsp.exec_cmd("swaync-client -cp")) exit_submap() end, { description = "Close notification panel" }) hl.bind("s", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call notifications open")) + hl.dispatch(hl.dsp.exec_cmd("swaync-client -op")) exit_submap() end, { description = "Open notification panel" }) hl.bind("t", function() - hl.dispatch(hl.dsp.exec_cmd("dms ipc call notifications toggle")) + hl.dispatch(hl.dsp.exec_cmd("swaync-client -t")) exit_submap() end, { description = "Toggle notification panel" }) diff --git a/config/hypr/hyprland/execs.lua b/config/hypr/hyprland/execs.lua index 8ef1346..b4df7b5 100644 --- a/config/hypr/hyprland/execs.lua +++ b/config/hypr/hyprland/execs.lua @@ -15,8 +15,11 @@ return function(is_laptop) -- Start bar and utilities hl.exec_cmd("hypridle") + hl.exec_cmd("waybar") + hl.exec_cmd("hyprpaper") + hl.exec_cmd("swaync") + hl.exec_cmd("hyprlauncher -d") hl.exec_cmd("nextcloud --background") - hl.exec_cmd("dms run") hl.exec_cmd("wl-paste --watch cliphist store") if is_laptop then diff --git a/config/hypr/hyprlauncher.conf b/config/hypr/hyprlauncher.conf new file mode 100644 index 0000000..97df5c1 --- /dev/null +++ b/config/hypr/hyprlauncher.conf @@ -0,0 +1,3 @@ +ui { + window_size = 800 400 +} diff --git a/config/matugen/README.md b/config/matugen/README.md index 352835b..7d7e345 100644 --- a/config/matugen/README.md +++ b/config/matugen/README.md @@ -1,9 +1,16 @@ # Matugen configs -Shamelessly copied from [End-4's dotfiles](https://github.com/end-4/dots-hyprland/tree/main/dots/.config/matugen) +Sources: +- [End-4's dotfiles](https://github.com/end-4/dots-hyprland/tree/main/dots/.config/matugen) +- [InioX matugen themes](https://github.com/InioX/matugen-themes) - -# TODOs -- [ ] Custom yazi theme -- [ ] Qt theme -- [X] Remove unneeded elements -- [ ] Quickshell stuff +## Config files +- Hyprland (my own) +- Hyprlock (my own) +- Hyprtoolkit (my own) +- Yazi (my own) +- Wlogout (Colour template files from InioX) +- Waybar (Colour template files from InioX) +- Discord theme (fully from InioX) +- GTK (From InioX) +- Swaync (from InioX) +- Qt TODO! diff --git a/config/matugen/config.toml b/config/matugen/config.toml index dd91637..9257db0 100644 --- a/config/matugen/config.toml +++ b/config/matugen/config.toml @@ -1,6 +1,28 @@ [config] version_check = false +# From https://github.com/InioX/matugen-themes +[templates.gtk3] +input_path = '~/.config/matugen/templates/gtk/colors.css' +output_path = '~/.config/gtk-3.0/colors.css' +post_hook = 'gsettings set org.gnome.desktop.interface gtk-theme ""; gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-{{mode}}' + +[templates.gtk4] +input_path = '~/.config/matugen/templates/gtk/colors.css' +output_path = '~/.config/gtk-4.0/colors.css' +post_hook = '~/.config/matugen/post-hook-scripts/gtk-themes-reload.sh' + +[templates.swaync] +input_path = '~/.config/matugen/templates/swaync/colors.css' +output_path = "~/.config/swaync/colors.css" +post_hook = "swaync-client -rs" + +[templates.color-scheme] +input_path = '~/.config/matugen/templates/qt/colors.colors' +output_path = '~/.local/share/color-schemes/Matugen.colors' + + +# My own [templates.hyprland] input_path = '~/.config/matugen/templates/hyprland/colors.lua' output_path = '~/.config/hypr/hyprland/colors.lua' diff --git a/config/matugen/post-hook-scripts/gtk-themes-reload.sh b/config/matugen/post-hook-scripts/gtk-themes-reload.sh new file mode 100644 index 0000000..87bbd54 --- /dev/null +++ b/config/matugen/post-hook-scripts/gtk-themes-reload.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Thanks to https://github.com/InioX/matugen-themes/blob/main/post-hook-scripts/gtk-themes-reload.sh + +current=$(gsettings get org.gnome.desktop.interface color-scheme) + +if [[ "$current" == "'prefer-dark'" ]]; then + gsettings set org.gnome.desktop.interface color-scheme prefer-light + gsettings set org.gnome.desktop.interface color-scheme prefer-dark +else + gsettings set org.gnome.desktop.interface color-scheme prefer-dark + gsettings set org.gnome.desktop.interface color-scheme prefer-light +fi diff --git a/config/matugen/templates/gtk/colors.css b/config/matugen/templates/gtk/colors.css new file mode 100644 index 0000000..a3676c4 --- /dev/null +++ b/config/matugen/templates/gtk/colors.css @@ -0,0 +1,22 @@ +/* +* GTK Colors +* Generated with Matugen +*/ + +@define-color accent_color {{colors.primary_fixed_dim.default.hex}}; +@define-color accent_fg_color {{colors.on_primary_fixed.default.hex}}; +@define-color accent_bg_color {{colors.primary_fixed_dim.default.hex}}; +@define-color window_bg_color {{colors.surface_dim.default.hex}}; +@define-color window_fg_color {{colors.on_surface.default.hex}}; +@define-color headerbar_bg_color {{colors.surface_dim.default.hex}}; +@define-color headerbar_fg_color {{colors.on_surface.default.hex}}; +@define-color popover_bg_color {{colors.surface_dim.default.hex}}; +@define-color popover_fg_color {{colors.on_surface.default.hex}}; +@define-color view_bg_color {{colors.surface.default.hex}}; +@define-color view_fg_color {{colors.on_surface.default.hex}}; +@define-color card_bg_color {{colors.surface.default.hex}}; +@define-color card_fg_color {{colors.on_surface.default.hex}}; +@define-color sidebar_bg_color @window_bg_color; +@define-color sidebar_fg_color @window_fg_color; +@define-color sidebar_border_color @window_bg_color; +@define-color sidebar_backdrop_color @window_bg_color; diff --git a/config/matugen/templates/hyprland/hyprpaper.conf b/config/matugen/templates/hyprland/hyprpaper.conf new file mode 100644 index 0000000..7a68f4c --- /dev/null +++ b/config/matugen/templates/hyprland/hyprpaper.conf @@ -0,0 +1,5 @@ +wallpaper { + monitor = + path = {{image}} + fit_mode = cover +} diff --git a/config/matugen/templates/hyprland/hyprtoolkit.conf b/config/matugen/templates/hyprland/hyprtoolkit.conf index 325aca0..3b2e75a 100644 --- a/config/matugen/templates/hyprland/hyprtoolkit.conf +++ b/config/matugen/templates/hyprland/hyprtoolkit.conf @@ -8,3 +8,7 @@ accent = rgba({{colors.primary.default.hex_stripped}}FF) accent_secondary = rgba({{colors.secondary.default.hex_stripped}}FF) font_family = Comfortaa font_family_monospace = Source Code Pro +font_size = 13 +h1_size = 22 +h2_size = 18 +h3_size = 15 diff --git a/config/matugen/templates/qt/colors.colors b/config/matugen/templates/qt/colors.colors new file mode 100644 index 0000000..76bdcd5 --- /dev/null +++ b/config/matugen/templates/qt/colors.colors @@ -0,0 +1,149 @@ +[ColorEffects:Disabled] +Color={{colors.surface_dim.default.hex}} +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color={{colors.surface_variant.default.hex}} +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=false +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate={{colors.surface_container_low.default.hex}} +BackgroundNormal={{colors.surface_container_high.default.hex}} +DecorationFocus={{colors.primary.default.hex}} +DecorationHover={{colors.primary.default.hex}} +ForegroundActive={{colors.primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary.default.hex}} +ForegroundNegative={{colors.error.default.hex}} +ForegroundNeutral={{colors.tertiary.default.hex}} +ForegroundNormal={{colors.on_surface.default.hex}} +ForegroundPositive={{colors.tertiary_fixed.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[Colors:Complementary] +BackgroundAlternate={{colors.surface_container_low.default.hex}} +BackgroundNormal={{colors.surface.default.hex}} +DecorationFocus={{colors.primary.default.hex}} +DecorationHover={{colors.primary.default.hex}} +ForegroundActive={{colors.primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary.default.hex}} +ForegroundNegative={{colors.error.default.hex}} +ForegroundNeutral={{colors.tertiary.default.hex}} +ForegroundNormal={{colors.on_primary_container.default.hex}} +ForegroundPositive={{colors.tertiary_fixed.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[Colors:Header] +BackgroundAlternate={{colors.surface.default.hex}} +BackgroundNormal={{colors.surface_container.default.hex}} +DecorationFocus={{colors.primary.default.hex}} +DecorationHover={{colors.primary.default.hex}} +ForegroundActive={{colors.primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary.default.hex}} +ForegroundNegative={{colors.error.default.hex}} +ForegroundNeutral={{colors.tertiary.default.hex}} +ForegroundNormal={{colors.on_surface.default.hex}} +ForegroundPositive={{colors.tertiary_fixed.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[Colors:Header][Inactive] +BackgroundAlternate={{colors.surface_container.default.hex}} +BackgroundNormal={{colors.surface_container.default.hex}} +DecorationFocus={{colors.primary.default.hex}} +DecorationHover={{colors.primary.default.hex}} +ForegroundActive={{colors.primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary.default.hex}} +ForegroundNegative={{colors.error.default.hex}} +ForegroundNeutral={{colors.tertiary.default.hex}} +ForegroundNormal={{colors.on_surface.default.hex}} +ForegroundPositive={{colors.tertiary_fixed.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[Colors:Selection] +BackgroundAlternate={{colors.surface_container_low.default.hex}} +BackgroundNormal={{colors.primary.default.hex}} +DecorationFocus={{colors.primary.default.hex}} +DecorationHover={{colors.primary.default.hex}} +ForegroundActive={{colors.on_primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary_fixed.default.hex}} +ForegroundNegative={{colors.error_container.default.hex}} +ForegroundNeutral={{colors.tertiary_fixed_dim.default.hex}} +ForegroundNormal={{colors.secondary_fixed.default.hex}} +ForegroundPositive={{colors.tertiary_container.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[Colors:Tooltip] +BackgroundAlternate={{colors.surface.default.hex}} +BackgroundNormal={{colors.surface_container.default.hex}} +DecorationFocus={{colors.primary.default.hex}} +DecorationHover={{colors.primary.default.hex}} +ForegroundActive={{colors.primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary.default.hex}} +ForegroundNegative={{colors.error.default.hex}} +ForegroundNeutral={{colors.tertiary.default.hex}} +ForegroundNormal={{colors.on_background.default.hex}} +ForegroundPositive={{colors.tertiary_fixed.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[Colors:View] +BackgroundAlternate={{colors.surface_container.default.hex}} +BackgroundNormal={{colors.background.default.hex}} +DecorationFocus={{colors.primary_container.default.hex}} +DecorationHover={{colors.on_primary.default.hex}} +ForegroundActive={{colors.primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary.default.hex}} +ForegroundNegative={{colors.error.default.hex}} +ForegroundNeutral={{colors.tertiary.default.hex}} +ForegroundNormal={{colors.on_background.default.hex}} +ForegroundPositive={{colors.tertiary_fixed.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[Colors:Window] +BackgroundAlternate={{colors.primary_container.default.hex}} +BackgroundNormal={{colors.surface_container.default.hex}} +DecorationFocus={{colors.primary.default.hex}} +DecorationHover={{colors.primary.default.hex}} +ForegroundActive={{colors.primary.default.hex}} +ForegroundInactive={{colors.on_surface_variant.default.hex}} +ForegroundLink={{colors.secondary.default.hex}} +ForegroundNegative={{colors.error.default.hex}} +ForegroundNeutral={{colors.tertiary.default.hex}} +ForegroundNormal={{colors.on_background.default.hex}} +ForegroundPositive={{colors.tertiary_fixed.default.hex}} +ForegroundVisited={{colors.on_secondary_container.default.hex}} + +[General] +ColorScheme=Matugen +Name=Matugen + +[Appearance] +color_scheme=Matugen + +[KDE] +contrast=4 + +[WM] +activeBackground={{colors.primary_container.default.hex}} +activeBlend={{colors.on_primary_container.default.hex}} +activeForeground={{colors.on_primary_container.default.hex}} +inactiveBackground={{colors.surface.default.hex}} +inactiveBlend={{colors.on_surface_variant.default.hex}} +inactiveForeground={{colors.on_surface_variant.default.hex}} diff --git a/config/matugen/templates/swaync/colors.css b/config/matugen/templates/swaync/colors.css new file mode 100644 index 0000000..f246856 --- /dev/null +++ b/config/matugen/templates/swaync/colors.css @@ -0,0 +1,7 @@ +/* +* Css Colors +* Generated with Matugen +*/ +<* for name, value in colors *> + @define-color {{name}} {{value.default.hex}}; +<* endfor *> diff --git a/config/matugen/templates/waybar/colors.css b/config/matugen/templates/waybar/colors.css new file mode 100644 index 0000000..f246856 --- /dev/null +++ b/config/matugen/templates/waybar/colors.css @@ -0,0 +1,7 @@ +/* +* Css Colors +* Generated with Matugen +*/ +<* for name, value in colors *> + @define-color {{name}} {{value.default.hex}}; +<* endfor *> diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf new file mode 100644 index 0000000..4e22385 --- /dev/null +++ b/config/qt5ct/qt5ct.conf @@ -0,0 +1,4 @@ +color_scheme_path=~/.local/share/color-schemes/Matugen.colors +custom_palette=true +icon_theme=breeze +style=Darkly diff --git a/config/qt6ct/qt6ct.conf b/config/qt6ct/qt6ct.conf new file mode 100644 index 0000000..4e22385 --- /dev/null +++ b/config/qt6ct/qt6ct.conf @@ -0,0 +1,4 @@ +color_scheme_path=~/.local/share/color-schemes/Matugen.colors +custom_palette=true +icon_theme=breeze +style=Darkly diff --git a/config/swaync/style.css b/config/swaync/style.css new file mode 100644 index 0000000..7b0f310 --- /dev/null +++ b/config/swaync/style.css @@ -0,0 +1 @@ +@import "colors.css"; diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 2870ad0..26d0cdc 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -7,16 +7,17 @@ "gtk-layer-shell": true, "height": 0, "modules-left": [ - "clock", + "clock", "cpu", "memory", "hyprland/workspaces" ], - "modules-center": ["hyprland/window"], + "modules-center": [ + "hyprland/window" + ], "modules-right": [ "tray", "network", - "custom/dualsense", "pulseaudio", "pulseaudio#microphone", "custom/powerMenu" @@ -38,6 +39,12 @@ "format": "⏻", "on-click": "rofi -show p -modi p:rofi-power-menu -theme ~/.config/rofi/themes/power.rasi" }, + "custom/quickactions": { + "format": "", + "menu": "on-click", + "menu-file": "~/.config/waybar/quickactions.xml", + "menu-actions": {} + }, "network": { "format-disconnected": " Net", "format-wifi": "{icon} {essid}", @@ -46,7 +53,12 @@ "tooltip-format-wifi": "Wi-Fi\nSSID: {essid}\nIP: {ipaddr}\nSignal strength: {signalStrength}%\nUp/Down (bps): {bandwidthUpBits}/{bandwidthDownBits}\nFrequency: {frequency}GHz", "tooltip-format-disconnected": "Networking\n{ifname} disconnected", "on-click": "terminator -x nmtui", - "format-icons": ["", "", "", ""] + "format-icons": [ + "", + "", + "", + "" + ] }, "clock": { "format": "{:%a, %d.%m %H:%M:%S}", @@ -83,7 +95,11 @@ "phone": "", "portable": "", "car": "🏎", - "default": ["", "", ""] + "default": [ + "", + "", + "" + ] } }, "pulseaudio#microphone": { diff --git a/config/waybar/quickactions.xml b/config/waybar/quickactions.xml new file mode 100644 index 0000000..fe42050 --- /dev/null +++ b/config/waybar/quickactions.xml @@ -0,0 +1,28 @@ + + + + + + Suspend + + + + + Hibernate + + + + + Shutdown + + + + + + + + Reboot + + + + diff --git a/config/waybar/style.css b/config/waybar/style.css new file mode 100644 index 0000000..0c6ed36 --- /dev/null +++ b/config/waybar/style.css @@ -0,0 +1,115 @@ +@import "colors.css"; + +* { + border: none; + border-radius: 0; + font-family: 'FluentSystemIcons-Regular,Comfortaa', monospace; + font-weight: bold; + font-size: 13px; + min-height: 0; + margin-left: 3px; + margin-right: 3px; +} + +window#waybar { + background: rgba(0, 0, 0, 0); + color: #cc5c00; +} + +tooltip { + background: black; + border-radius: 10px; + border-width: 2px; + border-style: solid; + border-color: #cc5c00; +} + +#workspaces button { + padding: 3px; + color: #a79f9d; + margin-right: 5px; +} + +#workspaces button.active { + color: white; +} + +#workspaces button.focused { + color: white; + background: #cc5c00; + border-radius: 10px; +} + +#workspaces button.urgent { + color: white; + background: #cc5c00; + border-radius: 10px; +} + +#workspaces button:hover { + background: white; + color: #cc5c00; + border-radius: 10px; +} + +#workspaces { + background: black; + border-radius: 10px; + margin-left: 10px; + padding-right: 0px; + padding-left: 5px; +} + +#window, +#clock, +#custom-powerMenu, +#pulseaudio, +#memory, +#tray, +#custom-dualsense, +#network, +#workspaces, +#cpu { + background: black; + padding: 4px 12px; + margin: 3px 2px; + margin-top: 9px; + border: 1px solid rgb(204, 92, 0); + border-radius: 10px; +} + +#tray { + border-radius: 10px; + margin-right: 10px; +} + +#cpu { + margin-right: 0; + border-radius: 10px 0px 0px 10px; + background-color: #010006; +} + +#memory { + margin-left: 0; + border-radius: 0px 10px 10px 0px; + background-color: #010006; +} + +#window { + border-radius: 10px; + margin-left: 60px; + margin-right: 60px; +} + +#clock { + color: #009e58; + min-width: 125px; +} + +#pulseaudio { + color: #9b1603; +} + +#pulseaudio.microphone { + color: rgb(167, 159, 157); +} diff --git a/setup.sh b/setup.sh index 737b9d9..36e9c65 100755 --- a/setup.sh +++ b/setup.sh @@ -37,18 +37,8 @@ rm -rf ~/.config/ags rm -rf ~/.config/astal cp -r ./config/* ~/.config -# Makes kitty use the DMS theme config +# Makes kitty use the matugen theme config rm ~/.config/kitty/current-theme.conf cp ./linters/indentconfig_import.yaml ~/.indentconfig.yaml -confirmation="" -read -p "Use repo version of DMS config? (y/N) " confirmation -if [[ "$confirmation" == "y" ]]; then - cp -r ./dms/* ~/.config/DankMaterialShell/ -else - cp -r ~/.config/DankMaterialShell/settings.json ./dms - cp -r ~/.config/DankMaterialShell/plugin_settings.json ./dms - cp -r ~/.config/DankMaterialShell/.firstlaunch ./dms -fi - hyprctl reload