diff --git a/configuration.nix b/configuration.nix
index df8ba96..92a9945 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -17,9 +17,33 @@ in {
 
   nixpkgs.config.allowUnfree = true;
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub.device = "/dev/nvme1n1p1";
+  boot.loader = {
+    systemd-boot.enable = false;
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot/efi";
+    };
+    grub = {
+      efiSupport = true;
+      device = "nodev";
+      extraConfig = ''
+        GRUB_DEFAULT=saved
+        GRUB_SAFEDEFAULT=false
+      '';
+      useOSProber = true;
+    };
+  };
+
+  security.sudo = {
+    enable = true;
+    extraRules = [{
+      commands = [{
+        command = "${pkgs.grub2}/bin/grub-reboot";
+        options = [ "NOPASSWD" ];
+      }];
+      groups = [ "wheel" ];
+    }];
+  };
 
   networking.hostName = "haskell"; # Define your hostname.
 
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index ef34fae..691d81f 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -9,7 +9,8 @@
   boot.initrd.availableKernelModules =
     [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelParams = [ "intel_iommu=on" "modprobe.blacklist=dvb_usb_rtl28xxu" ];
+  boot.kernelParams =
+    [ "intel_iommu=on" "modprobe.blacklist=dvb_usb_rtl28xxu" ];
   boot.kernelModules = [ "kvm-intel" "vfio_pci" ];
   boot.extraModulePackages = [ ];
 
@@ -36,7 +37,7 @@
     options = [ "subvol=nix" ];
   };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot/efi" = {
     device = "/dev/disk/by-uuid/E808-5876";
     fsType = "vfat";
     options = [ "fmask=0022" "dmask=0022" ];
diff --git a/modules/home/fish.nix b/modules/home/fish.nix
index f49926c..ad739ad 100644
--- a/modules/home/fish.nix
+++ b/modules/home/fish.nix
@@ -15,10 +15,18 @@
       set -gx OPENSSL_LIB_DIR ${pkgs.openssl.out}/lib;
       set -gx OPENSSL_INCLUDE_DIR ${pkgs.openssl.dev}/include;
       set -gx PKG_CONFIG_PATH ${pkgs.openssl.dev}/lib/pkgconfig;
-      alias vi="nvim"
+      alias v="nvim"
+      alias c="clear"
       alias rb="sudo nixos-rebuild switch --flake ~/nixos-config#"
+      alias boot-rb="sudo nixos-rebuild --install-bootloader boot --flake ~/nixos-config#"
       alias dry-rb="sudo nixos-rebuild dry-build --flake ~/nixos-config#"
 
+      alias win="grub-reboot 'Windows Boot Manager (on /dev/sda2)' && reboot"
+
+      alias qwer="reboot"
+      alias zxcv="shutdown now"
+      alias lg="lazygit"
+
       if test -f $HOME/.config/fish/kube.fish
         source $HOME/.config/fish/kube.fish
       end
diff --git a/pkgs/programming.nix b/pkgs/programming.nix
index 374f1a3..bddd34b 100644
--- a/pkgs/programming.nix
+++ b/pkgs/programming.nix
@@ -9,6 +9,8 @@ with pkgs; [
   lldb
   tokio-console
   iaito
+  clang
+  valgrind
   ghidra-bin
   protobuf
   buf
@@ -16,6 +18,7 @@ with pkgs; [
   unityhub
   python313Packages.r2pipe
   python312Packages.r2pipe
+  gh
   python312Packages.pip
   nodejs
   go
@@ -23,7 +26,6 @@ with pkgs; [
   binwalk
   dotnet-sdk_9
   csharp-ls
-  gcc
   cmake
   gnumake
   graalvmPackages.graalvm-ce
diff --git a/pkgs/util.nix b/pkgs/util.nix
index a42061b..e31559d 100644
--- a/pkgs/util.nix
+++ b/pkgs/util.nix
@@ -11,6 +11,7 @@ with pkgs; [
   xz
   rtl-sdr
   hyprpicker
+  grub2
   zlib
   unzip
   p7zip