Johan Rong 2 ヶ月 前
コミット
900304a770

+ 3 - 3
flake.lock

@@ -138,11 +138,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1781436694,
-        "narHash": "sha256-GEaelUWqx1cwiXWsygsOFAuKGIsgXAwfu9ymoTNFMz8=",
+        "lastModified": 1781440097,
+        "narHash": "sha256-8kUbdvwDl1zosO6FdRAyCpPu90deZ2vxf9wlLROOfYg=",
         "owner": "johron",
         "repo": "swayodroid-shell",
-        "rev": "ebac313ebde2879e8d508b805be44b8891e183af",
+        "rev": "8d1523aeea833798035fc706a3a350c63386a341",
         "type": "github"
       },
       "original": {

+ 1 - 1
home/features/desktop/sway/default.nix

@@ -11,7 +11,7 @@
     ./ui/waybar
     ./ui/mako.nix
 
-    ./swayodroid
+    #./swayodroid
 
     ./theming/notwaita.nix
     ./theming/breeze-dark.nix

+ 2 - 2
home/features/desktop/sway/swayodroid/default.nix

@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   imports = [
-    #inputs.swayodroid.homeManagerModules.default
+    inputs.swayodroid.homeManagerModules.default
   ];
 }

+ 0 - 38
home/features/desktop/sway/swayodroid/default_.nix

@@ -1,38 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  swayodroid-shell = pkgs.fetchFromGitHub {
-    owner = "johron";
-    repo = "swayodroid-shell";
-    rev = "main"; 
-    hash = "sha256-bFQp3EnWMxaadviMtDCbReveJBVFUqmSp68L8825KIU=";
-  };
-
-  customQuickshell = pkgs.symlinkJoin {
-    name = "quickshell-wrapped";
-    paths = [ pkgs.quickshell ];
-    buildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
-      wrapProgram $out/bin/qs \
-        --prefix QML2_IMPORT_PATH : "${lib.makeSearchPath "lib/qt-6/qml" (with pkgs.kdePackages; [
-          qtdeclarative
-          qt5compat
-          qtsvg
-          qtimageformats
-          qtmultimedia
-        ])}"
-    '';
-  };
-in
-{
-  home.packages = [
-    customQuickshell
-  ];
-
-  programs.quickshell = {
-    enable = true;
-    package = customQuickshell;
-  };
-
-  home.file.".config/quickshell/swayodroid".source = swayodroid-shell;
-}