diff --git a/flake.lock b/flake.lock index 27268bd..3648736 100644 --- a/flake.lock +++ b/flake.lock @@ -87,43 +87,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprspace", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "astal": { "inputs": { "nixpkgs": [ @@ -269,22 +232,6 @@ } }, "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-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -360,7 +307,7 @@ "stylix", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "stylix", "nixpkgs" @@ -381,29 +328,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "stylix", @@ -485,309 +409,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks": "pre-commit-hooks", - "systems": [ - "hyprspace", - "systems" - ], - "xdph": "xdph" - }, - "locked": { - "lastModified": 1739815352, - "narHash": "sha256-JqMiCMkkOOq5380y7S/xgBG9yd2C7/KjDbXqu4vLe2A=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "d01f9943e1d401b09fc53be3c161279ab4f2c5ba", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprspace": { - "inputs": { - "hyprland": "hyprland", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1742767019, - "narHash": "sha256-FdyHDbf31jl5rIU7IQtBVTbZ1ojGrrp5aFaRrE2819s=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "5b62529c2011ede6069445de9b5b3f8a1f10ecfe", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1711523803, @@ -836,22 +457,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1747953325, "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", @@ -905,30 +510,6 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "ags": "ags", @@ -937,8 +518,7 @@ "apple-fonts": "apple-fonts", "fingerprint-sensor": "fingerprint-sensor", "home-manager": "home-manager", - "hyprspace": "hyprspace", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "stylix": "stylix" } }, @@ -1033,7 +613,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", @@ -1042,7 +622,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1080,21 +660,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1211,53 +776,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprspace", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprspace", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bf29d79..2477d89 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,10 @@ apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; stylix.url = "github:danth/stylix/release-25.05"; apple-emoji.url = "github:oxcl/apple-emoji-nix"; - ags.url = "github:Aylur/ags"; fingerprint-sensor.url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor/24.11"; android-nixpkgs.url = "github:tadfisher/android-nixpkgs"; - hyprspace.url = "github:KZDKM/Hyprspace"; + ags.url = "github:Aylur/ags"; android-nixpkgs.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -43,6 +42,7 @@ { ddt4all = import ./shells/ddt4all.nix { inherit pkgs; }; android = import ./shells/android.nix { inherit pkgs android-nixpkgs; }; + dioxus = import ./shells/dioxus.nix { inherit pkgs; }; rust = import ./shells/rust.nix { inherit pkgs; }; } ); diff --git a/shells/dioxus.nix b/shells/dioxus.nix new file mode 100644 index 0000000..550265b --- /dev/null +++ b/shells/dioxus.nix @@ -0,0 +1,33 @@ +{ pkgs, ... }: + +pkgs.mkShell { + strictDeps = true; + nativeBuildInputs = with pkgs; [ + gcc + openssl + pkg-config + rustup + dioxus-cli + rustPlatform.bindgenHook + ]; + + buildInputs = with pkgs; [ + atkmm + cairo + gdk-pixbuf + glib + gtk3 + pango + webkitgtk_4_1 + xdotool + ]; + + GDK_BACKEND = "x11"; + PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; + RUSTC_VERSION = "nightly"; + WEBKIT_DISABLE_DMABUF_RENDERER = 1; + shellHook = '' + export PATH="''${CARGO_HOME:-~/.cargo}/bin":"$PATH" + export PATH="''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-${pkgs.stdenv.hostPlatform.rust.rustcTarget}/bin":"$PATH" + ''; +}