From 0d69f10fa9f4373cb2a22d16d0a9136b7e1a43fa Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 03:57:13 +1000 Subject: [PATCH] more discretisation of system/userspace --- core/packages.nix | 12 ------------ home/home.nix | 10 ++++++++-- home/hyprland/default.nix | 32 ++++++++++++++++++++------------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/core/packages.nix b/core/packages.nix index 5084032..6631a28 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -4,11 +4,8 @@ programs = { traceroute.enable = true; - starship.enable = true; fish.enable = true; git.enable = true; - - firefox.enable = true; }; @@ -26,15 +23,6 @@ ntfs3g xfsprogs - ## terminal - kitty - micro - pipes - cbonsai - hyfetch - cmatrix - peaclock - ## tools fd bc diff --git a/home/home.nix b/home/home.nix index e0eb543..36549cb 100644 --- a/home/home.nix +++ b/home/home.nix @@ -59,8 +59,14 @@ stateVersion = "23.11"; }; - - programs.home-manager.enable = true; + + programs = { + home-manager.enable = true; + starship.enable = true; + fish.enable = true; + git.enable = true; + firefox.enable = true; + }; systemd.user.startServices = "sd-switch"; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 8fb388e..ae2b16a 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -21,25 +21,33 @@ ]; home.packages = with pkgs; [ - hyprshot - hyprpicker - # xdg-desktop-portal-hyprland + ## desktop environment + waybar + swww + wlroots + wlsunset wlr-randr wl-clipboard + hyprshot + hyprpicker brightnessctl - gnome.gnome-themes-extra - wlsunset + + ## lib wayland xwayland - xdg-desktop-portal-gtk - wlroots - qt5ct - libva - dconf wayland-utils wayland-protocols + + ## lib + qt5ct + libva meson - waybar - swww + + ## compat + dconf + gnome.gnome-themes-extra + xdg-desktop-portal-gtk + # xdg-desktop-portal-hyprland + ]; }