From e44eed1620b7654a52bcc80d40dd755d3eec4373 Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Sun, 4 Jun 2023 21:56:51 +0200
Subject: [PATCH] a

---
 home-manager/home.nix   | 12 +++++++++---
 nixos/configuration.nix |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 91b25b6..cadd76b 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -66,15 +66,14 @@
     aliases = {
       hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
       fpush = "push --force-with-lease";
-      resq = "!rebase --autosquash -i $(git merge-base origin/master HEAD)";
+      resq = "!git rebase --autosquash -i $(git merge-base origin/master HEAD)";
     };
     difftastic = {
       enable = true;
     };
     extraConfig = {
       core.autocrlf = false;
-      # wants some sort of attribute set. pkgs.neovim doesnt work either :(
-      # editor = "nvim";
+      core.editor = "nvim";
       pull.ff = "only";
       init.defaultBranch = "main";
     };
@@ -104,6 +103,10 @@
                 name = "home-manager options";
                 url = "https://rycee.gitlab.io/home-manager/options.html";
               }
+              {
+                name = "nixpkgs search";
+                url = "https://search.nixos.org/packages";
+              }
             ];
           }
         ];
@@ -117,6 +120,9 @@
     extensions = with pkgs.vscode-extensions; [
       jnoortheen.nix-ide
       usernamehw.errorlens
+      ms-vscode.cmake-tools
+      ms-vscode.cpptools
+      eamodio.gitlens
     ];
   };
 
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index da1d8da..656408c 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -144,6 +144,7 @@
       packages = with pkgs; [
         firefox
         vscode
+        minecraft
         home-manager
       ];
       shell = pkgs.fish;