diff --git a/configs/fonts.nix b/configs/fonts.nix
index 58b0a9c..43083c2 100644
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -126,7 +126,7 @@ in {
     fontconfig.defaultFonts = rec {
       monospace = ["Noto Sans Mono"] ++ emoji;
       serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
-      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic"];
+      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic" "Noto Sans Syriac Western"];
       emoji = ["Noto Color Emoji"];
     };
     # xelatex fails with woff files
diff --git a/configs/keyboard.nix b/configs/keyboard.nix
index 8bf5f07..05be284 100644
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -15,6 +15,7 @@
     avestan = ../lib/keyboards/avestan;
     gothic = ../lib/keyboards/gothic;
     farsi = { code = "ir"; variant = "qwerty"; };
+    syriac = { code = "sy"; variant = "syc_phonetic"; };
     sanskrit = { code = "in"; variant = "san-kagapa"; };
     gujarati = {code = "in"; variant = "guj-kagapa"; };
     urdu = {code = "in"; variant = "urd-phonetic"; };
diff --git a/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix b/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix
new file mode 100644
index 0000000..88ef04f
--- /dev/null
+++ b/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix
@@ -0,0 +1,46 @@
+{ pkgs, niveumPackages, config, ... }: {
+  environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
+  environment.shellAliases.vi = "nvim";
+  environment.shellAliases.vim = "nvim";
+  environment.shellAliases.view = "nvim -R";
+
+  home-manager.users.me = {
+    editorconfig = {
+      enable = true;
+      settings = {
+        "*" = {
+          charset = "utf-8";
+          end_of_line = "lf";
+          trim_trailing_whitespace = true;
+          insert_final_newline = true;
+          indent_style = "space";
+          indent_size = 2;
+        };
+        "*.py" = { indent_size = 4; };
+        Makefile = { indent_style = "tab"; };
+        "*.md" = { trim_trailing_whitespace = false; };
+      };
+    };
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
+    (niveumPackages.vim.override {
+      stylixColors = config.lib.stylix.colors;
+      # colorscheme = "base16-gruvbox-dark-medium";
+    })
+
+    # language servers
+    pkgs.pyright
+    pkgs.haskellPackages.haskell-language-server
+    pkgs.texlab
+    pkgs.nil
+    pkgs.rust-analyzer
+    pkgs.nodePackages.typescript-language-server
+    pkgs.lua-language-server
+    pkgs.nodePackages.vscode-langservers-extracted
+    pkgs.lemminx
+    niveumPackages.jq-lsp
+    pkgs.dhall-lsp-server
+  ];
+}