diff --git a/machines/terra/modules.nix b/machines/terra/modules.nix index 82b368f..eec563b 100644 --- a/machines/terra/modules.nix +++ b/machines/terra/modules.nix @@ -26,7 +26,7 @@ }; wm = { - plasma.enable = true; + hyprland.enable = true; }; hardware = { diff --git a/modules/wm/hyprland/config/eww/eww.yuck b/modules/wm/hyprland/config/eww/eww.yuck index 1e3e614..a525fcc 100644 --- a/modules/wm/hyprland/config/eww/eww.yuck +++ b/modules/wm/hyprland/config/eww/eww.yuck @@ -1,12 +1,33 @@ -(defwindow example +(defwindow main :monitor 0 :geometry (geometry :x "0%" - :y "20px" - :width "90%" - :height "30px" - :anchor "top center") + :y "0%" + :width "50%" + :height "50%" + :anchor "center") :stacking "fg" - :reserve (struts :distance "40px" :side "top") - :windowtype "dock" - :exclusive true - "horseman's laptop") + :exclusive false + :focusable false + (workspaces) +) + +(defwidget clock [] + (box :class "clock" + {formattime(EWW_TIME, "%b %m %H:%M:%S")} + ) +) + +(defwidget workspaces [] + (box :class "workspaces" + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + (button :class "workspace-button") + ) +) diff --git a/modules/wm/hyprland/config/hypr/monitors.conf b/modules/wm/hyprland/config/hypr/monitors.conf index 8ca2063..3969ff1 100644 --- a/modules/wm/hyprland/config/hypr/monitors.conf +++ b/modules/wm/hyprland/config/hypr/monitors.conf @@ -2,6 +2,8 @@ monitor = eDP-1, 1920x1080@60, 0x0, 1 # terra monitors +monitor = DP-1, 2560x1440, 0x0, 1 +monitor = DP-2, 2560x1440, 2560x0, 1 # default monitor config monitor=,preferred,auto,auto diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index e5bda3f..9b8c059 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -34,12 +34,10 @@ in { HandlePowerKey=ignore ''; - system.activationScripts.script.text = '' - cd /home/horseman && \ - rm -r .config/hypr && \ - cp -r nix-config/modules/wm/hyprland/config \ - .config/hypr && \ + cd /home/horseman; + rm -r .config/hypr .config/eww; + cp -r nix-config/modules/wm/hyprland/config/* .config ''; }; }