phone: Simplify config

phone/configuration.nix

@@ -1,11 +1,19 @@
 { pkgs, ... }:
 
+let
+  username = "user";
+in
 {
-  environment.sessionVariables = {
+  environment = {
+    sessionVariables = {
       LIBGL_ALWAYS_SOFTWARE = true;
     };
 
-  environment.systemPackages = with pkgs; [
+    shells = with pkgs; [
+      fish
+    ];
+
+    systemPackages = with pkgs; [
       chatty
       gnome-console
       megapixels
@@ -35,11 +43,13 @@
       p7zip
       unar
     ];
+  };
 
-  programs.fish.enable = true;
-  programs.neovim.enable = true;
-  users.defaultUserShell = pkgs.fish;
-  environment.shells = [ pkgs.fish ];
+  programs = {
+    fish.enable = true;
+    neovim.enable = true;
+    calls.enable = true;
+  };
 
   networking = {
     hostName = "mobile-nixos";
@@ -54,24 +64,23 @@
     };
 
     bluetooth.enable = true;
+    sensor.iio.enable = true;
   };
 
-  powerManagement.enable = true;
-
-  zramSwap.enable = true;
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" "repl-flake" ];
-
   services.xserver.desktopManager.phosh = {
     enable = true;
     group = "users";
-    user = "user";
+    user = username;
   };
 
-  users.users."user" = {
+  users = {
+    defaultUserShell = pkgs.fish;
+
+    users.${username} = {
       isNormalUser = true;
-    description = "User";
-    password = "user";
+      description = username;
+      password = username;
+
       extraGroups = [
         "dialout"
         "feedbackd"
@@ -80,10 +89,10 @@
         "wheel"
       ];
     };
+  };
 
+  powerManagement.enable = true;
+  zramSwap.enable = true;
+  nix.settings.experimental-features = [ "nix-command" "flakes" "repl-flake" ];
   system.stateVersion = "23.11";
-
-  programs.calls.enable = true;
-
-  hardware.sensor.iio.enable = true;
 }

phone/hardware-configuration.nix

@@ -1,5 +1,4 @@
-# NOTE: this file was generated by the Mobile NixOS installer.
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   fileSystems = {