From 2b1ab1608dfdb92f5861cb96a4ca4bf3e30ee17d Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sat, 15 Jul 2023 00:45:09 -0400
Subject: [PATCH] feat: use sddm20 and a bunch of dracula stuff

---
 configs/eww/colors.scss             |  4 +--
 configs/swaync/config.json          |  6 ++---
 configs/swaync/style.css            |  4 +--
 nixos/cfg/boot.nix                  |  6 +++--
 nixos/cfg/packages.nix              | 20 ++++++++++++---
 nixos/overlays/dracula-plymouth.nix | 39 +++++++++++++++++++++++++++++
 6 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 nixos/overlays/dracula-plymouth.nix

diff --git a/configs/eww/colors.scss b/configs/eww/colors.scss
index 276d10e..e2e0908 100644
--- a/configs/eww/colors.scss
+++ b/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;
diff --git a/configs/swaync/config.json b/configs/swaync/config.json
index 4d782a1..b9adb94 100644
--- a/configs/swaync/config.json
+++ b/configs/swaync/config.json
@@ -44,12 +44,12 @@
   ],
   "widget-config": {
     "backlight": {
-      "label": "󰃟 ",
+      "label": "󰃟  ",
       "device": "amdgpu_bl0",
       "min": 10
     },
     "volume": {
-      "label": "󰕾 "
+      "label": "󰕾  "
     },
     "inhibitors": {
       "text": "Inhibitors",
@@ -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"
         }
       ]
     }
diff --git a/configs/swaync/style.css b/configs/swaync/style.css
index 51ccfc6..ebb9ba1 100644
--- a/configs/swaync/style.css
+++ b/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;
diff --git a/nixos/cfg/boot.nix b/nixos/cfg/boot.nix
index 6783307..75b4af5 100644
--- a/nixos/cfg/boot.nix
+++ b/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";
     };
   };
 }
diff --git a/nixos/cfg/packages.nix b/nixos/cfg/packages.nix
index 16d44d4..c6ff7a9 100644
--- a/nixos/cfg/packages.nix
+++ b/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 = {
diff --git a/nixos/overlays/dracula-plymouth.nix b/nixos/overlays/dracula-plymouth.nix
new file mode 100644
index 0000000..4b1eb30
--- /dev/null
+++ b/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;
+  };
+}