dotnix @main -
refs -
log -
-
https://git.jolheiser.com/dotnix.git
chore: move prospect-mail to NUR
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmSq3YMACgkQuFOtpdp7
v3qt0hAAyXm6bndwjB3zPPJCq5ex1/fXzF04ymkE0nNTaMwfWCLZi0aqzJ6UcnMb
My4EPkk7lgQXhFN9HIVw6XNpFn7Aotdf0VuvUpqQDuJADHbC2+65EdmEtf82zC2S
l67CRHL6I+ITNXnTiqEo3HVi04Xp86fytvebASp8dJJbfJZY4bSt35LFSVvEzkEM
/36vm8wDH1QHrO4/2CkehDlrnlLtMuVYcp4KqkG6QBRltZthceaTH9KG44yHkASu
9j7bMRfxv19lWU7djIBJOLQ1egJ8VVFDvHRFyjFSxqYO3zzrG5p+ECfvEjUMd+uy
Czr92occ6KYtOcdYSxQ4vUIrJXhSzO4aDVt8rx5cdEen0ywk4j21WO1xaqAm4LMd
XhL0bDxmHFQFVhuUz0FuDFc0MaE5iKs7w/eeNM8ITS5kifFM6A1Q738+ZubhFCCC
+m9LZn0fpetDuDWHDrGhixgeFCD76cFdqA/uco6tTStk+VicdmMCeEtb26Se0Djd
/vWlRMSi6y6z9iInjjd1jffMwmp40oS/PdahI0VKj2KNFFweAFvMYtIcsiKjuz8r
VqASkJ37xVUug6YVMCHe7lKzUMFmJ0tzFx2Q2VXE0NuXCmudpq9vAxJf0k4VLY7L
hO/xKXS59JcRU3+KiKJT6eaXI0Dhwxbf2z5mmrDY8qQGkmi9Lwo=
=jI5V
-----END PGP SIGNATURE-----
diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index a285cfd3153330b2f3f2b7617c5572077184f0e2..0a3f5dad12923c5c1aeb5b1237d15d518ee9b66a 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -44,10 +44,6 @@ shell = pkgs.nushell;
};
in {
- imports = [./hardware.nix ../common];
- "nodejs-16.20.1"
- ];
-in {
kernelPackages = pkgs.linuxPackages_latest;
globalprotect-openconnect
jetbrains.pycharm-professional
@@ -57,9 +53,9 @@ teams-for-linux
xorg.xauth
imports = [./hardware.nix ../common];
- imports = [./hardware.nix ../common];
+ kernelParams = ["quiet" "splash"];
imports = [./hardware.nix ../common];
-
+ loader.efi.canTouchEfiVariables = true;
];
system.stateVersion = "22.11";
diff --git a/pkgs/prospect-mail/default.nix b/pkgs/prospect-mail/default.nix
deleted file mode 100644
index cf8675e14c544e09b4152184955a7315742bff9f..0000000000000000000000000000000000000000
--- a/pkgs/prospect-mail/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- makeWrapper,
- makeDesktopItem,
- copyDesktopItems,
- nodejs_16,
- fetchYarnDeps,
- fixup_yarn_lock,
- electron,
- libpulseaudio,
- pipewire,
- alsa-utils,
- which,
-}:
-stdenv.mkDerivation rec {
- pname = "prospect-mail";
- version = "0.4.0";
-
- src = fetchFromGitHub {
- owner = "julian-alarcon";
- repo = pname;
- rev = "v${version}";
- sha256 = "sha256-MIQgJFTqXuhShEU+iAV1VS2TAq1d/fQXU1Rct1XIEsM=";
- };
-
- offlineCache = fetchYarnDeps {
- yarnLock = "${src}/yarn.lock";
- sha256 = "sha256-rN15aGTROnfUgws7f+U8DXcj5dL6MC8DqUE+uxfH1Zo=";
- };
-
- nativeBuildInputs = [nodejs_16.pkgs.yarn fixup_yarn_lock nodejs_16 copyDesktopItems makeWrapper];
-
- configurePhase = ''
- runHook preConfigure
-
- export HOME=$(mktemp -d)
- yarn config --offline set yarn-offline-mirror $offlineCache
- fixup_yarn_lock yarn.lock
- yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
- patchShebangs node_modules/
-
- runHook postConfigure
- '';
-
- buildPhase = ''
- runHook preBuild
-
- yarn --offline electron-builder \
- --dir ${
- if stdenv.isDarwin
- then "--macos"
- else "--linux"
- } ${
- if stdenv.hostPlatform.isAarch64
- then "--arm64"
- else "--x64"
- } \
- -c.electronDist=${electron}/lib/electron \
- -c.electronVersion=${electron.version}
-
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/share/{applications,prospect-mail}
- cp dist/${
- if stdenv.isDarwin
- then "darwin-"
- else "linux-"
- }${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/prospect-mail/
-
- pushd build/icons
- for image in *png; do
- mkdir -p $out/share/icons/hicolor/''${image%.png}/apps
- cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/prospect-mail.png
- done
- popd
-
- # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing
- makeWrapper '${electron}/bin/electron' "$out/bin/prospect-mail" \
- ${lib.optionalString stdenv.isLinux ''
- --prefix PATH : ${lib.makeBinPath [alsa-utils which]} \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio pipewire]} \
- ''} \
- --add-flags "$out/share/prospect-mail/app.asar" \
- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
-
- runHook postInstall
- '';
-
- desktopItems = [
- (makeDesktopItem {
- name = pname;
- exec = pname;
- icon = pname;
- desktopName = "Outlook for Linux";
- comment = "Outlook wrapper client for Linux";
- categories = ["Network" "Email"];
- })
- ];
-}