From b890e2d04a3cb9d98e4b89e4099437c91323934b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Mon, 15 Nov 2021 11:37:56 +0100
Subject: [PATCH 1/3] Fix java session variable

---
 profiles/base-user/session-variables.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix
index 4e745bba..264d787f 100644
--- a/profiles/base-user/session-variables.nix
+++ b/profiles/base-user/session-variables.nix
@@ -49,7 +49,7 @@ let
     CARGO_HOME = "${xdg.dataHome}/cargo";
 
     # Java
-    _JAVA_OPTIONS = "-Djava.util.prefs.userRoot = '${xdg.configHome}/java'";
+    _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='${xdg.configHome}/java'";
     _JAVA_AWT_WM_NONREPARENTING = "1";
 
     # docker

From 0768353f08e4023d2b35a9ef319da37351bbcfc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Mon, 15 Nov 2021 11:39:24 +0100
Subject: [PATCH 2/3] Use fixed telegram-desktop from unstable

---
 overlays/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 1c5070db..34c46f45 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -14,6 +14,10 @@ channels: final: prev: {
     signal-desktop
     starship
     deploy-rs
+    tdesktop
+    xdg-desktop-portal
+    xdg-desktop-portal-gtk
+    xdg-desktop-portal-wlr
     ;
 
 

From 91163d38ed9aedccf0e7b9a714f19b30ff367a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Wed, 17 Nov 2021 12:05:50 +0100
Subject: [PATCH 3/3] Allow changing the user description

---
 modules/user/default.nix       | 5 +++++
 profiles/base-user/default.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/user/default.nix b/modules/user/default.nix
index d2edd476..79e32eca 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -11,6 +11,11 @@ in
         type = types.nullOr types.str;
         default = "nixos";
       };
+      description = mkOption {
+        description = "User description";
+        type = types.nullOr types.str;
+        default = "The main PubSolarOS user";
+      };
       password = mkOption {
         description = "User password";
         type = types.nullOr types.str;
diff --git a/profiles/base-user/default.nix b/profiles/base-user/default.nix
index e327a736..80ac262e 100644
--- a/profiles/base-user/default.nix
+++ b/profiles/base-user/default.nix
@@ -15,7 +15,7 @@ in
       # This automatically sets group to users, createHome to true,
       # home to /home/username, useDefaultShell to true, and isSystemUser to false.
       isNormalUser = true;
-      description = "";
+      description = psCfg.user.description;
       extraGroups = [ "wheel" "docker" "input" "audio" "networkmanager" "lp" "scanner" ];
       initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
       shell = pkgs.zsh;