[configuration,packages] Minor formatting changes

2 files changed, 14 insertions, 12 deletions

diff --git a/configuration.nix b/configuration.nix
index 7e1902e..1608165 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -62,20 +62,12 @@ in {
   users.users.kamen = {
     isNormalUser = true;
     extraGroups = [ "wheel" "audio" "video" "input" "lpadmin" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [ ];
+    packages = [ ];
     shell = pkgs.zsh;
   };
 
   environment.shells = with pkgs; [ zsh ];
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
@@ -99,4 +91,6 @@ in {
   system.stateVersion = "23.05"; # Did you read the comment?
 
   hardware.bluetooth.enable = true;
+
+  security.polkit.enable = true;
 }
diff --git a/packages.nix b/packages.nix
index 602cb6d..f640e3b 100644
--- a/packages.nix
+++ b/packages.nix
@@ -2,9 +2,10 @@
 
 let inherit (import ./sysidentity.nix) sysidentity;
 in {
+  nixpkgs.config.allowUnfree = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs;
     let
       cli-core = [
@@ -91,13 +92,20 @@ in {
     noto-fonts-cjk arphic-ukai arphic-uming takao wqy_microhei wqy_zenhei
   ];
 
-  security.polkit.enable = true;
-
   # List services that you want to enable:
   programs = {
     dconf.enable = true;
     zsh.enable = true;
     gnome-disks.enable = true;
+    firefox.enable = true;
+
+    # Some programs need SUID wrappers, can be configured further or are
+    # started in user sessions.
+    mtr.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
   };
   services = {
     dbus.packages = with pkgs; [ gnome2.GConf ];