branching — not good idea...

flake.nix

@@ -51,45 +51,45 @@
       };
 
       system = "x86_64-linux";
+      general_import = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+
+      general_special_args = {
+        inherit
+          inputs
+          userConfig
+          ;
+      };
+
+      general_module_import = [
+        ./home.nix
+        catppuccin.homeModules.catppuccin
+        nixvim.homeModules.nixvim
+      ];
+
     in
     {
       homeConfigurations = {
         "arch" = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
+          pkgs = general_import;
-            inherit system;
+
-            config.allowUnfree = true;
+          extraSpecialArgs = general_special_args // {
-          };
-          extraSpecialArgs = {
-            inherit
-              inputs
-              userConfig
-              ;
             isNixOS = false;
           };
-          modules = [
-            ./home.nix
-            catppuccin.homeModules.catppuccin
-            nixvim.homeModules.nixvim
-          ];
 
+          modules = general_module_import;
         };
+
         "nixos" = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
+          pkgs = general_import;
-            inherit system;
+
-            config.allowUnfree = true;
+          extraSpecialArgs = general_special_args // {
-          };
-          extraSpecialArgs = {
-            inherit
-              inputs
-              userConfig
-              ;
             isNixOS = true;
           };
-          modules = [
+
-            ./home.nix
+          modules = general_module_import;
-            catppuccin.homeModules.catppuccin
-            nixvim.homeModules.nixvim
-          ];
         };
       };
     };

modules/hypr/hyprland.nix

@@ -3,6 +3,7 @@
   lib,
   userConfig,
   pkgs,
+  inputs,
   ...
 }:
 let
@@ -24,7 +25,12 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package =
+      if isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
+    portalPackage = lib.mkIf (
+      isNixOS
+    ) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    xwayland.enable = true;
 
     settings = {
       "$mainMod" = "SUPER";
@@ -50,7 +56,7 @@ in
         "col.inactive_border" = "$overlay1";
         resize_on_border = false;
         allow_tearing = false;
-        layout = "dwindle";
+        layout = if isNixOS then "scrolling" else "dwindle"; # i use hyprland-git on nixos
       };
 
       animations = {