dennis the formatter (#75)

* dennis the formatter

* changed comment

* fixup

users/alice/home.nix

@@ -1,10 +1,7 @@
 { pkgs, ... }:
 
 {
-  home.username = "alice";
-  home.homeDirectory = "/home/alice";
-
-  home.packages = with pkgs; [
+  home = {
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
     # pkgs.hello
@@ -22,37 +19,40 @@
     #   echo "Hello, ${config.home.username}!"
     # '')
 
-    ncdu
+    username = "alice";
+    homeDirectory = "/home/alice";
+    packages = with pkgs; [
+      ncdu
 
-    # Rust packages
-    trunk
-    wasm-pack
-    cargo-watch
-    #pkgs.cargo-tarpaulin
-    cargo-generate
-    cargo-audit
-    cargo-update
-    diesel-cli
-    gitoxide
-    tealdeer
-    helix
+      # Rust packages
+      trunk
+      wasm-pack
+      cargo-watch
+      #pkgs.cargo-tarpaulin
+      cargo-generate
+      cargo-audit
+      cargo-update
+      diesel-cli
+      gitoxide
+      tealdeer
+      helix
 
-    # nix specific packages
-    nil
-    nixfmt
+      # nix specific packages
+      nil
+      nixfmt
 
-    # markdown
-    nodePackages.markdownlint-cli
+      # markdown
+      nodePackages.markdownlint-cli
 
-    # doom emacs dependencies
-    fd
-    ripgrep
-    clang
-  ];
+      # doom emacs dependencies
+      fd
+      ripgrep
+      clang
+    ];
+  };
 
   programs = {
     zsh.enable = true;
-
     starship.enable = true;
     fzf = {
       enable = true;

users/default.nix

@@ -3,6 +3,9 @@
 {
   inherit name;
   isNormalUser = true;
+  shell = lib.mkIf config.programs.${defaultShell}.enable pkgs.${defaultShell};
+  hashedPasswordFile = config.sops.secrets."${name}/user-password".path or null;
+  openssh.authorizedKeys.keys = publicKeys;
   extraGroups = [
     "wheel"
     "media"
@@ -15,7 +18,4 @@
     "plugdev"
     "uaccess"
   ];
-  shell = lib.mkIf config.programs.${defaultShell}.enable pkgs.${defaultShell};
-  hashedPasswordFile = config.sops.secrets."${name}/user-password".path or null;
-  openssh.authorizedKeys.keys = publicKeys;
 }

users/richie/home.nix

@@ -1,39 +1,39 @@
 { pkgs, ... }:
 
 {
-  home.username = "richie";
-  home.homeDirectory = "/home/richie";
-
-  home.packages = with pkgs; [
-    # Rust packages
-    topgrade
-    trunk
-    wasm-pack
-    cargo-watch
-    # pkgs.cargo-tarpaulin
-    cargo-generate
-    cargo-audit
-    cargo-update
-    diesel-cli
-    # gitoxide currently broke 09182023
-    gitoxide
-    tealdeer
-    helix
-
-    # nix specific packages
-    nil
-    nixfmt
-
-    # markdown
-    nodePackages.markdownlint-cli
-
-    # doom emacs dependencies
-    fd
-    ripgrep
-    clang
-  ];
-
   programs.zsh.enable = true;
+  home = {
+    username = "richie";
+    homeDirectory = "/home/richie";
+    packages = with pkgs; [
+      # Rust packages
+      topgrade
+      trunk
+      wasm-pack
+      cargo-watch
+      # pkgs.cargo-tarpaulin
+      cargo-generate
+      cargo-audit
+      cargo-update
+      diesel-cli
+      # gitoxide currently broke 09182023
+      gitoxide
+      tealdeer
+      helix
+
+      # nix specific packages
+      nil
+      nixfmt
+
+      # markdown
+      nodePackages.markdownlint-cli
+
+      # doom emacs dependencies
+      fd
+      ripgrep
+      clang
+    ];
+  };
 
   home.stateVersion = "23.11";
 }