diff --git a/home-manager/config.kdl b/home-manager/config.kdl index 6cd90ac..e03db28 100644 --- a/home-manager/config.kdl +++ b/home-manager/config.kdl @@ -157,7 +157,7 @@ layout { // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. // Color of the ring on the active monitor. - active-color "#7fc8ff" + active-color "#db88c5" // Color of the ring on inactive monitors. inactive-color "#505050" @@ -195,7 +195,7 @@ layout { // You can enable drop shadows for windows. shadow { // Uncomment the next line to enable shadows. - // on + on // By default, the shadow draws only around its window, and not behind it. // Uncomment this setting to make the shadow draw behind its window. @@ -211,7 +211,7 @@ layout { // window. These will also remove client-side shadows if the window // draws any. // - // draw-behind-window true + draw-behind-window true // You can change how shadows look. The values below are in logical // pixels and match the CSS box-shadow properties. @@ -319,8 +319,8 @@ window-rule { // Example: enable rounded corners for all windows. // (This example rule is commented out with a "/-" in front.) -/-window-rule { - geometry-corner-radius 12 +window-rule { + geometry-corner-radius 8 clip-to-geometry true } diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 5e7b0ad..806afca 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -39,6 +39,8 @@ in }; services.gnome-keyring.enable = true; + services.playerctld.enable = true; + home.packages = with pkgs; [ audacity customPkgs.cargo-bisect-rustc diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix index d375a0d..f1b080a 100644 --- a/home-manager/waybar.nix +++ b/home-manager/waybar.nix @@ -6,7 +6,13 @@ builtins.toJSON { height = 35; spacing = 4; - modules-left = [ "systemd-failed-units" ]; + + modules-left = [ + "systemd-failed-units" + "custom/music-back" + "mpris" + "custom/music-next" + ]; modules-center = [ "clock" ]; @@ -26,6 +32,25 @@ system = true; # Monitor failed systemwide units. user = false; # Ignore failed user units. }; + "custom/music-back" = { + format = "⏴"; + tooltip = true; + tooltip-format = "Play previous song"; + on-click = "${lib.getExe pkgs.playerctl} previous"; + }; + mpris = { + format = "{status_icon} {dynamic}"; + dynamic-order = [ "title" "artist" ]; + status-icons = { + paused = "⏸"; + }; + }; + "custom/music-next" = { + format = "⏵"; + tooltip = true; + tooltip-format = "Play next song"; + on-click = "${lib.getExe pkgs.playerctl} next"; + }; clock = { interval = 1; format = "{:%a %F %H:%M:%S}"; @@ -124,18 +149,56 @@ text = '' ${builtins.readFile ./default-waybar-style.css} - #custom-power { - padding-left: 15px; - padding-right: 15px; - background-color: rebeccapurple; + window#waybar { + background: linear-gradient( + to right, + rgb(131, 80, 117) 15%, + rgb(158, 103, 143) 30%, + rgb(131, 80, 117) 45%, + #db88c5 + ); + color: black; } - #systemd-failed-units { padding-left: 30px; padding-right: 30px; background-color: red; } + + #mpris { + color: white; + } + + #custom-music-back, #custom-music-next { + font-size: 20px; + color: white; + } + + #custom-music-back { + padding: 0 10px 0 15px; + } + #custom-music-next { + padding: 0 10px; + } + + #clock { + background: unset; + color: white; + } + + #privacy *, #pulseaudio, #cpu, #memory, #tray { + background-color: unset; + color: black; + } + + #custom-power { + padding-left: 15px; + padding-right: 15px; + font-size: 30px; + background-color: rebeccapurple; + color: white; + } ''; }; }