Compare commits

..

No commits in common. "823455682bb9c9eb03497d82094bfb8e4851fe37" and "815b72adb82aa0b6f084694b79f9c4bb01f523fd" have entirely different histories.

6 changed files with 64 additions and 24 deletions

View file

@ -22,7 +22,6 @@
color: #CBA6F7; color: #CBA6F7;
border-radius: 80px; border-radius: 80px;
border: 2px solid rgba(0,0,0,0); border: 2px solid rgba(0,0,0,0);
transition: background-color 0.5s ease-in-out;
} }
.quick-settings-logo:hover { .quick-settings-logo:hover {
@ -106,7 +105,6 @@
border-left: 2px solid $contrastbg; border-left: 2px solid $contrastbg;
border-top: 2px solid $contrastbg; border-top: 2px solid $contrastbg;
border-bottom: 2px solid $contrastbg; border-bottom: 2px solid $contrastbg;
transition: all 0.5s ease-in-out;
} }
.right-part { .right-part {
@ -116,7 +114,6 @@
border-right: 2px solid $contrastbg; border-right: 2px solid $contrastbg;
border-top: 2px solid $contrastbg; border-top: 2px solid $contrastbg;
border-bottom: 2px solid $contrastbg; border-bottom: 2px solid $contrastbg;
transition: all 0.5s ease-in-out;
} }
.right-part:hover { .right-part:hover {
@ -178,7 +175,6 @@
background: #3e4153; background: #3e4153;
border-radius: 100%; border-radius: 100%;
box-shadow: rgba(0, 0, 0, 0.25) 0px 54px 55px, rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px; box-shadow: rgba(0, 0, 0, 0.25) 0px 54px 55px, rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px;
transition: background-color 0.5s ease-in-out;
} }
slider:hover { slider:hover {
background-color: #303240; background-color: #303240;

View file

@ -39,7 +39,6 @@
color: #CBA6F7; color: #CBA6F7;
border-radius: 80px; border-radius: 80px;
border: 2px solid #1b1b2b; border: 2px solid #1b1b2b;
transition: background-color 0.5s ease-in-out;
} }
.toggle-off:hover { .toggle-off:hover {
@ -53,7 +52,6 @@
color: #CBA6F7; color: #CBA6F7;
border-radius: 80px; border-radius: 80px;
border: 2px solid $contrastbg; border: 2px solid $contrastbg;
transition: background-color 0.5s ease-in-out;
} }
.toggle-on:hover { .toggle-on:hover {

View file

@ -68,7 +68,7 @@
exec env SUDO_ASKPASS=${pkgs.plasma5Packages.ksshaskpass}/bin/${pkgs.plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@" exec env SUDO_ASKPASS=${pkgs.plasma5Packages.ksshaskpass}/bin/${pkgs.plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@"
'') '')
tutanota-desktop tutanota
swayosd swayosd
blueberry blueberry
libayatana-appindicator libayatana-appindicator

View file

@ -4,7 +4,10 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(import ./swayosd.nix) (import ./swayosd.nix)
(import ./blueberry.nix) (import ./blueberry.nix)
(import ./tutanota-desktop.nix)
(final: prev: {
tutanota = final.callPackage ./pkgs/tutanota.nix {};
})
(final: prev: { (final: prev: {
pam-fprint-grosshack = final.callPackage ./pkgs/pam-fprint-grosshack.nix {}; pam-fprint-grosshack = final.callPackage ./pkgs/pam-fprint-grosshack.nix {};

View file

@ -0,0 +1,59 @@
{ lib
, pkgs
, stdenv
, appimageTools
, makeWrapper
, fetchurl
, libGL
, libsecret
, xorg
, ffmpeg
, curl
, alsa-lib
, udev
}:
let
pname = "tutanota-desktop";
version = "3.114.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
hash = "sha256-cWK95F3/zRyKt2fN/uN/dfDNnSiXgJq6mlGjtD3W7VY=";
};
extracted = appimageTools.extractType2 {
inherit pname version src;
};
in
appimageTools.wrapType2 {
inherit name src;
profile = ''
export LD_LIBRARY_PATH=${libGL}:${libsecret}:${ffmpeg}:${curl}:${alsa-lib}:${udev}:$LD_LIBRARY_PATH
'';
targetPkgs = pkgs: [ libGL libsecret ffmpeg curl alsa-lib udev ];
extraInstallCommands = ''
mkdir -p $out/bin $out/share/applications
cp -r ${extracted}/* $out/
ln -s $out/tutanota-desktop $out/bin/tutanota-desktop
mv $out/tutanota-desktop.desktop $out/share/applications/
substituteInPlace $out/share/applications/tutanota-desktop.desktop \
--replace AppRun ${pname}
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret stdenv.cc.cc.lib ]}
sed -i 's#exec -a "$0"#exec -a "$0" "${pkgs.steam-run}/bin/steam-run"#' "$out/bin/${pname}"
'';
}

View file

@ -1,16 +0,0 @@
final: prev: {
tutanota-desktop = prev.tutanota-desktop.overrideAttrs (oldAttrs: rec {
pname = "tutanota-desktop";
version = "3.116.8";
src = prev.fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
name = "tutanota-desktop-${version}.tar.gz";
sha256 = "sha256-HY0LdiHz8G/v8/zEglRtoDyPFMhMj1Zrc0zpQNJpWr0=";
};
patches = [];
});
}