diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix deleted file mode 100644 index e81ebc1..0000000 --- a/modules/desktop/hyprland.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ user }: -{ pkgs, ... }: { - programs.hyprland = { enable = true; }; - environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; - programs.waybar.enable = false; - environment.systemPackages = with pkgs; [ - # common utilities - busybox - scdoc - mpv - gcc - xdg-desktop-portal - # sound - pavucontrol - # notification daemon - dunst - libnotify - # hyprland - lxqt.lxqt-policykit - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - hyprlock - hypridle - hyprpaper - # color picker - hyprpicker - # nwg-shell - nwg-dock - nwg-dock-hyprland - nwg-launchers - nwg-displays - nwg-drawer - nwg-panel - gopsuinfo - nwg-look - nwg-menu - nwg-bar - # screenshots - swappy - hyprshot - # networking - networkmanagerapplet - meson - wl-clipboard - wlroots - cliphist - xdg-desktop-portal-wlr - # app launchers - rofi-wayland - wofi - ]; - services.mpd.enable = true; - services.pipewire.wireplumber.enable = true; - users.users.${user.name}.extraGroups = [ "input" ]; -} diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix index d870d2d..b82902d 100644 --- a/modules/desktop/wine.nix +++ b/modules/desktop/wine.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - wineWowPackages.stable - winetricks - wineWowPackages.waylandFull + ]; } diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 5d0ff68..438bc67 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -3,6 +3,7 @@ imports = [ ./common.nix ./kde.nix + ./hyprland.nix ./wayland.nix ./x11.nix ./packages.nix diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix new file mode 100644 index 0000000..0dd16ca --- /dev/null +++ b/modules/nixos/desktop/hyprland.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.desktop.hyprland; +in +{ + options = { + skyg.desktop.hyprland = { + enabled = mkEnableOption + "Hyprland"; + }; + }; + config = mkIf cfg.enabled { + programs.hyprland = { enable = true; }; + environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; + programs.waybar.enable = false; + environment.systemPackages = with pkgs; [ + # common utilities + busybox + scdoc + mpv + gcc + xdg-desktop-portal + # sound + pavucontrol + # notification daemon + dunst + libnotify + # hyprland + lxqt.lxqt-policykit + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + hyprlock + hypridle + hyprpaper + # color picker + hyprpicker + # nwg-shell + nwg-dock + nwg-dock-hyprland + nwg-launchers + nwg-displays + nwg-drawer + nwg-panel + gopsuinfo + nwg-look + nwg-menu + nwg-bar + # screenshots + swappy + hyprshot + # networking + networkmanagerapplet + meson + wl-clipboard + wlroots + cliphist + xdg-desktop-portal-wlr + # app launchers + rofi-wayland + wofi + ]; + services.mpd.enable = true; + services.pipewire.wireplumber.enable = true; + users.users.${config.skyg.user.name}.extraGroups = [ "input" ]; + }; +} diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 286cb1b..a2fd915 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -6,12 +6,12 @@ let in { options = { - skyg.skyg.desktop.kde = { - enable = mkEnableOption + skyg.desktop.kde = { + enabled = mkEnableOption "KDE"; }; }; - config = mkIf cfg.enable { + config = mkIf cfg.enabled { services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; services.desktopManager.plasma6.enableQt5Integration = true; diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index de41e5e..c0a6c2a 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -39,5 +39,10 @@ # terminal alacritty alacritty-theme + + # wine + wineWowPackages.stable + winetricks + wineWowPackages.waylandFull ]; }