From 76389b1902a7b6a7fb9e90a64ef3cbf9e96e4242 Mon Sep 17 00:00:00 2001
From: derfenix <derfenix@gmail.com>
Date: Mon, 1 Dec 2025 02:43:59 +0300
Subject: [PATCH] Add niri module, flake update

---
 flake.lock                | 30 +++++++++++++++---------------
 flake.nix                 |  1 -
 hosts/fenixpc/default.nix |  4 ++++
 hosts/fenixpc/fenix.nix   |  1 +
 modules/hm/niri.nix       | 28 ++++++++++++++++++++++++++++
 modules/hm/vivaldi.nix    |  2 +-
 6 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 modules/hm/niri.nix

diff --git a/flake.lock b/flake.lock
index 8b51ec1..5aa8b51 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763869804,
-        "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=",
+        "lastModified": 1764510518,
+        "narHash": "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd",
+        "rev": "83053e1d337f33e0b48250588006e4b9df2f0d9d",
         "type": "github"
       },
       "original": {
@@ -92,11 +92,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1762847253,
-        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
+        "lastModified": 1764440730,
+        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
+        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763678758,
-        "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1763880652,
-        "narHash": "sha256-0IQWEH6dED59HH725MKtCLQ9vm0G8NsrMl3ZpbL6qr0=",
+        "lastModified": 1764517825,
+        "narHash": "sha256-nSnujSkevFTp9Uj2oF0EgUGDN6JQrF0+t0s0wmo4sZ8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6bad1c7d404896921ecc336cd73a0ebec26f6b56",
+        "rev": "a6cbeb112d847fe6196f1040d663c797f7ecfd04",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1763622513,
-        "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
+        "lastModified": 1764316264,
+        "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
+        "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6e547d0..cdebbe0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,6 @@
     };
     nix-flatpak = {
       url = "github:gmodena/nix-flatpak";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
diff --git a/hosts/fenixpc/default.nix b/hosts/fenixpc/default.nix
index 09cfae8..4d3396e 100644
--- a/hosts/fenixpc/default.nix
+++ b/hosts/fenixpc/default.nix
@@ -108,6 +108,10 @@ in
   };
 
   programs = {
+    niri = {
+      enable = false;
+    };
+
     gamemode = {
       enable = true;
       settings = {
diff --git a/hosts/fenixpc/fenix.nix b/hosts/fenixpc/fenix.nix
index b127e8d..12a68a8 100644
--- a/hosts/fenixpc/fenix.nix
+++ b/hosts/fenixpc/fenix.nix
@@ -21,6 +21,7 @@ in
       kdePackages.kdenlive
       kdePackages.plasma-sdk
       yandex-music
+      krusader
 
       avidemux
       gimp
diff --git a/modules/hm/niri.nix b/modules/hm/niri.nix
new file mode 100644
index 0000000..6ef7258
--- /dev/null
+++ b/modules/hm/niri.nix
@@ -0,0 +1,28 @@
+{
+  pkgs,
+  osConfig,
+  lib,
+  ...
+}:
+let
+  enable = osConfig.programs.niri.enable;
+in
+{
+
+  programs = lib.mkIf (enable) {
+    alacritty.enable = true; # Super+T in the default setting (terminal)
+    fuzzel.enable = true; # Super+D in the default setting (app launcher)
+    swaylock.enable = true; # Super+Alt+L in the default setting (screen locker)
+    waybar.enable = true; # launch on startup in the default setting (bar)
+  };
+  services = lib.mkIf (enable) {
+    mako.enable = true; # notification daemon
+    swayidle.enable = true; # idle management daemon
+  };
+
+  home.packages =
+    with pkgs;
+    lib.mkIf (enable) [
+      swaybg
+    ];
+}
diff --git a/modules/hm/vivaldi.nix b/modules/hm/vivaldi.nix
index cdfc878..ec0fb95 100644
--- a/modules/hm/vivaldi.nix
+++ b/modules/hm/vivaldi.nix
@@ -25,7 +25,7 @@ in
       executable = true;
     };
 
-    programs.vivaldi = {
+    programs.vivaldi = lib.mkIf (conf.enable) {
       nativeMessagingHosts =
         [ ]
         ++ lib.optionals (osConfig.services.desktopManager.plasma6.enable) [