hosts/framework/home.nix

@@ -2,12 +2,11 @@
 
 let
   modules = import ../../modules;
-in
+in 
 {
   imports = [
     modules.common.home
     modules.hm.hyprland
-    modules.hm.niri
   ];
 
   home = {

modules/default.nix

@@ -15,8 +15,7 @@
   hm = {
     colors = ./home-manager/Rice/colors.nix;
     hyprland = ./home-manager/Rice/Hyprland/hyprland.nix;
-    scripts = ./home-manager/Rice/scripts.nix;
-    niri = ./home-manager/Rice/Niri/niri.nix;
+    scripts = ./home-manager/Rice/Hyprland/scripts.nix;
     nvim = ./home-manager/nvim.nix;
     shell = ./home-manager/shell.nix;
     spicetify = ./home-manager/spicetify.nix;

modules/home-manager/Rice/Hyprland/hyprland.nix

@@ -122,7 +122,7 @@ in
 
   home.packages = with pkgs; [
     # Custom scripts
-    (import ../scripts { inherit pkgs; })
+    (import ./scripts.nix { inherit pkgs; })
     # Hyprland related (rice, etc...)
     wofi
     alacritty

modules/home-manager/Rice/Niri/niri.nix

@@ -1,12 +0,0 @@
-{}:
-
-{
-  programs.niri = {
-    enable = true;
-    config = {
-      input = {
-        focus-follows-mouse = null;
-      };
-    };
-  };
-}

modules/home-manager/Rice/colors.nix

@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ config, pkgs, inputs, ...}:
 
 {
   stylix = {

modules/home-manager/spicetify.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, lib, ... }:
+{ pkgs, inputs, ... }:
 
   # Spicetify
 let
@@ -18,7 +18,7 @@ in
       pointer
     ];
 
-    theme = lib.mkDefault spicePkgs.themes.catppuccin;
-    colorScheme = lib.mkDefault "mocha";
+    theme = spicePkgs.themes.catppuccin;
+    colorScheme = "mocha";
   };
 }

modules/home-manager/zed.nix

@@ -27,7 +27,7 @@
     extraPackages = [ pkgs.nixd ];
 
     userSettings = {
-      theme = lib.mkDefault {
+      theme = {
         mode = "system";
         dark = "Catppuccin Frappé (Blur)";
         light = "Rosé Pine Dawn";