Merge branch 'main' into teutat3s

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;

overlays/overrides.nix

@@ -15,6 +15,9 @@ channels: final: prev: {
     nomad
     rage
     signal-desktop
+    starship
+    deploy-rs
+    tdesktop
     xdg-desktop-portal
     xdg-desktop-portal-gtk
     xdg-desktop-portal-wlr

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" "video" "networkmanager" "lp" "scanner" ];
       initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
       shell = pkgs.zsh;

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