Resolved conflicts

2024-05-10 19:36:46 +02:00
parent 9f37afd3d8 8c44307b00
commit 60b28466a3
7 changed files with 59 additions and 1 deletions
--- a/modules/home/programs/common.nix
+++ b/modules/home/programs/common.nix
@@ -6,7 +6,6 @@
    onlyoffice-bin
    vlc
    signal-desktop
-    logseq
    unstable.webcord
    unstable.localsend
    bitwarden
--- a/modules/home/programs/firefox.nix
+++ b/modules/home/programs/firefox.nix
@@ -1,8 +1,13 @@
 { inputs, pkgs, ... }:

 {
+  home.packages = with pkgs; [
+    unstable.firefoxpwa
+  ];
+
  programs.firefox = {
    enable = true;
+#    nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ];
    profiles.xeovalyte = {
      search.engines = {
        "Nix" = {
--- a/modules/home/programs/joplin.nix
+++ b/modules/home/programs/joplin.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    unstable.joplin-desktop
+  ];
+}