diff --git a/flake.lock b/flake.lock index 377c404..0a6686d 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1660758990, - "narHash": "sha256-1vmRcG7JAR3KMVpn2z5LQYoAQlY6cWUYSIP77gfpHbo=", + "lastModified": 1661669123, + "narHash": "sha256-nXslD8Sbs6G9/MN7HOr+YrBCCmUdS/MpEuxJGlWeSgM=", "owner": "zhaofengli", "repo": "colmena", - "rev": "3fbc5eeb11e6b9abf66e38ab32d85a2edf9f76e1", + "rev": "e7356e2c5cbc19be6e04d284c943b24bbde81a9b", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1661598115, - "narHash": "sha256-KL3VtSjHMYaTQDQ4MAtw7VTRu4XlyGY79byEnwb8CZs=", + "lastModified": 1661698908, + "narHash": "sha256-CkdZIP11mxahqOuADBkuKFP/dokMn6mj2ZyiicJ2utU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5d63152219514ecbe861cb70e9359adc0c5b2878", + "rev": "c757fa54e10bd0f486c70e32ecca366247281824", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1661565271, - "narHash": "sha256-GTa5fSSifG57cDaklJfVj4MpWl/1vqiSPu4My2wLkVc=", + "lastModified": 1661652237, + "narHash": "sha256-HYZazJYnrSvgTN26lSI5JC8iTxTeGb+MrbSDb+k6b6I=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "4724b9ab810125bc71dbbeca22237532cb61831b", + "rev": "3982e2afdb23f980e07a473472bf333178a87a5c", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1661580117, - "narHash": "sha256-hMWvEFqwk2E9Rb3+3yi8qu9Wo2eXnJX8mENVspA++3c=", + "lastModified": 1661663669, + "narHash": "sha256-TsVDHYX9boTJPsgzGrQLZN5hv5V96pUVL5RgK5yLKPY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e500665539e3abae0494c4db5d10cccb84de47ba", + "rev": "6cae4be2a768154ae9815d8238f00b03a89ea21f", "type": "github" }, "original": { diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 39fc687..27303bc 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -92,7 +92,7 @@ in gtk = { enable = true; theme = { - name = "Catppuccin-Purple-Dark"; + name = "Catppuccin-Pink-Dark"; package = pkgs.catppuccin-gtk; }; iconTheme = { diff --git a/nixos/hosts/thalassa/null/home/eww/eww.scss b/nixos/hosts/thalassa/null/home/eww/eww.scss index 8a3dece..b3cb3fd 100644 --- a/nixos/hosts/thalassa/null/home/eww/eww.scss +++ b/nixos/hosts/thalassa/null/home/eww/eww.scss @@ -1,23 +1,42 @@ -$base: #44465c; -$blue: #3fc6de; -$surface0: #44465c; -$surface1: #44465c; -$text: #d9e0ee; -$overlay0: #6e738d; -$red: #ec6a88; -$peach: #efb993; -$yellow: #efb993; -$mauve: #b072d1; -$green: #3fdaa4; -$mantle: #292a37; -$crust: #2e303e; $light-gray: #9699b7; +$rosewater: #f2d5cf; +$flamingo: #eebebe; +$pink: #f4b8e4; +$mauve: #ca9ee6; +$red: #e78284; +$maroon: #ea999c; +$peach: #ef9f76; +$yellow: #e5c890; +$green: #a6d189; +$teal: #81c8be; +$sky: #99d1db; +$sapphire: #85c1dc; +$blue: #8caaee; +$lavender: #babbf1; +$text: #c6d0f5; +$subtext1: #b5bfe2; +$subtext0: #a5adce; +$overlay2: #949cbb; +$overlay1: #838ba7; +$overlay0: #737994; +$surface2: #626880; +$surface1: #51576d; +$surface0: #414559; +$base: #303446; +$mantle: #292c3c; +$crust: #232634; + * { all: unset; //Unsets everything so you can style everything from scratch font-family: "JetBrainsMono" } +tooltip { + background-color: $base; + border-radius: 5px +} + .icon { font-family: monospace; font-size: 1.4rem; @@ -28,7 +47,7 @@ button { } .active { - color: $green; + color: $pink; font-size: 1.4rem; } @@ -48,7 +67,7 @@ button { .wifi { font-size: 2rem; - color: $blue; + color: $mauve; } .clock { @@ -63,6 +82,7 @@ button { .date { font-size: 1.5rem; + color: $text; } .reg-btn { @@ -71,110 +91,15 @@ button { border-radius: 10px; } -.powerbutton { - color: $red; -} - -.powerbutton:hover { - background-color: $base; -} - -.powerbutton:active { - background-color: $red; - color: $mantle; -} .battery { font-size: 1.5rem; - color: $green; + color: $teal; } .volume { font-size: 1.5rem; - color: $blue; -} - -// Credits AlphaTechnolog -.powermenu-box { - padding: 0 2px; - margin: 7px 7px 7px 0px; - background: inherit; - - .dispatcher { - border-radius: 15px; - background: $base; - color: $red; - font-size: 14px; - padding: 0 14px 0 10px; - - &:hover { - background-color: $surface0; - } - - &:active { - background-color: $surface1; - } - } -} - -// powermenu -.powermenu-container { - background: $crust; - color: $text; - padding: 10px; - font-size: 55px; - border-radius: 5px; - - transition: all 200ms cubic-bezier(.1, -0.00, .0, 1.49); - - .btn { - margin: 1rem; - } - - // shutdown - .shutdown-btn-box .btn { - color: $red; - border-radius: 15px; - background-color: $mantle; - - &:hover { - background-color: $base; - } - - &:active { - background-color: $surface1; - } - } - - // reboot - .reboot-btn-box .btn { - color: $mauve; - border-radius: 15px; - background-color: $mantle; - - &:hover { - background-color: $base; - } - - &:active { - background-color: $surface1; - } - } - - // exit - .exit-btn-box .btn { - color: $yellow; - border-radius: 15px; - background-color: $mantle; - - &:hover { - background-color: $base; - } - - &:active { - background-color: $surface1; - } - } + color: $mauve; } // battery menu @@ -249,4 +174,4 @@ calendar.highlight { calendar:indeterminate { color: $text; -} +} \ No newline at end of file diff --git a/nixos/hosts/thalassa/null/home/eww/eww.yuck b/nixos/hosts/thalassa/null/home/eww/eww.yuck index 6767601..fbf04d3 100644 --- a/nixos/hosts/thalassa/null/home/eww/eww.yuck +++ b/nixos/hosts/thalassa/null/home/eww/eww.yuck @@ -1,7 +1,6 @@ (defwidget bar [] (centerbox :orientation "v" :hexpand false (box :valign "start" :hexpand false :vexpand true :orientation "v" :space-evenly false - (powerbutton) ) (workspaces :halign "center" :vexpand true :hexpand false :orientation "v") @@ -36,22 +35,21 @@ ;; ━━━ BATTERY ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ (defwidget battery [] (eventbox :onclick "eww open batterywindow --toggle" - (label :text `${ - EWW_BATTERY.BAT0.status == "Charging" ? "" : - EWW_BATTERY.BAT0.capacity < 10 ? "" : - EWW_BATTERY.BAT0.capacity < 20 ? "" : - EWW_BATTERY.BAT0.capacity < 30 ? "" : - EWW_BATTERY.BAT0.capacity < 40 ? "" : - EWW_BATTERY.BAT0.capacity < 50 ? "" : - EWW_BATTERY.BAT0.capacity < 60 ? "" : - EWW_BATTERY.BAT0.capacity < 70 ? "" : - EWW_BATTERY.BAT0.capacity < 80 ? "" : - EWW_BATTERY.BAT0.capacity < 90 ? "" : "" - }` - :limit-width 10 - :tooltip "${EWW_BATTERY.BAT0.status}: ${EWW_BATTERY.BAT0.capacity}%" - :class "battery" - )) + (label :text `${ + EWW_BATTERY.BAT0.status == "Charging" ? "" : + EWW_BATTERY.BAT0.capacity < 10 ? "" : + EWW_BATTERY.BAT0.capacity < 20 ? "" : + EWW_BATTERY.BAT0.capacity < 30 ? "" : + EWW_BATTERY.BAT0.capacity < 40 ? "" : + EWW_BATTERY.BAT0.capacity < 50 ? "" : + EWW_BATTERY.BAT0.capacity < 60 ? "" : + EWW_BATTERY.BAT0.capacity < 70 ? "" : + EWW_BATTERY.BAT0.capacity < 80 ? "" : + EWW_BATTERY.BAT0.capacity < 90 ? "" : "" + }` + :limit-width 10 + :class "battery" + )) ) (defwidget batterymenu [] @@ -121,51 +119,6 @@ :height "60px") (cal)) -;; powermenu - -(defwidget powerbutton [] - (eventbox :cursor "hand" - (button :class "reg-btn powerbutton" - :onclick "eww open powermenu --toggle &" "") - ) -) -(defwidget powermenucontent [] - (box :orientation "h" - :class "powermenu-container" - (box :class "shutdown-btn-box" - :orientation "h" - (button :class "btn" - :tooltip "Shutdown" - :onclick "eww close powermenu && shutdown now" - "⏻") - ) - (box :class "reboot-btn-box" - :orientation "h" - (button :class "btn" - :tooltip "Reboot" - :onclick "eww close powermenu && reboot" - "") - ) - (box :class "exit-btn-box" - :orientation "h" - (button :class "btn" - :tooltip "Suspend" - :onclick "systemctl suspend" - "⏾") - ) - ) -) - -(defwindow powermenu - :monitor 0 - :geometry (geometry :x "0%" - :y "0%" - :width "30%" - :height "15%" - :anchor "center center") - :wm-ignore true - (powermenucontent)) - (deflisten workspaces_listen "./scripts/workspaces.sh") (defwidget workspaces [] (literal :content workspaces_listen))