From e51f88362645c59c03ed7c926753f518f487803c Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Wed, 22 Jan 2025 18:52:34 -0500
Subject: [PATCH 1/3] niri stuff; remove hosts module

---
 home/niri/default.nix   |  5 ++++-
 hosts/ytnix/default.nix |  7 +++----
 modules/default.nix     |  1 -
 modules/niri.nix        | 21 ---------------------
 4 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 modules/niri.nix

diff --git a/home/niri/default.nix b/home/niri/default.nix
index 92f5701..0c72563 100644
--- a/home/niri/default.nix
+++ b/home/niri/default.nix
@@ -135,13 +135,16 @@ 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/hosts/ytnix/default.nix b/hosts/ytnix/default.nix
index 0024c40..c2a670a 100644
--- a/hosts/ytnix/default.nix
+++ b/hosts/ytnix/default.nix
@@ -311,8 +311,7 @@
 
   services.trezord.enable = true;
 
-  my.niri = {
-    enable = true;
-    package = pkgs.niri-unstable;
-  };
+  programs.niri.enable = true;
+  programs.niri.package = pkgs.niri-unstable;
+  programs.xwayland.enable = true;
 }
diff --git a/modules/default.nix b/modules/default.nix
index bde6e96..2155137 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,6 +2,5 @@
 {
   imports = [
     ./backup.nix
-    ./niri.nix
   ];
 }
diff --git a/modules/niri.nix b/modules/niri.nix
deleted file mode 100644
index b5a6ef4..0000000
--- a/modules/niri.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  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;
-  };
-}

From a29326adf1b4ab7f6f2ba36b454b7920321c19ac Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Wed, 22 Jan 2025 18:52:53 -0500
Subject: [PATCH 2/3] nvim: fix fzf

---
 home/nixvim/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix
index 8a302b0..77586b6 100644
--- a/home/nixvim/default.nix
+++ b/home/nixvim/default.nix
@@ -115,7 +115,8 @@
               end
             end)
           '';
-          "<Tab>" = ''
+          # plain tab conflicts with i try to indent
+          "<C-Tab>" = ''
             cmp.mapping(function(fallback)
               if require("luasnip").jumpable(1) then
                 require("luasnip").jump(1)
@@ -174,6 +175,7 @@
     };
     plugins.fzf-lua = {
       enable = true;
+      profile = "fzf-native";
       keymaps = {
         "<leader>ff" = "files";
         "<leader>fg" = "live_grep";

From 6da74e745eaa32fe3dca816d9f9aa9742943fdbc Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Wed, 22 Jan 2025 18:53:05 -0500
Subject: [PATCH 3/3] define flake registry

---
 hosts/common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosts/common.nix b/hosts/common.nix
index b334b5f..2e8b31a 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 {
   nix = {
     settings = {
@@ -26,6 +26,7 @@
     extraOptions = ''
       	    builders-use-substitutes = true
       	  '';
+    registry.nixpkgs.flake = inputs.nixpkgs;
   };
   time.timeZone = "America/Toronto";
   networking.firewall.logRefusedConnections = false;