diff --git a/flake.lock b/flake.lock index f773a1e..d0445cc 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1735978448, - "narHash": "sha256-wkeC/4GfMCJYkJWu4lbZ3rVsFuIUQeSe+SQJe8gwYGs=", + "lastModified": 1736488937, + "narHash": "sha256-RELMEuDFx9fKx5h3fWvpTR73tFAUZ0iILbjwHLVOs8w=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "13f56fc924e73ed96c2974db8daa60fba3ac620d", + "rev": "6fbbf794f2707531ae2de3c5ec20084fed49e13d", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1736421950, - "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4aebb947a301b8da8654a804979a738c5c5da50", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3a0670c..94081f1 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ nixosConfigurations = { eddie = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = { inherit inputs outputs; }; diff --git a/home/home.nix b/home/home.nix index 8c53d03..055c729 100644 --- a/home/home.nix +++ b/home/home.nix @@ -25,7 +25,7 @@ guix - mu-edit + uv just yt-dlp diff --git a/packages/mu-edit/mu-edit.nix b/packages/mu-edit/mu-edit.nix index a835cd7..f1d0bfb 100644 --- a/packages/mu-edit/mu-edit.nix +++ b/packages/mu-edit/mu-edit.nix @@ -1,22 +1,25 @@ -{ pkgs, fetchurl, lib, appimageTools, ... }: +{ pkgs, python3Packages, fetchurl, lib, ... }: -appimageTools.wrapType2 { - version = "latest"; +python3Packages.buildPythonApplication rec { pname = "mu-edit"; + version = "latest"; src = fetchurl { - url = "https://github.com/mu-editor/mu/releases/download/v1.2.0/MuEditor-Linux-1.2.0-x86_64.AppImage"; - hash = ""; + url = "https://github.com/mu-editor/mu.git"; + sha256 = ""; }; - extraPkgs = pkgs: [ - pkgs.libxcrypt.out + build-system = with python3Packages; [ + setuptools ]; + # dependencies = with python3Packages; [ + + # ]; + meta = with lib; { - description = "mu python editos"; - homepage = "https://codewith.mu/"; - downloadPage = "https://codewith.mu/en/download"; + homepage = "https://github.com/mu-editor"; + description = "mu editor"; platforms = platforms.linux; }; } diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index b90e6b6..38363eb 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -73,8 +73,6 @@ egl-wayland glfw-wayland libGL.dev - libxcrypt.out - libgcrypt.out openssl linuxKernel.packages.linux_6_12.openrazer ]; @@ -367,6 +365,9 @@ programs.appimage = { enable = true; binfmt = true; + package = pkgs.appimage-run.override { + extraPkgs = pkgs: [ pkgs.libxcrypt.out ]; + }; }; programs.nix-ld.enable = true;