feat: update flakes, attempt to repair espanso
This commit is contained in:
parent
a58b498d3e
commit
4b5ddd8934
9 changed files with 215 additions and 203 deletions
|
@ -9,7 +9,7 @@
|
|||
...
|
||||
}: let
|
||||
# pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system};
|
||||
pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small {inherit (pkgs) system config;};
|
||||
pkgsUnstable = import nodeFlake.inputs.nixpkgs-unstable {inherit (pkgs) system config;};
|
||||
in {
|
||||
imports = [
|
||||
../profiles/common.nix
|
||||
|
@ -107,24 +107,7 @@ in {
|
|||
# FIXME: depends on insecure openssl 1.1.1t
|
||||
# kotatogram-desktop
|
||||
tdesktop
|
||||
|
||||
(
|
||||
let
|
||||
version = "6.46.0";
|
||||
in
|
||||
pkgsUnstableSmall.signal-desktop.overrideAttrs (old:
|
||||
lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
|
||||
inherit version;
|
||||
src =
|
||||
builtins.fetchurl
|
||||
{
|
||||
url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/108f9dd03ac5658457de1b23aae539ef8ab0a716/builds/release/signal-desktop_${version}_arm64.deb";
|
||||
sha256 =
|
||||
# lib.fakeSha256
|
||||
"sha256:15sn0p0jxfs7hka6qhg77vjwblwxcdc10ybrfxc0p5gkpbcqcydc";
|
||||
};
|
||||
})
|
||||
)
|
||||
signal-desktop
|
||||
|
||||
thunderbird
|
||||
|
||||
|
@ -156,8 +139,8 @@ in {
|
|||
nethogs
|
||||
|
||||
# Code Editing and Programming
|
||||
pkgsUnstableSmall.lapce
|
||||
pkgsUnstableSmall.helix
|
||||
pkgsUnstable.lapce
|
||||
pkgsUnstable.helix
|
||||
|
||||
# Image/Graphic/Design Tools
|
||||
gnome.eog
|
||||
|
@ -251,48 +234,14 @@ in {
|
|||
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
|
||||
])
|
||||
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
|
||||
(
|
||||
pkgs.banana-accounting.overrideDerivation
|
||||
(attrs:
|
||||
with nodeFlake.inputs'.nixpkgs-2211.legacyPackages; {
|
||||
# dontWrapGApps = true;
|
||||
|
||||
srcs = builtins.fetchurl {
|
||||
# hosted via https://web3.storage
|
||||
url = "https://bafybeiabi4m2i4izummipbl5wzhwxjyjt2rylgsrahhkh7i63piwd37n4u.ipfs.w3s.link/mfpcksczayaqqx8fdacp0627zm36c001-bananaplus.tgz";
|
||||
|
||||
sha256 = "09666iqzqdw2526pf6bg5kd0hfw0wblw8ag636ki72dsiw6bmbf1";
|
||||
};
|
||||
|
||||
# nativeBuildInputs =
|
||||
# attrs.nativeBuildInputs
|
||||
# ++ [
|
||||
# qt5.qtbase
|
||||
# qt5.wrapQtAppsHook
|
||||
# ];
|
||||
|
||||
# buildInputs =
|
||||
# attrs.buildInputs
|
||||
# ++ [
|
||||
# qt5.qtwayland
|
||||
# ];
|
||||
|
||||
# preFixup =
|
||||
# (attrs.preFixup or "")
|
||||
# + ''
|
||||
# qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
# '';
|
||||
})
|
||||
)
|
||||
|
||||
pkgsUnstableSmall.ledger-live-desktop
|
||||
pkgsUnstable.ledger-live-desktop
|
||||
|
||||
# unsupported on aarch64-linux
|
||||
pkgs.androidenv.androidPkgs_9_0.platform-tools
|
||||
pkgs.teamviewer
|
||||
pkgs.discord
|
||||
pkgsUnstableSmall.session-desktop
|
||||
pkgsUnstableSmall.rustdesk
|
||||
pkgsUnstable.session-desktop
|
||||
pkgsUnstable.rustdesk
|
||||
]);
|
||||
|
||||
systemd.user.startServices = true;
|
||||
|
|
|
@ -1,9 +1,23 @@
|
|||
{pkgs, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
repoFlake,
|
||||
...
|
||||
}: {
|
||||
services.espanso = {
|
||||
# package = pkgs.espanso.overrideAttrs(_: {
|
||||
# # src =
|
||||
# })
|
||||
enable = true;
|
||||
package = pkgs.espanso-wayland;
|
||||
# package = pkgs.espanso-wayland.overrideAttrs (_: {
|
||||
# src = repoFlake.inputs.espanso;
|
||||
|
||||
# cargoLock = {
|
||||
# # lockFile = "${repoFlake.inputs.espanso.outPath}/Cargo.lock";
|
||||
# lockFile = repoFlake.inputs.espanso + "/Cargo.lock";
|
||||
# outputHashes = {
|
||||
# "yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU=";
|
||||
# };
|
||||
# };
|
||||
# });
|
||||
|
||||
enable = false;
|
||||
configs = {
|
||||
default = {
|
||||
# backend = "Inject";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue