diff --git a/devshell/commands.nix b/devshell/commands.nix
index 53dc9d3..7c94988 100644
--- a/devshell/commands.nix
+++ b/devshell/commands.nix
@@ -76,11 +76,8 @@ in
     {
       name = "build-n-switch";
       category = "tasks";
-      help = "Build NixOS configuration for the current host and run `switch-to-configuration`";
-      command = ''
-        path="$(nix build --no-link --print-out-paths ".#nixosConfigurations.\"$(hostname)\".config.system.build.toplevel")"
-        doas "$path"/bin/switch-to-configuration "$@"
-      '';
+      help = "Shortcut to nixos-rebuild for this flake";
+      command = ''doas nixos-rebuild --flake . "$@"'';
     }
     {
       name = "run-vm";
diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
index 7231311..ea12822 100644
--- a/nixos/modules/common.nix
+++ b/nixos/modules/common.nix
@@ -119,6 +119,7 @@ in
         [
           bash-completion
           vim
+          git
         ]
         (mkIf config.services.netdata.enable [ netdata ])
       ];