From ff82426194be7ee787dae4cf93dd884441fe4572 Mon Sep 17 00:00:00 2001
From: Mora Unie Youer <mora_unie_youer@riseup.net>
Date: Sun, 30 Mar 2025 14:17:02 +0300
Subject: feat(mora): use NeoVim config and Niri from flakes

---
 user-mora.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'user-mora.nix')

diff --git a/user-mora.nix b/user-mora.nix
index 3a00430..c5ea169 100644
--- a/user-mora.nix
+++ b/user-mora.nix
@@ -7,6 +7,11 @@ let
   };
 in
 {
+  imports = [
+    inputs.niri.homeModules.niri
+    inputs.neovim-configuration.homeModules.default
+  ];
+
   home.stateVersion = "24.11";
   home.username = "mora";
   home.homeDirectory = "/home/mora";
@@ -21,6 +26,13 @@ in
   programs.carapace.enable = true;
 
 
+  ###
+  ### NeoVim
+  ###
+  # NOTE: this section works only due to neovim-configuration module
+  nvim.enable = true;
+
+
   ###
   ### Software
   ###
@@ -28,9 +40,6 @@ in
   programs.ripgrep.enable = true;
   programs.zoxide.enable = true;
 
-  programs.neovim.enable = true;
-  programs.neovim.defaultEditor = true;
-
   programs.git = {
     enable = true;
     delta.enable = true;
@@ -102,6 +111,13 @@ in
   };
 
 
+  ###
+  ### Graphical Session
+  ###
+  programs.niri.enable = true;
+  programs.niri.package = pkgs.niri-unstable;
+
+
   ###
   ### Extra Packages
   ###
@@ -129,7 +145,6 @@ in
     wireguard-tools
 
     # Applications
-    niri-unstable
     fuzzel
     inputs.aylurs-gtk-shell.packages.${pkgs.system}.agsFull
     inputs.wezterm.packages.${pkgs.system}.default
@@ -172,7 +187,7 @@ in
     Unit.Wants = [ "niri.service" ];
     Install.WantedBy = [ "graphical-session.target" ];
     Service = {
-      ExecStart = "${pkgs.xwayland-satellite}/bin/xwayland-satellite";
+      ExecStart = "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite";
       Restart = "on-failure";
     };
   };
-- 
cgit v1.2.3-70-g09d2