From 32cc00b41352b7ac8357ee56871c352ff9639659 Mon Sep 17 00:00:00 2001
From: Alexandre <mateialex@outlook.fr>
Date: Thu, 28 May 2026 22:13:24 +0200
Subject: [PATCH] First attempt at configuring niri

---
 hosts/framework/home.nix                             |  3 ++-
 modules/default.nix                                  |  3 ++-
 modules/home-manager/Rice/Hyprland/hyprland.nix      |  2 +-
 modules/home-manager/Rice/Niri/niri.nix              | 12 ++++++++++++
 modules/home-manager/Rice/colors.nix                 |  2 +-
 modules/home-manager/Rice/{Hyprland => }/scripts.nix |  0
 modules/home-manager/spicetify.nix                   |  6 +++---
 7 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 modules/home-manager/Rice/Niri/niri.nix
 rename modules/home-manager/Rice/{Hyprland => }/scripts.nix (100%)

diff --git a/hosts/framework/home.nix b/hosts/framework/home.nix
index 1b9e3dd..62718cb 100644
--- a/hosts/framework/home.nix
+++ b/hosts/framework/home.nix
@@ -2,11 +2,12 @@
 
 let
   modules = import ../../modules;
-in 
+in
 {
   imports = [
     modules.common.home
     modules.hm.hyprland
+    modules.hm.niri
   ];
 
   home = {
diff --git a/modules/default.nix b/modules/default.nix
index 846f0fa..8bdcc69 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -15,7 +15,8 @@
   hm = {
     colors = ./home-manager/Rice/colors.nix;
     hyprland = ./home-manager/Rice/Hyprland/hyprland.nix;
-    scripts = ./home-manager/Rice/Hyprland/scripts.nix;
+    scripts = ./home-manager/Rice/scripts.nix;
+    niri = ./home-manager/Rice/Niri/niri.nix;
     nvim = ./home-manager/nvim.nix;
     shell = ./home-manager/shell.nix;
     spicetify = ./home-manager/spicetify.nix;
diff --git a/modules/home-manager/Rice/Hyprland/hyprland.nix b/modules/home-manager/Rice/Hyprland/hyprland.nix
index 0b46f39..278c89d 100644
--- a/modules/home-manager/Rice/Hyprland/hyprland.nix
+++ b/modules/home-manager/Rice/Hyprland/hyprland.nix
@@ -122,7 +122,7 @@ in
 
   home.packages = with pkgs; [
     # Custom scripts
-    (import ./scripts.nix { inherit pkgs; })
+    (import ../scripts { inherit pkgs; })
     # Hyprland related (rice, etc...)
     wofi
     alacritty
diff --git a/modules/home-manager/Rice/Niri/niri.nix b/modules/home-manager/Rice/Niri/niri.nix
new file mode 100644
index 0000000..30ecf1b
--- /dev/null
+++ b/modules/home-manager/Rice/Niri/niri.nix
@@ -0,0 +1,12 @@
+{}:
+
+{
+  programs.niri = {
+    enable = true;
+    config = {
+      input = {
+        focus-follows-mouse = null;
+      };
+    };
+  };
+}
diff --git a/modules/home-manager/Rice/colors.nix b/modules/home-manager/Rice/colors.nix
index 795ea0c..0b20f8c 100644
--- a/modules/home-manager/Rice/colors.nix
+++ b/modules/home-manager/Rice/colors.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ...}:
+{ pkgs, ...}:
 
 {
   stylix = {
diff --git a/modules/home-manager/Rice/Hyprland/scripts.nix b/modules/home-manager/Rice/scripts.nix
similarity index 100%
rename from modules/home-manager/Rice/Hyprland/scripts.nix
rename to modules/home-manager/Rice/scripts.nix
diff --git a/modules/home-manager/spicetify.nix b/modules/home-manager/spicetify.nix
index 973d5f7..bf686bd 100644
--- a/modules/home-manager/spicetify.nix
+++ b/modules/home-manager/spicetify.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, inputs, lib, ... }:
 
   # Spicetify
 let
@@ -18,7 +18,7 @@ in
       pointer
     ];
 
-    theme = spicePkgs.themes.catppuccin;
-    colorScheme = "mocha";
+    theme = lib.mkDefault spicePkgs.themes.catppuccin;
+    colorScheme = lib.mkDefault "mocha";
   };
 }