diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix new file mode 100644 index 0000000..44dc207 --- /dev/null +++ b/modules/desktop/gnome.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + environment.systemPackages = with pkgs; [ + gnomeExtensions.vitals + ]; + # Exclude Gnome packages + environment.gnome.excludePackages = [ + pkgs.gnome-tour + pkgs.gnome-console + ]; +} diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix new file mode 100644 index 0000000..cd73bcc --- /dev/null +++ b/modules/desktop/hyprland.nix @@ -0,0 +1,65 @@ +{ 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 + # apps + kitty + # 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; + programs.kdeconnect.enable = true; + services.pipewire.wireplumber.enable = true; + users.users.${user.name}.extraGroups = [ + "input" + ]; +} diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix new file mode 100644 index 0000000..d812e5b --- /dev/null +++ b/modules/desktop/kde.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + services.xserver.enable = true; + # services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + programs.dconf.enable = true; +} diff --git a/modules/desktop/main.nix b/modules/desktop/main.nix new file mode 100644 index 0000000..7bbee9f --- /dev/null +++ b/modules/desktop/main.nix @@ -0,0 +1,20 @@ +{ user +, enableX11 ? false +, enableGnome ? false +, enableKDE ? false +, enableHypr ? false +}: +{ ... }: +{ + imports = [ + ./wayland.nix + ] ++ (if enableX11 then [ + ./x11.nix + ] else [ ]) ++ (if enableGnome then [ + ./gnome.nix + ] else [ ]) ++ (if enableKDE then [ + ./kde.nix + ] else [ ]) ++ (if enableHypr then [ + ./hyprland.nix + ] else [ ]); +} diff --git a/modules/desktop/wayland.nix b/modules/desktop/wayland.nix new file mode 100644 index 0000000..f0b4b18 --- /dev/null +++ b/modules/desktop/wayland.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: +{ + services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.wayland = true; + programs.xwayland.enable = true; + environment.systemPackages = with pkgs; [ + wayland + wayland-protocols + wayland-utils + ]; +} diff --git a/modules/desktop/x11.nix b/modules/desktop/x11.nix new file mode 100644 index 0000000..ba7d1ff --- /dev/null +++ b/modules/desktop/x11.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + xkb.variant = ""; + }; +}