diff --git a/flake.nix b/flake.nix
index c28a22a1..16c3028b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,6 +51,7 @@
     # to allow non-nix 2.4 evaluation
     flake-compat = {
       url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
+      type = "tarball";
       flake = false;
     };
     rbw-bitw = {
diff --git a/home/environments/niri/niri.nix b/home/environments/niri/niri.nix
index 78b61bbe..567e1f08 100644
--- a/home/environments/niri/niri.nix
+++ b/home/environments/niri/niri.nix
@@ -6,6 +6,9 @@
 }: let
   inherit (lib.meta) getExe;
 in {
+  imports = [
+    niri.hmModules.niri
+  ];
   home.packages = with pkgs; [
     wl-clipboard
     pamixer
diff --git a/nixos/environments/niri/niri.nix b/nixos/environments/niri/niri.nix
index b307c3fc..35372a78 100644
--- a/nixos/environments/niri/niri.nix
+++ b/nixos/environments/niri/niri.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.niri.nixosModules.niri
+  ];
   programs.niri = {
     enable = true;
     package = pkgs.niri-unstable;
diff --git a/nixvim/plugins/lsp.nix b/nixvim/plugins/lsp.nix
index 7528df11..d5dd6934 100644
--- a/nixvim/plugins/lsp.nix
+++ b/nixvim/plugins/lsp.nix
@@ -1,6 +1,7 @@
 {
   lib,
   std,
+  pkgs,
   ...
 }: let
   inherit (std) set;
@@ -37,6 +38,7 @@ in {
   plugins = let
     pluginsToGen = [
       "lspconfig"
+      "treesitter"
       "cmp"
       "cmp-clippy"
       "cmp-cmdline"
@@ -54,7 +56,29 @@ in {
       autoLoad = true;
     };
   in
-    genAttrs pluginsToGen (_: basePlugin);
+    set.merge [
+      (genAttrs pluginsToGen (_: basePlugin))
+      {
+        treesitter = {
+          grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+            bash
+            json
+            make
+            markdown
+            regex
+            toml
+            xml
+            yaml
+            gleam
+            nix
+          ];
+          settings = {
+            highlight.enable = true;
+            indent.enable = true;
+          };
+        };
+      }
+    ];
   diagnostic.settings = {
     virtual_text = true;
     virtual_lines = true;
diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix
new file mode 100644
index 00000000..2e7d4d66
--- /dev/null
+++ b/systems/rinnosuke.nix
@@ -0,0 +1,69 @@
+_: let
+  hostConfig = {
+    lib,
+    modulesPath,
+    tree,
+    ...
+  }: {
+    imports =
+      [
+        (modulesPath + "/profiles/qemu-guest.nix")
+      ]
+      ++ (with tree.nixos.profiles; [
+        server
+      ]);
+
+    boot = {
+      initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
+      kernelModules = ["kvm-amd"];
+      loader.grub = {
+        enable = true;
+        device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+      };
+    };
+
+    fileSystems = {
+      "/" = {
+        device = "/dev/disk/by-uuid/d7419452-7f03-40f1-ba9b-74d81cf2436a";
+        fsType = "xfs";
+      };
+
+      "/boot" = {
+        device = "/dev/disk/by-uuid/EE23-9347";
+        fsType = "vfat";
+        options = ["fmask=0777" "dmask=0777"];
+      };
+    };
+
+    swapDevices = [
+      {device = "/dev/disk/by-uuid/08b6efda-1bb5-4698-abae-fbfa8bff84fe";}
+    ];
+
+    networking = {
+      interfaces.ens18.ipv4.addresses = [
+        {
+          address = "154.12.117.50";
+          prefixLength = 27;
+        }
+      ];
+      defaultGateway = "154.12.117.33";
+      nameservers = [
+        "1.1.1.1"
+      ];
+    };
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+    system.stateVersion = "25.05";
+  };
+in {
+  arch = "x86_64";
+  type = "NixOS";
+  deploy.hostname = "154.12.117.50";
+  colmena.tags = [
+    "server"
+  ];
+  modules = [
+    hostConfig
+  ];
+}
diff --git a/tree.nix b/tree.nix
index 003497c8..f7203a62 100644
--- a/tree.nix
+++ b/tree.nix
@@ -95,7 +95,6 @@
           nix-gaming.nixosModules.pipewireLowLatency
           nix-gaming.nixosModules.platformOptimizations
           clipboard-sync.nixosModules.default
-          niri.nixosModules.niri
           nixos-cli.nixosModules.nixos-cli
           stylix.nixosModules.stylix
           microvm.nixosModules.host