From 7673a3ba71a0db1e35c9d12bca725164fc355eae Mon Sep 17 00:00:00 2001
From: "Jill \"oatmealine\" Monoids" <oatmealine@disroot.org>
Date: Tue, 16 Apr 2024 16:05:00 +0300
Subject: [PATCH] universal transmutation resulting in explosion of half the
 atoms in the universe

---
 flake.lock                          | 52 +++++++++++++++++++++++++++++
 flake.nix                           |  2 ++
 modules/desktop/waybar.nix          | 10 ++++--
 modules/software/editors/vscode.nix |  3 +-
 overlays/waybar.nix                 | 31 -----------------
 5 files changed, 64 insertions(+), 34 deletions(-)
 delete mode 100644 overlays/waybar.nix

diff --git a/flake.lock b/flake.lock
index 12cd976..5385a9d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -167,6 +167,22 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -676,6 +692,22 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "catppuccin-vsc": "catppuccin-vsc",
@@ -690,6 +722,7 @@
         "nix-colors": "nix-colors",
         "nixpkgs": "nixpkgs_8",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "waybar": "waybar",
         "waybar-catppuccin": "waybar-catppuccin"
       }
     },
@@ -798,6 +831,25 @@
         "type": "github"
       }
     },
+    "waybar": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs_9"
+      },
+      "locked": {
+        "lastModified": 1712127529,
+        "narHash": "sha256-R3yPS5ktvzhUI+TeHTDkbKgiA8SDvozu33azFUeMVoo=",
+        "owner": "Alexays",
+        "repo": "Waybar",
+        "rev": "42dc9cb85f27e3db02da83cd13624cfc5a7191d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Alexays",
+        "repo": "Waybar",
+        "type": "github"
+      }
+    },
     "waybar-catppuccin": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 460d93a..68170be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,8 @@
     catppuccin-vsc.url = "github:catppuccin/vscode";
 
     crystal-flake.url = "github:manveru/crystal-flake";
+    
+    waybar.url = "github:Alexays/Waybar";
 
     hyprland.url = "github:hyprwm/Hyprland";
     hyprlock.url = "github:hyprwm/hyprlock";
diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix
index 2ec496c..7b1ac7f 100644
--- a/modules/desktop/waybar.nix
+++ b/modules/desktop/waybar.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, inputs, ... }:
+{ lib, config, pkgs, inputs, system, ... }:
 
 with lib;
 let
@@ -6,12 +6,18 @@ let
 in {
   options.modules.desktop.waybar = {
     enable = mkEnableOption "Enable Waybar, a lightweight desktop environment based on GTK+";
+    package = mkOption {
+      type = types.package;
+      default = inputs.waybar.packages.${system}.default;
+      example = "pkgs.waybar";
+    };
   };
 
   config = mkIf cfg.enable {
-    hm.wayland.windowManager.hyprland.settings.exec-once = [ "${lib.getExe pkgs.waybar}" ];
+    hm.wayland.windowManager.hyprland.settings.exec-once = [ "${lib.getExe cfg.package}" ];
     hm.programs.waybar = {
       enable = true;
+      package = cfg.package;
       style = builtins.concatStringsSep "\n" [
         "@import \"${inputs.waybar-catppuccin}/themes/mocha.css\";"
         (lib.readFile ../../config/waybar.css)
diff --git a/modules/software/editors/vscode.nix b/modules/software/editors/vscode.nix
index 63d111d..2c2490e 100644
--- a/modules/software/editors/vscode.nix
+++ b/modules/software/editors/vscode.nix
@@ -15,6 +15,7 @@ in {
         jnoortheen.nix-ide
         sumneko.lua
         ms-vsliveshare.vsliveshare
+        svelte.svelte-vscode
       ];
       mutableExtensionsDir = false;
       enableExtensionUpdateCheck = false;
@@ -57,4 +58,4 @@ in {
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/overlays/waybar.nix b/overlays/waybar.nix
deleted file mode 100644
index d865892..0000000
--- a/overlays/waybar.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-final: prev: {
-  waybar = prev.waybar.overrideAttrs ( old: {
-    version = "0.10.0";
-
-    src = prev.fetchFromGitHub {
-      owner = "Alexays";
-      repo = "Waybar";
-      rev = "0.10.0";
-      hash = "sha256-p1VRrKT2kTDy48gDXPMHlLbfcokAOFeTZXGzTeO1SAE=";
-    };
-
-    # fix gtk-layer-shell issue
-    mesonFlags = builtins.filter (a: !(prev.lib.strings.hasInfix "gtk-layer-shell" a)) old.mesonFlags;
-
-    # fix cava version mismatch issue
-    postUnpack = let 
-      # Derived from subprojects/cava.wrap
-      libcava.src = prev.fetchFromGitHub {
-        owner = "LukashonakV";
-        repo = "cava";
-        rev = "0.10.1";
-        hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw=";
-      };
-    in ''
-      pushd "$sourceRoot"
-      cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1
-      patchShebangs .
-      popd
-    '';
-  } );
-}
\ No newline at end of file