zaphyra's git: nixfiles

config: use `niri` from nixpkgs

diff --git a/config/home-manager/common/home.nix b/config/home-manager/common/home.nix
@@ -8,7 +8,7 @@
 
   imports = [
     inputs.impermanence.homeManagerModules.impermanence
-    inputs.niriFlake.homeModules.niri
+    inputs.niriFlake.homeModules.config
     inputs.sopsNix.homeManagerModules.sops
     inputs.sherlock.homeManagerModules.default
     inputs.airpodsctl.homeManagerModules.kairpodsd

diff --git a/config/home-manager/zaphyra/services/niri.nix b/config/home-manager/zaphyra/services/niri.nix
@@ -9,7 +9,6 @@
 {
 
   programs.niri = {
-    enable = true;
     settings = {
       input = {
         workspace-auto-back-and-forth = true;

diff --git a/config/home-manager/zaphyra/services/swayidle.nix b/config/home-manager/zaphyra/services/swayidle.nix
@@ -1,4 +1,9 @@
-{ lib, pkgs, ... }:
+{
+  systemConfig,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
 

@@ -7,14 +12,14 @@
     timeouts = [
       {
         timeout = 175;
-        command = "${lib.getExe pkgs.niri-stable} msg action power-off-monitors";
+        command = "${lib.getExe systemConfig.programs.niri.package} msg action power-off-monitors";
       }
       {
         timeout = 180;
         command = "${lib.getExe' pkgs.systemd "loginctl"} lock-session";
       }
       {
-        timeout = 30*60;
+        timeout = 30 * 60;
         command = "${lib.getExe' pkgs.systemd "systemctl"} spspend";
       }
     ];

diff --git a/config/nixos/modules/presets/graphical/typeNiri.nix b/config/nixos/modules/presets/graphical/typeNiri.nix
@@ -1,21 +1,16 @@
 {
-  inputs,
   pov,
   config,
   lib,
-  pkgs,
   ...
 }:
 let
-  inherit (lib) types;
   cfg = lib.getAttrFromPath pov config;
 
 in
 {
 
   config = lib.mkIf (cfg.enable && (cfg.type == "niri")) {
-    nixpkgs.overlays = [ inputs.niriFlake.overlays.niri ];
-
     modules = {
       hardware.bluetooth.enable = true;
       networking.NetworkManager.enable = true;

@@ -40,11 +35,7 @@ in
 
     programs = {
       dconf.enable = true;
-
-      niri = {
-        enable = true;
-        package = pkgs.niri-stable;
-      };
+      niri.enable = true;
     };
   };