diff options
| -rw-r--r-- | machines/moissanite/devices.nix | 3 | ||||
| -rw-r--r-- | modules/hardware/arm.nix | 6 | ||||
| -rw-r--r-- | modules/packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/equibop.nix | 28 |
5 files changed, 4 insertions, 37 deletions
diff --git a/machines/moissanite/devices.nix b/machines/moissanite/devices.nix index f934a4e..13dfeeb 100644 --- a/machines/moissanite/devices.nix +++ b/machines/moissanite/devices.nix @@ -63,9 +63,6 @@ # included here for flake purity. peripheralFirmwareDirectory = ../../assets/m1-firmware; - # mesa - useExperimentalGPUDriver = true; - experimentalGPUInstallMode = "replace"; # probably no longer used. # sound setupAsahiSound = true; }; diff --git a/modules/hardware/arm.nix b/modules/hardware/arm.nix index 63a448f..28e0644 100644 --- a/modules/hardware/arm.nix +++ b/modules/hardware/arm.nix @@ -1,7 +1,7 @@ { me, lib, - auxiliaryPkgs, + pkgs, ... }: @@ -17,7 +17,7 @@ assert lib.assertMsg ( # used to include replacements for necessary programs with no # default support for aarch64. (i.e. discord) - environment.systemPackages = with auxiliaryPkgs; [ - equibop # discord + environment.systemPackages = with pkgs; [ + vesktop ]; } diff --git a/modules/packages.nix b/modules/packages.nix index f10e946..229d181 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -33,7 +33,7 @@ in # bitwigs bubblewrap configuration requires some non-ARM package sets. # bitwig-studio ungoogled-chromium librewolf lagrange - senpai signal-desktop alpaca newsflash + senpai signal-desktop newsflash qemu_full virtiofsd openvpn openvpn3 update-resolv-conf diff --git a/pkgs/default.nix b/pkgs/default.nix index f5229fe..eeeb5a7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -18,6 +18,4 @@ wine = pkgs.callPackage ./wine.nix { }; yubikey-touch-detector = pkgs.callPackage ./yubikey-touch-detector { }; - - equibop = pkgs.callPackage ./equibop.nix { }; } diff --git a/pkgs/equibop.nix b/pkgs/equibop.nix deleted file mode 100644 index 2e3c3e3..0000000 --- a/pkgs/equibop.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - equibop, - imagemagick, - ... -}: - -equibop.overrideAttrs ( - final: prev: { - nativeBuildInputs = prev.nativeBuildInputs ++ [ - imagemagick - ]; - - postBuild = - prev.postBuild - + '' - pushd build - - for size in 16 24 32 48 64 128 256 512 1024; do - mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ ! -e icon_"$size"x"$size"x32.png ] ; then - convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png - fi - done; - - popd - ''; - } -) |