Compare commits

..

No commits in common. "7631eee402124b7f05c1c2792b98d5edf9540bf3" and "78dceb8aab71b8b1ecee8617d6557610d0403dfc" have entirely different histories.

4 changed files with 7 additions and 61 deletions

View file

@ -10,14 +10,14 @@
"control-center-margin-right": 8, "control-center-margin-right": 8,
"control-center-margin-left": 8, "control-center-margin-left": 8,
"control-center-width": 500, "control-center-width": 500,
"control-center-height": 1000, "control-center-height": 900,
"fit-to-screen": false, "fit-to-screen": false,
"layer": "top", "layer": "top",
"control-center-layer": "top", "control-center-layer": "top",
"cssPriority": "user", "cssPriority": "user",
"notification-icon-size": 64, "notification-icon-size": 64,
"notification-body-image-height": 300, "notification-body-image-height": 100,
"notification-body-image-width": 200, "notification-body-image-width": 200,
"notification-inline-replies": true, "notification-inline-replies": true,
"timeout": 10, "timeout": 10,

View file

@ -1,3 +1,4 @@
/* Dracula Theme */ /* Dracula Theme */
/* https://gist.github.com/MrRoy/3a4a0b1462921e78bf667e1b36697268 */ /* https://gist.github.com/MrRoy/3a4a0b1462921e78bf667e1b36697268 */
@define-color foreground rgb(248, 248, 242); @define-color foreground rgb(248, 248, 242);
@ -11,6 +12,8 @@
transition: all 200ms ease; transition: all 200ms ease;
outline: none; outline: none;
margin-bottom: 4px; margin-bottom: 4px;
margin-right: 13px;
margin-top: 8px;
border-radius: 30px; border-radius: 30px;
} }
@ -92,12 +95,11 @@
.notification-default-action, .notification-default-action,
.notification-action { .notification-action {
padding: 4px; padding: 4px;
margin: 0px; margin: 0;
box-shadow: none; box-shadow: none;
background: @current-line; background: @current-line;
border: 2px solid @accent; border: 2px solid @accent;
color: @foreground; color: @foreground;
min-height: 40px;
} }
.notification-default-action:hover, .notification-default-action:hover,

View file

@ -72,12 +72,10 @@
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}" "$@"
'') '')
(with import <nixpkgs> {}; callPackage ../overlays/tutanota.nix {})
swayosd swayosd
blueberry blueberry
libayatana-appindicator libayatana-appindicator
papirus-icon-theme papirus-icon-theme
steam-run
qt5.qtwayland qt5.qtwayland
qt6.qtwayland qt6.qtwayland
httrack httrack
@ -115,6 +113,7 @@
rofi-wayland rofi-wayland
networkmanagerapplet networkmanagerapplet
nextcloud-client nextcloud-client
tutanota-desktop
galaxy-buds-client galaxy-buds-client
swaynotificationcenter swaynotificationcenter
swayidle swayidle

View file

@ -1,55 +0,0 @@
{ 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
cp -r ${extracted}/* $out/
ln -s $out/tutanota-desktop $out/bin/tutanota-desktop
substituteInPlace $out/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}"
'';
}