From 39ae22d7dc348635459ea4f95974a2f57e5497b4 Mon Sep 17 00:00:00 2001
From: worble <worble@worble.xyz>
Date: Tue, 21 Jan 2025 00:31:24 +0000
Subject: [PATCH] enable waydroid; use vscode tailwind extension because it
 supports the latest beta; update lock file

---
 flake.lock                          | 24 ++++++++++++------------
 home-manager/development/vscode.nix | 11 +++++++----
 modules/virtualisation.nix          |  3 +++
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 98c812f..8b3c4f3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736711425,
-        "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=",
+        "lastModified": 1737038063,
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1736905608,
-        "narHash": "sha256-X3GTP2N81pbNlOM1EnClwPtuceURCBk86A3k/D73cUo=",
+        "lastModified": 1737337847,
+        "narHash": "sha256-1j7wMhzpTUIkfXnsgTDr4c6dIKAHAAXDr3ojgs0n3HE=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "7c871333a5fbdce2b44e773ad590d743691513e2",
+        "rev": "83e447a2ae38dc584ce572d0d80847e3d53fac90",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1736883708,
-        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1736867362,
-        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
+        "lastModified": 1737299813,
+        "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
+        "rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix
index ea7119d..d2ea204 100644
--- a/home-manager/development/vscode.nix
+++ b/home-manager/development/vscode.nix
@@ -1,7 +1,8 @@
 { inputs, pkgs, ... }:
 
 let
-  vs-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
+  openvsx-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
+  vscode-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
 in
 {
   home.packages = with pkgs;[
@@ -13,7 +14,7 @@ in
       enable = true;
       package = pkgs.vscodium;
       mutableExtensionsDir = false;
-      extensions = with vs-extensions;[
+      extensions = with openvsx-extensions;[
         biomejs.biome
         mkhl.direnv
         dracula-theme.theme-dracula
@@ -22,14 +23,13 @@ in
         pkief.material-icon-theme
         jnoortheen.nix-ide
         esbenp.prettier-vscode
-        bradlc.vscode-tailwindcss
         humao.rest-client
         loriscro.super
         mads-hartmann.bash-ide-vscode
         foxundermoon.shell-format
         dart-code.flutter
         ms-vscode.wasm-wasi-core
-      ];
+      ] ++ [ vscode-extensions.bradlc.vscode-tailwindcss ];
       userSettings = with pkgs;{
         "workbench.iconTheme" = "material-icon-theme";
         "window.titleBarStyle" = "custom";
@@ -58,6 +58,9 @@ in
         "[typescriptreact]" = {
           "editor.defaultFormatter" = "biomejs.biome";
         };
+        "[json]" = {
+          "editor.defaultFormatter" = "biomejs.biome";
+        };
         "[jsonc]" = {
           "editor.defaultFormatter" = "biomejs.biome";
         };
diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix
index 774985f..7cc6f1e 100644
--- a/modules/virtualisation.nix
+++ b/modules/virtualisation.nix
@@ -17,6 +17,9 @@
       # Required for containers under podman-compose to be able to talk to each other.
       defaultNetwork.settings.dns_enabled = true;
     };
+    waydroid = {
+      enable = true;
+    };
   };
   programs.virt-manager.enable = true;
 }