From 0cb3dfd772fcba8d40eae2655809cca3557ea133 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 14 Aug 2023 03:48:28 +0200
Subject: [PATCH] minor update

---
 nixos/machines/sternchen/configuration.nix | 5 +++--
 nixos/machines/sterni/configuration.nix    | 2 +-
 nixos/machines/sterni/packages.nix         | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/machines/sternchen/configuration.nix b/nixos/machines/sternchen/configuration.nix
index f5c8c52..aa2d6cd 100644
--- a/nixos/machines/sternchen/configuration.nix
+++ b/nixos/machines/sternchen/configuration.nix
@@ -2,6 +2,7 @@
 
   imports = [
 
+    ../../components
     ../../system/desktop
     ./hardware-configuration.nix
 
@@ -21,7 +22,7 @@
   components.mainUser.enable = true;
   users.users.mainUser.extraGroups = [ "adbusers" "video" ];
   home-manager.users.mainUser.home.git-pull.enable = false;
-  system.custom.mainUser.userName = "tina";
+  users.users.mainUser.name = "tina";
 
   #system.custom.wifi.interfaces = [ "wlp3s0" ];
 
@@ -48,7 +49,7 @@
   console.keyMap = "de";
   services.xserver.layout = "de,us";
 
-  system.custom.suspend.enable = false;
+  #system.custom.suspend.enable = false;
   services.printing.enable = false;
 
   # fonts
diff --git a/nixos/machines/sterni/configuration.nix b/nixos/machines/sterni/configuration.nix
index d7e5856..48b8678 100644
--- a/nixos/machines/sterni/configuration.nix
+++ b/nixos/machines/sterni/configuration.nix
@@ -10,7 +10,7 @@
     ./packages.nix
     ./syncthing.nix
     ./tinc.nix
-    ./trilium.nix
+    # ./trilium.nix
 
     #./wifi-access-point.nix
     #./wireshark.nix
diff --git a/nixos/machines/sterni/packages.nix b/nixos/machines/sterni/packages.nix
index 2fe2d8f..b4ccaf3 100644
--- a/nixos/machines/sterni/packages.nix
+++ b/nixos/machines/sterni/packages.nix
@@ -100,6 +100,8 @@ in
 
     bitwarden
 
+    unstable.trilium-desktop
+
   ];
 
   home-manager.users.mainUser = {