2 files changed, 36 insertions, 8 deletions
diff --git a/modules/packages/niri/settings.nix b/modules/packages/niri/settings.nix
index 1ada95e..f3ad40e 100644
--- a/modules/packages/niri/settings.nix
+++ b/modules/packages/niri/settings.nix
@@ -1,7 +1,6 @@
 {self, ...}: {
   flake.wrapperModules.niri = {
     lib,
-    config,
     pkgs,
     noctalia-shell,
     ...
@@ -65,6 +64,7 @@
         "Mod+F4".close-window = {};
 
         "Mod+R".switch-preset-column-width = {};
+        "Mod+F".fullscreen-window = {};
 
         "Mod+1".focus-workspace = "w0";
         "Mod+2".focus-workspace = "w1";
diff --git a/modules/packages/nvf/_nvfConfig.nix b/modules/packages/nvf/_nvfConfig.nix
index dee7519..111af81 100644
--- a/modules/packages/nvf/_nvfConfig.nix
+++ b/modules/packages/nvf/_nvfConfig.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   config.vim = {
     viAlias = true;
     vimAlias = true;
@@ -10,8 +6,9 @@
     lineNumberMode = "relNumber";
 
     options = {
-      tabstop = lib.mkDefault 2;
-      shiftwidth = 0;
+      tabstop = 4;
+      shiftwidth = 4;
+      softtabstop = 4;
       termguicolors = true;
     };
 
@@ -47,6 +44,18 @@
         action = ":Telescope find_files<CR>";
       }
       {
+        key = "<leader>fg";
+        mode = "n";
+        silent = true;
+        action = ":Telescope live_grep<CR>";
+      }
+      {
+        key = "<leader>fb";
+        mode = "n";
+        silent = true;
+        action = ":Telescope buffers<CR>";
+      }
+      {
         key = "<C-d>";
         mode = "n";
         silent = true;
@@ -68,6 +77,7 @@
 
     lsp = {
       enable = true;
+      formatOnSave = true;
     };
 
     languages = {
@@ -77,6 +87,10 @@
         enable = true;
         lsp.enable = true;
         lsp.servers = ["nixd"];
+        format = {
+          enable = true;
+          type = ["alejandra"];
+        };
       };
       clang.enable = true;
       rust.enable = true;
@@ -111,9 +125,18 @@
       rainbow-delimiters.enable = true;
     };
 
+    ui = {
+      colorizer = {
+        enable = true;
+        setupOpts.filetypes."*" = {};
+      };
+    };
+
     statusline.lualine.enable = true;
     git.gitsigns.enable = true;
 
+    comments.comment-nvim.enable = true;
+
     extraPlugins = {
       gruvbox-material = {
         package = pkgs.vimPlugins.gruvbox-material;
@@ -134,6 +157,11 @@
         event = ["InsertLeave"];
         command = "set relativenumber";
       }
+      {
+        event = ["FileType"];
+        pattern = ["nix"];
+        command = "setlocal tabstop=2 shiftwidth=2 softtabstop=2";
+      }
     ];
   };
 }