Tidy up home-manager config

nix/london/gsimmer.nix

@@ -1,7 +1,9 @@
 { config, pkgs, callPackage, ... }:
 
 {
-  nixpkgs.overlays =
+  nixpkgs = {
+    config.allowUnfree = true;
+    overlays =
       let
         discordOverlay = self: super: {
           discord = super.discord.override { withOpenASAR = true; withVencord = true; };
@@ -12,41 +14,23 @@
             url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
             sha256 = "0xyhs0xj72nk0acd54ngryazsqllwgfjh0964fa2176ji73a6c1d";
           })) discordOverlay];
+  };
+  home = {
+    username = "gsimmer";
+    homeDirectory = "/home/gsimmer";
+  };
 
-  home.username = "gsimmer";
-  home.homeDirectory = "/home/gsimmer";
-
-  nixpkgs.config.allowUnfree = true;
-  
-  programs.bash.enable = false;
-  programs.fish = {
+  programs = {
+    bash.enable = false;
+    fish = {
       enable = false;
       interactiveShellInit = ''
       set fish_greeting
       atuin init fish | source
     '';
-    plugins = [
-      {
-        name = "z";
-        src = pkgs.fetchFromGitHub {
-          owner = "jethrokuan";
-          repo = "z";
-          rev = "e0e1b9dfdba362f8ab1ae8c1afc7ccf62b89f7eb";
-          sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc";
-        };
-      }
-    ];
     };
 
-  programs.tmux = {
-    enable = true;
-    plugins = with pkgs; [
-      tmuxPlugins.sensible
-      tmuxPlugins.cpu
-    ];
-  };
-
-  programs.nushell = {
+    nushell = {
       enable = true;
       extraConfig =
         ''
@@ -514,14 +498,12 @@ $env.config = {
       '';
     };
     
-  programs.direnv = {
+    direnv = {
       enable = true;
       nix-direnv.enable = true;
     };
 
-  services.lorri.enable = true;
-
-  programs.git = {
+    git = {
       enable = true;
       userName = "Gabriel Simmer";
       userEmail = "g@gmem.ca";
@@ -541,7 +523,7 @@ $env.config = {
       };
     };
 
-  programs.emacs = {
+    emacs = {
       enable = true;
       package = pkgs.emacs-unstable-pgtk;
       extraPackages = epkgs: [
@@ -549,14 +531,15 @@ $env.config = {
       ];
     };
 
-  programs.exa = {
+    exa = {
       enable = true;
       enableAliases = true;
     };
 
-  programs.bat = {
+    bat = {
       enable = true;
     };
+  };
   
   home.packages = with pkgs; [
     bitwarden-cli
@@ -576,7 +559,6 @@ $env.config = {
     age-plugin-yubikey
     rage
     discord
-    podman-desktop
     mangohud
   ];