diff --git a/home/niri/default.nix b/home/niri/default.nix
index 0c72563..92f5701 100644
--- a/home/niri/default.nix
+++ b/home/niri/default.nix
@@ -135,16 +135,13 @@ in
       "Mod+Shift+U".action = move-window-to-workspace-up;
       "Mod+Shift+I".action = move-window-to-workspace-down;
       "Mod+W".action = maximize-column;
-      "Mod+E".action = set-column-width "50%";
-      "Mod+R".action = set-column-width "75%";
-      "Mod+Q".action = set-column-width "25%";
       "Mod+C".action = center-column;
       "Mod+Shift+Space".action = toggle-window-floating;
       "Mod+Space".action = switch-focus-between-floating-and-tiling;
       "Print".action = screenshot;
       "Alt+Print".action = screenshot-window;
       "Ctrl+Print".action = screenshot-screen;
-      # "Mod+R".action = switch-preset-column-width;
+      "Mod+R".action = switch-preset-column-width;
       "Mod+Shift+R".action = switch-preset-window-height;
       "Mod+Ctrl+R".action = reset-window-height;
       "Mod+F".action = fullscreen-window;
diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix
index 77586b6..8a302b0 100644
--- a/home/nixvim/default.nix
+++ b/home/nixvim/default.nix
@@ -115,8 +115,7 @@
               end
             end)
           '';
-          # plain tab conflicts with i try to indent
-          "<C-Tab>" = ''
+          "<Tab>" = ''
             cmp.mapping(function(fallback)
               if require("luasnip").jumpable(1) then
                 require("luasnip").jump(1)
@@ -175,7 +174,6 @@
     };
     plugins.fzf-lua = {
       enable = true;
-      profile = "fzf-native";
       keymaps = {
         "<leader>ff" = "files";
         "<leader>fg" = "live_grep";
diff --git a/hosts/common.nix b/hosts/common.nix
index 2e8b31a..b334b5f 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ ... }:
 {
   nix = {
     settings = {
@@ -26,7 +26,6 @@
     extraOptions = ''
       	    builders-use-substitutes = true
       	  '';
-    registry.nixpkgs.flake = inputs.nixpkgs;
   };
   time.timeZone = "America/Toronto";
   networking.firewall.logRefusedConnections = false;
diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix
index c2a670a..0024c40 100644
--- a/hosts/ytnix/default.nix
+++ b/hosts/ytnix/default.nix
@@ -311,7 +311,8 @@
 
   services.trezord.enable = true;
 
-  programs.niri.enable = true;
-  programs.niri.package = pkgs.niri-unstable;
-  programs.xwayland.enable = true;
+  my.niri = {
+    enable = true;
+    package = pkgs.niri-unstable;
+  };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 2155137..bde6e96 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,5 +2,6 @@
 {
   imports = [
     ./backup.nix
+    ./niri.nix
   ];
 }
diff --git a/modules/niri.nix b/modules/niri.nix
new file mode 100644
index 0000000..b5a6ef4
--- /dev/null
+++ b/modules/niri.nix
@@ -0,0 +1,21 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.my.niri;
+in
+{
+  options.my.niri = {
+    enable = lib.mkEnableOption "niri";
+    package = lib.mkPackageOption pkgs "niri" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.niri.package = cfg.package;
+    programs.niri.enable = true;
+    programs.xwayland.enable = true;
+  };
+}