diff options
Diffstat (limited to 'programs/hypr')
-rw-r--r-- | programs/hypr/default.nix | 16 | ||||
-rw-r--r-- | programs/hypr/hypridle.nix | 9 | ||||
-rw-r--r-- | programs/hypr/hyprland.nix | 38 | ||||
-rw-r--r-- | programs/hypr/hyprlock.nix | 9 | ||||
-rw-r--r-- | programs/hypr/hyprpaper.nix | 9 |
5 files changed, 40 insertions, 41 deletions
diff --git a/programs/hypr/default.nix b/programs/hypr/default.nix index 08b2d93..4a6bd01 100644 --- a/programs/hypr/default.nix +++ b/programs/hypr/default.nix @@ -1,10 +1,8 @@ -{ ... }: - -{ - imports = [ - ./hypridle.nix - ./hyprland.nix - ./hyprlock.nix - ./hyprpaper.nix - ]; +{...}: { + imports = [ + ./hypridle.nix + ./hyprland.nix + ./hyprlock.nix + ./hyprpaper.nix + ]; } diff --git a/programs/hypr/hypridle.nix b/programs/hypr/hypridle.nix index d100291..e481e74 100644 --- a/programs/hypr/hypridle.nix +++ b/programs/hypr/hypridle.nix @@ -1,9 +1,10 @@ -{ config, lib, ... }: - { + config, + lib, + ... +}: { home-manager.users.${config.user} = { services.hypridle = { - enable = true; settings = { @@ -34,8 +35,6 @@ } ]; }; - }; }; } - diff --git a/programs/hypr/hyprland.nix b/programs/hypr/hyprland.nix index 9631674..d70a587 100644 --- a/programs/hypr/hyprland.nix +++ b/programs/hypr/hyprland.nix @@ -1,7 +1,10 @@ -{ config, pkgs, lib, inputs, ... }: - -let - +{ + config, + pkgs, + lib, + inputs, + ... +}: let system = pkgs.stdenv.hostPlatform.system; hyprland = inputs.hyprland.packages.${system}; hyprland-plugins = inputs.hyprland-plugins.packages.${system}; @@ -13,14 +16,17 @@ let inactive = "rgb(${config.theme.colors.surface.bg})"; debug = false; - -in - -{ +in { environment = { variables = { - HYPRLAND_TRACE = if debug then "1" else "0"; - AQ_TRACE = if debug then "1" else "0"; + HYPRLAND_TRACE = + if debug + then "1" + else "0"; + AQ_TRACE = + if debug + then "1" + else "0"; XDG_CURRENT_DESKTOP = "Hyprland"; XDG_SESSION_TYPE = "wayland"; @@ -57,7 +63,6 @@ in home-manager.users.${config.user} = { wayland.windowManager.hyprland = { - enable = true; package = hyprland.hyprland; @@ -72,16 +77,17 @@ in # Config settings = { - # Debug debug.disable_logs = ! debug; debug.disable_time = ! debug; debug.enable_stdout_logs = debug; # Monitors - monitor = map (monitor: - "${monitor.name}, highres, auto, ${toString monitor.scale}" - ) config.monitors; + monitor = + map ( + monitor: "${monitor.name}, highres, auto, ${toString monitor.scale}" + ) + config.monitors; # Autostart exec-once = config.autoRun; @@ -325,8 +331,6 @@ in vrr = 1; }; }; # end settings - }; # end hyprland }; # end home-manager - } diff --git a/programs/hypr/hyprlock.nix b/programs/hypr/hyprlock.nix index 8c8f63d..a93bfa4 100644 --- a/programs/hypr/hyprlock.nix +++ b/programs/hypr/hyprlock.nix @@ -1,15 +1,15 @@ -{ config, lib, ... }: - { + config, + lib, + ... +}: { default.lockScreen = lib.mkDefault "hyprlock"; home-manager.users.${config.user} = { programs.hyprlock = { - enable = true; settings = { - background = { monitor = ""; path = config.theme.wallpaper; @@ -83,7 +83,6 @@ valign = "center"; }; }; - }; }; } diff --git a/programs/hypr/hyprpaper.nix b/programs/hypr/hyprpaper.nix index ddcb6cd..13641b7 100644 --- a/programs/hypr/hyprpaper.nix +++ b/programs/hypr/hyprpaper.nix @@ -1,9 +1,10 @@ -{ config, lib, ... }: - { + config, + lib, + ... +}: { home-manager.users.${config.user} = { services.hyprpaper = { - enable = true; settings = { @@ -11,8 +12,6 @@ wallpaper = ",${config.theme.wallpaper}"; splash = false; }; - }; }; } - |