diff --git a/hosts/froidmpa-laptop/default.nix b/hosts/froidmpa-laptop/default.nix index 0cc75f3..fa14d70 100644 --- a/hosts/froidmpa-laptop/default.nix +++ b/hosts/froidmpa-laptop/default.nix @@ -2,7 +2,7 @@ imports = [ ./hardware-configuration.nix ]; modules = { - desktop.hyprland.enable = true; + desktop.wm.enable = true; editor = { vim.enable = true; emacs.enable = true; diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 44f94d5..7fccfda 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -2,7 +2,7 @@ imports = [ ./hardware-configuration.nix ]; modules = { - desktop.hyprland.enable = true; + desktop.wm.enable = true; editor = { vim.enable = true; emacs.enable = true; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 085d6af..3f52b68 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -9,7 +9,8 @@ let "https://raw.githubusercontent.com/AngelJumbo/gruvbox-wallpapers/main/wallpapers/irl/houseonthesideofalake.jpg"; sha256 = "sha256-obKI4qZvucogqRCl51lwV9X8SRaMqcbBwWMfc9TupIo="; }; -in { +in +{ options.modules.desktop = { wallpaper = mkOption { @@ -18,7 +19,7 @@ in { }; }; - config = mkIf config.modules.desktop.hyprland.enable { + config = mkIf config.modules.desktop.wm.enable { fonts = { packages = with pkgs.unstable; [ diff --git a/modules/desktop/hyprland.nix b/modules/desktop/wm.nix similarity index 99% rename from modules/desktop/hyprland.nix rename to modules/desktop/wm.nix index dd852b1..1c3875c 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/wm.nix @@ -4,13 +4,13 @@ with lib; with lib.my; let - cfg = config.modules.desktop.hyprland; + cfg = config.modules.desktop.wm; term = "${ config.home-manager.users.${config.user.name}.programs.kitty.package }/bin/kitty"; in { - options.modules.desktop.hyprland = { enable = mkBoolOpt false; }; + options.modules.desktop.wm = { enable = mkBoolOpt false; }; config = mkIf cfg.enable {