feat: migrate osk-toggle to eww widget

configs/eww/colors.scss

@@ -1,6 +1,6 @@
 $darkbg: #0b0d16;
-$bg: rgb(24, 27, 35); //rgba(69, 71, 90, 0.3); #0d0f18;
-$contrastbg: #0f111a;
+$bg: rgb(40, 42, 54); //rgba(69, 71, 90, 0.3); #0d0f18;
+$contrastbg: rgba(189, 147, 249, 0.8);
 $bgSecondary: #11131c;
 $bgSecondaryAlt: #a5b6cf;
 $fg: #a5b6cf;

configs/eww/traybuttons/traybuttons.scss

@@ -1,6 +1,13 @@
+.osk-toggle {
+  font-size: 30px;
+  min-height: 26px;
+  min-width: 50px;
+  padding: 0px 0px 0px 5px;
+}
+
 .notif-panel {
   min-width: 50px;
-  min-height: 16px;
+  min-height: 26px;
   font-size: 20px;
   padding: 2px 25px 2px 35px;
 }
@@ -15,7 +22,7 @@
   transition: border-color 0.5s ease-in-out;
   color: #CBA6F7;
   border-radius: 80px;
-  border: 3px solid $contrastbg;
+  border: 2px solid #1b1b2b;
 }
 
 .toggle-off:hover {
@@ -28,7 +35,7 @@
   transition: border-color 0.5s ease-in-out;
   color: #CBA6F7;
   border-radius: 80px;
-  border: 3px solid #CBA6F7;
+  border: 2px solid $contrastbg;
 }
 
 .toggle-on:hover {

configs/eww/traybuttons/traybuttons.yuck

@@ -1,3 +1,32 @@
+(defvar osk-toggle-state false)
+
+(defwidget osk-toggle []
+  (eventbox :class {osk-toggle-state ? "toggle-on" : "toggle-off"}
+            :onclick "$HYPR_PATH/osk-toggle.sh toggle &"
+    (box  :class "osk-toggle"
+          :space-evenly true
+          :spacing 6
+          :orientation "h"
+      (label :text " 󰌌 ")
+    )
+  )
+)
+
+(defwindow osk-toggle
+  :monitor 0
+  :stacking "overlay"
+  :exclusive "ignore"
+  :geometry (geometry :x "10px"
+                      :y "9px"
+                      :width "0px"
+                      :height "0px"
+                      :anchor "top left"
+            )
+  (osk-toggle)
+)
+
+
+
 (defvar toggle-state false)
 
 (defwidget tablet-toggle []
@@ -17,7 +46,7 @@
   :monitor 0
   :stacking "overlay"
   :exclusive "ignore"
-  :geometry (geometry :x "66px"
+  :geometry (geometry :x "72px"
                       :y "9px"
                       :width "0px"
                       :height "0px"
@@ -26,6 +55,8 @@
   (tablet-toggle)
 )
 
+
+
 (defvar notif-panel-state false)
 
 (defwidget notif-panel []
@@ -46,7 +77,7 @@
   :stacking "overlay"
   :exclusive "ignore"
   :geometry (geometry :x "50px"
-                      :y "10px"
+                      :y "11px"
                       :width "0px"
                       :height "0px"
                       :anchor "top right"

configs/hypr/main.conf

@@ -26,6 +26,9 @@ exec-once = bash -c "sleep 7; GalaxyBudsClient /StartMinimized"
 exec-once = eww daemon
 exec-once = eww open tablet-toggle
 exec-once = eww open notif-panel
+exec-once = eww open osk-toggle
+# TODO: put this in eww configs?
+exec-once = $HYPR_PATH/osk-toggle.sh getState
 
 # sometimes waybar starts after and stops me from pressing eww buttons
 exec-once = bash -c "sleep 0.5; eww reload"
@@ -158,6 +161,8 @@ windowrule = float,^(com.nextcloud.desktopclient.nextcloud)$
 windowrule = move cursor 0 25,^(com.nextcloud.desktopclient.nextcloud)$
 windowrule = size 400 581,^(com.nextcloud.desktopclient.nextcloud)$
 
+windowrule = tile,^(photoshop.exe)$
+
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
@@ -217,6 +222,7 @@ bindm = $mainMod, mouse:273, resizewindow
 
 # Take a screenshot
 bind =, Print, exec, bash -c 'grim -g "$(slurp)" - | swappy -f -'
+bind = $mainMod SHIFT, C, exec, wl-color-picker
 
 # Volume control
 binde =, XF86AudioRaiseVolume, exec, swayosd --output-volume raise

configs/hypr/scripts/osk-toggle.sh

@@ -1,10 +1,35 @@
 #!/usr/bin/env bash
 
-if [[ $(busctl get-property --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) == "b true" ]]
-then
+state () {
+    if [[ $(busctl get-property --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) == "b true" ]]; then
         echo "Running"
-    busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
-else
+        eww update osk-toggle-state=true
+    else
         echo "Stopped"
+        eww update osk-toggle-state=false
+    fi
+}
+                                                
+toggle () {
+    if [[ $(busctl get-property --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) == "b true" ]]; then
+        echo "Running"
+        eww update osk-toggle-state=false
+        busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
+    else
+        echo "Stopped"
+        eww update osk-toggle-state=true
         busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+    fi
+}
+
+if [[ $1 == "getState" ]]; then
+    while true; do
+        sleep 0.2
+        state
+    done
 fi
+
+if [[ $1 == "toggle" ]];then
+    toggle
+fi
+

configs/swaync/config.json

@@ -96,7 +96,7 @@
         },
         {
           "label": "󰍃",
-          "command": "swaync-client -cp; sleep 1; eww open closer; $EWW_PATH/open.sh powermenu"
+          "command": "swaync-client -cp; sleep 0.9; eww open closer; $EWW_PATH/open.sh powermenu"
         }
       ]
     }

configs/swaync/style.css

@@ -324,7 +324,7 @@
 
 .widget-volume {
   background-color: @background;
-  padding: 4px 8px 8px 8px;
+  padding: 4px 16px 8px 8px;
   margin: 0px 8px 8px 8px;
   font-size: x-large;
   border-bottom: 2px solid @accent;
@@ -336,7 +336,7 @@
 
 .widget-backlight {
   background-color: @background;
-  padding: 8px 8px 4px 8px;
+  padding: 8px 16px 4px 8px;
   margin: 8px 8px 0px 8px;
   font-size: x-large;
   border-top: 2px solid @accent;

nixos/cfg/boot.nix

@@ -37,8 +37,10 @@
 
     plymouth = {
       enable = true;
-      themePackages = [ pkgs.catppuccin-plymouth ];
-      theme = "catppuccin-macchiato";
+      #themePackages = [ pkgs.catppuccin-plymouth ];
+      #theme = "catppuccin-macchiato";
+      themePackages = [ (with import <nixpkgs> {}; callPackage ../overlays/dracula-plymouth.nix {}) ];
+      theme = "dracula";
     };
   };
 }

nixos/cfg/packages.nix

@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{config, pkgs, lib, ...}:
 
 {
   services = {
@@ -6,12 +6,21 @@
       enable = true;
       layout = "ca";
       displayManager = {
-        gdm = {
+        sddm = {
           enable = true;
-          wayland = true;
+          settings = {
+            General = {
+              DisplayServer = "wayland";
+              InputMethod = "";
+            };
+            Wayland.CompositorCommand = "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so";
+            Theme = {
+              Current = "Dracula";
+              ThemeDir = "${pkgs.dracula-theme}/share/sddm/themes";
+            };
+          };
         };
         sessionPackages = [
-          pkgs.gnome.gnome-session.sessions # gnome session needed to fix bugs
           (builtins.getFlake "github:hyprwm/Hyprland").packages.x86_64-linux.default
         ];
         defaultSession = "hyprland";
@@ -39,6 +48,7 @@
         "/nix/var/log/nix"
         "/proc"
         "/run/user/1000"
+        "${pkgs.findutils}/" # doesn't work?
       ];
     };
   };
@@ -153,6 +163,8 @@
     evtest
     plasma5Packages.kio-admin
     plasma5Packages.ksshaskpass
+    plasma5Packages.plasma-framework
+    plasma5Packages.plasma-workspace
   ];
 
   fonts = {

nixos/home/packages.nix

@@ -26,6 +26,7 @@
     (with python311Packages; [
       python
       pyclip
+      gdown
 
     ]) ++
     (with plasma5Packages; [
@@ -74,6 +75,8 @@
     dracula-theme
     dracula-icon-theme
     steam-run
+    wineWowPackages.stable
+    cabextract
     qt5.qtwayland
     qt6.qtwayland
     bottles-unwrapped

nixos/overlays/dracula-plymouth.nix

@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkgs
+}:
+
+stdenv.mkDerivation {
+  name = "dracula-plymouth";
+  version = "unstable-2023-01-13";
+
+  src = fetchFromGitHub {
+    repo = "plymouth";
+    owner = "dracula";
+    rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96";
+    hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/plymouth/themes
+    mv ./dracula $out/share/plymouth/themes/
+
+    sed -i "s@\/usr\/@$out\/@" $out/share/plymouth/themes/dracula/dracula.plymouth
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A dark theme for Plymouth";
+    homepage = "https://github.com/dracula/plymouth/tree/main";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matt1432 ];
+    platforms = platforms.all;
+  };
+}