diff --git a/hosts/modules/nvim/default.nix b/hosts/modules/nvim/default.nix
index 9a7c38b..83fb9d9 100644
--- a/hosts/modules/nvim/default.nix
+++ b/hosts/modules/nvim/default.nix
@@ -1,6 +1,9 @@
 { inputs, config, pkgs, ... }:
 
 {
+  environment.sessionVariables = {
+    EDITOR = "nvim";
+  };
   programs.neovim = {
     enable = true;
     package = pkgs.neovim-nightly;
diff --git a/hosts/satori/boot.nix b/hosts/satori/boot.nix
index 1a1320c..cc771a2 100644
--- a/hosts/satori/boot.nix
+++ b/hosts/satori/boot.nix
@@ -27,7 +27,18 @@
         #       useOSProber = true;
         efiSupport = true;
         device = "nodev";
-        splashImage = ./cirno.png;
+        theme = pkgs.stdenvNoCC.mkDerivation rec {
+          version = "1.2.0";
+          name = "minegrub-theme";
+          src = pkgs.fetchFromGitHub {
+            owner = "Lxtharia";
+            repo = "minegrub-theme";
+            rev = "v${version}";
+            sha256 = "sha256-n/fJSFrrPPyTBS8/XHaARyCxccRZiqPhhNFq0x8Q2kA=";
+          };
+          installPhase = "cp -r . $out";
+        };
+        #splashImage = ./cirno.png;
         splashMode = "stretch";
         configurationName = "nixbruh";
       };
diff --git a/hosts/satori/default.nix b/hosts/satori/default.nix
index 62bfbad..ad168a4 100644
--- a/hosts/satori/default.nix
+++ b/hosts/satori/default.nix
@@ -13,5 +13,5 @@
       ./wayland.nix
       ./nix.nix
     ];
-  system.stateVersion = "21.05";
+  system.stateVersion = "23.05";
 }
diff --git a/hosts/satori/pkgs.nix b/hosts/satori/pkgs.nix
index 4999eef..8d97f14 100644
--- a/hosts/satori/pkgs.nix
+++ b/hosts/satori/pkgs.nix
@@ -14,14 +14,12 @@
     ripgrep
     kbd
     gcc
-    virtmanager
     rnix-lsp
     vulkan-tools
     vulkan-headers
     jq
     dconf
-    stlink
-    stlink-gui
+    inputs.nbfc.packages.${pkgs.system}.nbfc
   ];
 
   programs = {
diff --git a/hosts/satori/services.nix b/hosts/satori/services.nix
index fdc8854..a245a16 100644
--- a/hosts/satori/services.nix
+++ b/hosts/satori/services.nix
@@ -1,7 +1,6 @@
 { lib, config, pkgs, ... }:
 let
-
-  udev-cypher = pkgs.stdenv.mkDerivation {
+  udev-cypherock = pkgs.stdenvNoCC.mkDerivation {
     name = "udev-cypher";
 
     dontBuild = true;
@@ -9,15 +8,12 @@ let
     dontUnpack = true;
 
     installPhase = ''
-          mkdir -p $out/lib/udev/rules.d
-          touch $out/lib/udev/rules.d/21-cypherock.rules
+      mkdir -p $out/lib/udev/rules.d
+      touch $out/lib/udev/rules.d/21-cypherock.rules
       cat << 'EOF' >> $out/lib/udev/rules.d/21-cypherock.rules
       SUBSYSTEM=="input", GROUP="input", MODE="0666"
       SUBSYSTEM=="usb", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="666", GROUP="plugdev"
       KERNEL=="hidraw*", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="0666", GROUP="plugdev"
-      0483:374f
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="666", GROUP="plugdev"
-      KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="0666", GROUP="plugdev"
       EOF
     '';
   };
@@ -32,7 +28,7 @@ in
     ratbagd.enable = true;
     btrfs.autoScrub.enable = true;
     udev = {
-      packages = [ pkgs.stlink udev-cypher ];
+      packages = [ pkgs.stlink udev-cypherock ];
     };
     gvfs.enable = true;
     tlp = {