diff --git a/flake.nix b/flake.nix index cb17246..1fa2b54 100644 --- a/flake.nix +++ b/flake.nix @@ -101,6 +101,7 @@ (import ./packages) { inherit flake-utils nixpkgs; deprekages = self.outputs.packages; + esp-dev = esp-dev.outputs.packages; } # diff --git a/nixos/packages/default.pkgs.nix b/nixos/packages/default.pkgs.nix index 8493fb4..dcb5c63 100644 --- a/nixos/packages/default.pkgs.nix +++ b/nixos/packages/default.pkgs.nix @@ -87,6 +87,7 @@ with pkgs; hexyl htop imagemagick + inetutils jq jre jmtpfs @@ -152,7 +153,7 @@ with pkgs; )) # Reversing. - #binwalk + binwalk # Development. colmena diff --git a/nixos/packages/flatpak.nix b/nixos/packages/flatpak.nix index 7398a7f..5d93e49 100644 --- a/nixos/packages/flatpak.nix +++ b/nixos/packages/flatpak.nix @@ -9,5 +9,19 @@ appId = "org.kde.kitinerary-workbench"; origin = "kitinerary"; } + { + appId = "com.github.vikdevelop.photopea_app"; + origin = "flathub"; + } ]; + + services.flatpak.overrides = { + + # Try to use Wayland whenever possible. + global = { + Context.sockets = [ "wayland" ]; + Environment.ELECTRON_ELECTRON_OZONE_PLATFORM_HINT = "wayland"; + }; + + }; } diff --git a/nixos/packages/offline.pkgs.nix b/nixos/packages/offline.pkgs.nix index f722b74..15b621d 100644 --- a/nixos/packages/offline.pkgs.nix +++ b/nixos/packages/offline.pkgs.nix @@ -30,6 +30,7 @@ with pkgs; python3 cfr procyon + esp-dev.esp-idf-full # Build systems. cmake @@ -81,7 +82,6 @@ with pkgs; if pkgs.stdenv.isDarwin then [ - esp-dev.esp-idf-full ] else diff --git a/packages/default.nix b/packages/default.nix index 66c1529..019593c 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -5,6 +5,7 @@ flake-utils, deprekages, nixpkgs, + esp-dev }: flake-utils.lib.eachDefaultSystem ( @@ -112,6 +113,9 @@ flake-utils.lib.eachDefaultSystem ( # plasma kde-karousel = callPackage ./kde-karousel.nix { }; + # esp32 + esp-env = esp-dev.${system}.esp-idf-full; + # xonsh and xontribs xonsh-with-xontribs = pkgs.xonsh.override { extraPackages = pythonPackages: [