From 2a3079f35ea98427bfeec98f10ddea1fbbb73408 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Sat, 18 Oct 2025 14:58:03 +0200
Subject: [PATCH] desktop: move to nheko with gnome-keyring

---
 hosts/configuration_desktop.nix |  4 ++++
 hosts/desktop/default.nix       |  2 +-
 hosts/desktop/home.nix          |  1 -
 hosts/home.nix                  |  1 +
 hosts/lifebook/home.nix         |  1 -
 hosts/steamdeck/home.nix        |  1 -
 modules/services/default.nix    |  1 +
 modules/services/keyring.nix    | 14 ++++++++++++++
 modules/wm/sway/home.nix        |  2 +-
 packages/default.nix            |  2 +-
 10 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 modules/services/keyring.nix

diff --git a/hosts/configuration_desktop.nix b/hosts/configuration_desktop.nix
index e9d991c..7a6e29f 100644
--- a/hosts/configuration_desktop.nix
+++ b/hosts/configuration_desktop.nix
@@ -47,6 +47,7 @@
   };
 
   security = {
+    pam.services.login.enableGnomeKeyring = true;
     rtkit.enable = true;
     pki.certificateFiles = [
       ./rootCA.pem
@@ -187,6 +188,9 @@
     '';
   };
   nixpkgs.config.allowUnfree = true;        # Allow proprietary software.
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
 
   system = {                                # NixOS settings
     autoUpgrade = {                         # Allow auto update
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 12dc550..bdbfa45 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -57,7 +57,7 @@
   environment = {
     systemPackages = [
       pkgs.linux-firmware
-      pkgs-kabbone.corosync-qdevice
+      #pkgs-kabbone.corosync-qdevice
     ];
   };
 
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 665ede1..9ad6709 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -30,7 +30,6 @@
       thunderbird
       streamlink
       streamlink-twitch-gui-bin
-      element-desktop
       #nheko
       pulsemixer
       #yubioath-flutter
diff --git a/hosts/home.nix b/hosts/home.nix
index 1183bf0..766a497 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -64,6 +64,7 @@
       vimiv-qt
       freecad
       discord
+      nheko
 
 # Fileanagement
       kdePackages.ark
diff --git a/hosts/lifebook/home.nix b/hosts/lifebook/home.nix
index 3d93848..42e91c9 100644
--- a/hosts/lifebook/home.nix
+++ b/hosts/lifebook/home.nix
@@ -30,7 +30,6 @@
       thunderbird
       streamlink
       streamlink-twitch-gui-bin
-      element-desktop
       intel-gpu-tools
       pulsemixer
       
diff --git a/hosts/steamdeck/home.nix b/hosts/steamdeck/home.nix
index 174032f..7336a31 100644
--- a/hosts/steamdeck/home.nix
+++ b/hosts/steamdeck/home.nix
@@ -35,7 +35,6 @@
       thunderbird
       streamlink
       streamlink-twitch-gui-bin
-      element-desktop
       pulsemixer
       #yuzu-early-access
       
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 75a129b..9873b93 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -19,6 +19,7 @@
   #./udiskie.nix
   #./redshift.nix
   ./kanshi.nix
+  ./keyring.nix
 ]
 
 # picom, polybar and sxhkd are pulled from desktop module
diff --git a/modules/services/keyring.nix b/modules/services/keyring.nix
new file mode 100644
index 0000000..d2e8e3c
--- /dev/null
+++ b/modules/services/keyring.nix
@@ -0,0 +1,14 @@
+#
+# Screenshots
+#
+
+{ pkgs, user, ... }:
+
+{
+  services = {                                    # sxhkd shortcut = Printscreen button (Print)
+    gnome-keyring = {
+      enable = true;
+    };
+  };
+  home.packages = with pkgs; [ gcr seahorse ];
+}
diff --git a/modules/wm/sway/home.nix b/modules/wm/sway/home.nix
index 8956c6b..9fc5bc5 100644
--- a/modules/wm/sway/home.nix
+++ b/modules/wm/sway/home.nix
@@ -95,7 +95,7 @@
             #{ command = "exec ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"; }
             { command = "${pkgs.thunderbird}/bin/thunderbird"; }
             { command = "${pkgs.firefox}/bin/firefox"; }
-            { command = "${pkgs.element-desktop}/bin/element-desktop"; }
+            { command = "${pkgs.nheko}/bin/nheko"; }
         ];
     
         workspaceAutoBackAndForth = true;
diff --git a/packages/default.nix b/packages/default.nix
index 90f838c..3652ec4 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-  corosync-qdevice = pkgs.callPackage ./corosync-qdevice.nix {};
+#  corosync-qdevice = pkgs.callPackage ./corosync-qdevice.nix {};
 }