From 50a49967e0f3a906ab1aea4b1633e1d13c73534f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 23 Aug 2024 10:40:42 -0400 Subject: [PATCH] Enabled hyprland --- hosts/fwbook.nix | 1 + modules/nixos/desktop/hyprland.nix | 81 ++++++++++++++++++------------ modules/nixos/desktop/packages.nix | 5 ++ 3 files changed, 54 insertions(+), 33 deletions(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index a7f880c..37236a7 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -12,6 +12,7 @@ in skyg.nixos.desktop = { enabled = true; kde.enabled = true; + hyprland.enabled = true; }; skyg.nixos.common.hardware.sound.enable = true; # Firmware updater diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix index 4f9f5fd..a766ce4 100644 --- a/modules/nixos/desktop/hyprland.nix +++ b/modules/nixos/desktop/hyprland.nix @@ -12,57 +12,72 @@ in }; }; config = mkIf cfg.enabled { - programs.hyprland = { enable = true; }; + programs.hyprland.enable = true; + # programs.hyprland.xwayland.enable = true; + programs.hyprland.systemd.setPath.enable = true; + services.hypridle.enable = true; + # services.xserver.windowManager.hypr.enable = true; + programs.hyprlock.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 + # mpv + # sound pavucontrol + # notification daemon dunst libnotify + # hyprland - lxqt.lxqt-policykit - xdg-desktop-portal-gtk + pyprland + # hyprlock + # hypridle + # hyprpaper + # gbar + + # lxqt.lxqt-policykit + xdg-desktop-portal 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 + # # nwg-dock + # # nwg-dock-hyprland + # # nwg-launchers + # # nwg-displays + # # nwg-drawer + # # nwg-panel + # # gopsuinfo + # # nwg-look + # # nwg-menu + # # nwg-bar + + # general utilities + # swappy + hyprshot # screenshots + cliphist # clipboard manager + # networking networkmanagerapplet - meson - wl-clipboard - wlroots - cliphist - xdg-desktop-portal-wlr - # app launchers - rofi-wayland - wofi + + # wl-clipboard + # wlroots + # 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" ]; + system.userActivationScripts.hyprlandlocalConfig.text = '' + if [[ ! -h "$HOME/.config/hypr" ]]; then + ln -s "$HOME/.config/hypr" "/home/${config.skyg.user.name}/nixos-setup/configs/hypr" + fi + ''; }; } diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 3412d0f..9852604 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -9,9 +9,14 @@ in # Mobile Connect programs.kdeconnect.enable = true; environment.systemPackages = with pkgs; [ + # General utils + busybox + gcc + # copy to clipboard wl-clipboard-x11 xclip + # socials slack zoom-us