From 3583d47bdeceea171e551489b6306bf0fa4235f1 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 12 Jan 2025 10:37:44 +0900
Subject: [PATCH] refactor(niri): use nixpkgs' nixos module

---
 applications/niri/default.nix | 11 ++++++++++-
 systems/nixos/desktop.nix     |  6 ------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/applications/niri/default.nix b/applications/niri/default.nix
index c7c1b518..a24be6d6 100644
--- a/applications/niri/default.nix
+++ b/applications/niri/default.nix
@@ -1,10 +1,19 @@
-{ lib, pkgs, ... }:
+{
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
 let
   defaultKeyBind = import ./defaultKeyBind.nix;
   terminal = "kitty";
   launcher = "fuzzel";
 in
 {
+  imports = [ inputs.niri-flake.homeModules.niri ];
+
+  programs.niri.package = pkgs.niri;
+
   programs.niri.settings = {
     binds = defaultKeyBind // {
       "Mod+Return".action.spawn = terminal;
diff --git a/systems/nixos/desktop.nix b/systems/nixos/desktop.nix
index 4946cd39..b81ec610 100644
--- a/systems/nixos/desktop.nix
+++ b/systems/nixos/desktop.nix
@@ -1,20 +1,14 @@
 {
-  inputs,
   config,
   lib,
   pkgs,
   ...
 }:
 {
-  imports = [ inputs.niri-flake.nixosModules.niri ];
-
   programs.niri = {
     enable = true;
-    package = pkgs.niri;
   };
 
-  niri-flake.cache.enable = false;
-
   programs.hyprland = {
     # fcitx doesn't start if multiple WMs are enabled
     # TODO: fix ime settings