diff --git a/flake.nix b/flake.nix index 19e511c..5779a4f 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,17 @@ specialArgs = args; modules = [ ./systems/mellinoe.nix + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; # inherit the nixpkgs and its config + useUserPackages = true; + extraSpecialArgs = args; + users.rafiq.imports = [ + ./users/rafiq.nix + ]; + }; + } ]; }; }; diff --git a/users/modules/programs/hyprland.nix b/users/modules/programs/hyprland.nix index baffded..d8c9d60 100644 --- a/users/modules/programs/hyprland.nix +++ b/users/modules/programs/hyprland.nix @@ -1,8 +1,3 @@ -{ - inputs, - pkgs, - ... -}: { home.sessionVariables.NIXOS_OZONE_WL = "1"; wayland.windowManager.hyprland = { diff --git a/users/modules/programs/hyprlock.nix b/users/modules/programs/hyprlock.nix index 60a6e2d..b18d4b9 100644 --- a/users/modules/programs/hyprlock.nix +++ b/users/modules/programs/hyprlock.nix @@ -1,16 +1,25 @@ -{ pkgs, ... }: +{ pkgs, osConfig, ... }: +let + cfg = + if osConfig.networking.hostName == "nemesis" then + { + mainMonitor = "desc:OOO AN-270W04K"; + } + else + { + mainMonitor = ""; + }; +in { programs.hyprlock = { enable = true; package = null; settings = { - "$mainMonitor" = "desc:OOO AN-270W04K"; - "$vertMonitor" = "desc:Philips Consumer Electronics Company PHL 246V5 AU11330000086"; general.hide_cursor = true; label = { - monitor = "HDMI-A-1"; + monitor = cfg.mainMonitor; text = ''hi, $USER.''; font_size = 32; halign = "center"; @@ -19,7 +28,6 @@ zindex = 1; }; input-field = { - monitor = "HDMI-A-1"; fade_on_empty = true; size = "200, 45"; halign = "center";