From 7697ad2b90f0c490c75fa5b22dde3840fc455d2d Mon Sep 17 00:00:00 2001
From: Aargh Rai <aargh.rai+git@gmail.com>
Date: Fri, 11 Jul 2025 22:04:39 +0530
Subject: nvim & boot changes

---
 boot.nix          |  3 +--
 configuration.nix |  1 +
 environment.nix   |  3 ---
 home.nix          |  4 +---
 nvim.nix          | 37 +++++++++++++++++++++++++++++++++++++
 services.nix      | 21 +++++++++++++++++++++
 6 files changed, 61 insertions(+), 8 deletions(-)
 create mode 100644 nvim.nix

diff --git a/boot.nix b/boot.nix
index 05a7582..0380d33 100644
--- a/boot.nix
+++ b/boot.nix
@@ -12,8 +12,7 @@
       menuentry "Windows" {
         insmod part_gpt
         insmod fat
-        insmod search_fs_uuid
-        insmod chain
+        set root=(hd0,gpt1)
         chainloader /EFI/Microsoft/Boot/bootmgfw.efi
       }
       menuentry "Reboot" {
diff --git a/configuration.nix b/configuration.nix
index 86ac049..0dfa462 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,6 +8,7 @@
       ./nvidia.nix
       ./home.nix
       ./environment.nix
+      ./nvim.nix
       ./apps.nix
       <home-manager/nixos>
     ];
diff --git a/environment.nix b/environment.nix
index a75953c..9119747 100644
--- a/environment.nix
+++ b/environment.nix
@@ -2,13 +2,10 @@
 {
   environment.systemPackages = with pkgs; [
     gcc
-    cargo
     python311
     zoxide
     starship
     tmux
     cmake
-    nodejs_20
-    unzip
   ];
 }
diff --git a/home.nix b/home.nix
index 85c47d4..069ed4c 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }:
-let unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in {
+{
   users.users.aargh = {
     isNormalUser = true;
     description = "Aargh";
@@ -23,7 +22,6 @@ in {
     nmap
     dust
     gnome-tweaks
-    unstable.neovim
     home-manager
   ];
 }
diff --git a/nvim.nix b/nvim.nix
new file mode 100644
index 0000000..f665e46
--- /dev/null
+++ b/nvim.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+let unstable = import <nixos-unstable> { config.allowUnfree = true; };
+in {
+  environment.systemPackages = with pkgs; [
+    unstable.neovim
+
+    ripgrep
+    gcc
+    cargo
+    python311
+    nodejs_20
+    unzip
+    lua
+    lua53Packages.luarocks
+    lua53Packages.luafilesystem
+    xsel
+    tree-sitter
+
+    lua-language-server
+    vscode-langservers-extracted
+    rust-analyzer
+    zls
+    typescript-language-server
+    javascript-typescript-langserver
+    (pkgs.python3.withPackages (ps: with ps; [
+      python-lsp-server
+      python-lsp-jsonrpc
+      python-lsp-black
+      python-lsp-ruff
+      pyls-isort
+      pyls-flake8
+      ruff
+      black
+      isort
+    ]))
+  ];
+}
diff --git a/services.nix b/services.nix
index 626464f..1c85666 100644
--- a/services.nix
+++ b/services.nix
@@ -28,4 +28,25 @@
     enable = true;
     acceleration = "cuda";
   };
+  services.kanata = {
+  enable = true;
+  keyboards = {
+    "keyboard".config = ''
+      (defsrc
+        grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+        tab  q    w    e    r    t    y    u    i    o    p    [    ]    ret
+        caps a    s    d    f    g    h    j    k    l    ;    '    \
+        lsft z    x    c    v    b    n    m    ,    .    /    rsft
+        lctl lmet lalt  spc  ralt rmet rctl
+      )
+      (deflayer qwerty
+        grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+        tab  q    w    e    r    t    y    u    i    o    p    [    ]    ret
+        esc  a    s    d    f    g    h    j    k    l    ;    '    \
+        lsft z    x    c    v    b    n    m    ,    .    /    rsft
+        lctl lmet lalt  spc  ralt rmet rctl
+      )
+    '';
+  };
+};
 }
-- 
cgit v1.2.3