From 85623e92db808b2cac90363a6ad0d0907b078e8f Mon Sep 17 00:00:00 2001 From: Uzair Mohammed Date: Mon, 23 Dec 2024 22:08:06 -0800 Subject: [PATCH] 2: Renamed system/modules/hyprland.nix to system/modules/wayland.nix (will configure a Home Manager Module later) and added GIMP to home/modules/media.nix --- home/modules/media.nix | 1 + system/modules/default.nix | 2 +- system/modules/hyprland.nix | 60 ------------------------------------- system/modules/wayland.nix | 17 +++++++++++ 4 files changed, 19 insertions(+), 61 deletions(-) delete mode 100644 system/modules/hyprland.nix create mode 100644 system/modules/wayland.nix diff --git a/home/modules/media.nix b/home/modules/media.nix index ee416bc..a723b90 100644 --- a/home/modules/media.nix +++ b/home/modules/media.nix @@ -2,6 +2,7 @@ { home.packages = with pkgs; [ nicotine-plus + gimp ]; programs.mpv.enable = true; diff --git a/system/modules/default.nix b/system/modules/default.nix index 6a73753..6f988f7 100644 --- a/system/modules/default.nix +++ b/system/modules/default.nix @@ -4,7 +4,7 @@ ./graphics.nix ./powerManagement.nix ./wireless.nix - #./hyprland.nix + #./wayland.nix ./syncthing.nix ./kdePlasma.nix ./media.nix diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix deleted file mode 100644 index 208a5f2..0000000 --- a/system/modules/hyprland.nix +++ /dev/null @@ -1,60 +0,0 @@ -{pkgs, ...}: { - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - environment.sessionVariables = { - WLR_NO_HARDWARE_CURSORS = "1"; - NIXOS_OZONE_WL = "1"; - QT_QPA_PLATFORMTHEME = "qt5ct"; - }; - - xdg.portal = { - enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; - }; - - environment.systemPackages = with pkgs; [ - # Default Hyprland terminal - kitty - alacritty - - waybar - - # Notification things - mako - libnotify - - # For wallpapers - hyprpaper - - # App launcher - rofi-wayland - - networkmanagerapplet - - playerctl - brightnessctl - - # Screenshot and copy stuff - grim - slurp - wl-clipboard - - # Needed to display workspaces in Waybar - hyprland-workspaces - - # For night light - wlsunset - - kdePackages.qt6ct - libsForQt5.qt5ct - catppuccin-qt5ct - - wlogout - - xfce.thunar - blueman - ]; -} diff --git a/system/modules/wayland.nix b/system/modules/wayland.nix new file mode 100644 index 0000000..7b51a82 --- /dev/null +++ b/system/modules/wayland.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + + environment.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + NIXOS_OZONE_WL = "1"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + }; + + xdg.portal = { + enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; + }; +}