From e536d9c793e55c4a7340e1ef7fb0da00795a8a18 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 04:05:03 +1000 Subject: [PATCH] more discretisation of system/userspace --- core/packages.nix | 3 +++ home/hyprland/default.nix | 7 ++++++- home/hyprland/dunst.nix | 2 -- home/hyprland/hyprcursor.nix | 1 - home/hyprland/hypridle.nix | 1 - home/hyprland/hyprlock.nix | 2 -- home/hyprland/hyprpaper.nix | 1 - home/hyprland/waybar.nix | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/core/packages.nix b/core/packages.nix index 6631a28..b99b599 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -11,6 +11,9 @@ environment.systemPackages = with pkgs; [ + ## temporary + waybar + ## nixos # nix-tree # nix-init diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index ae2b16a..1a95757 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -28,8 +28,12 @@ wlsunset wlr-randr wl-clipboard + hypridle + hyprlock hyprshot + hyprpaper hyprpicker + hyprcursor brightnessctl ## lib wayland @@ -38,9 +42,10 @@ wayland-protocols ## lib + meson qt5ct libva - meson + libnotify ## compat dconf diff --git a/home/hyprland/dunst.nix b/home/hyprland/dunst.nix index 0f9d315..3896df0 100644 --- a/home/hyprland/dunst.nix +++ b/home/hyprland/dunst.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: { - home.packages = with pkgs; [ libnotify ]; - services.dunst = { enable = true; iconTheme = { diff --git a/home/hyprland/hyprcursor.nix b/home/hyprland/hyprcursor.nix index 518c519..2c39379 100644 --- a/home/hyprland/hyprcursor.nix +++ b/home/hyprland/hyprcursor.nix @@ -1,5 +1,4 @@ { config, pkgs, ... }: { - home.packages = with pkgs; [ hyprcursor ]; # home.file.".local/share/icons/rose-pine-hyprcursor" = { # recursive = true; diff --git a/home/hyprland/hypridle.nix b/home/hyprland/hypridle.nix index c970830..e39a785 100644 --- a/home/hyprland/hypridle.nix +++ b/home/hyprland/hypridle.nix @@ -1,5 +1,4 @@ { config, pkgs, ... }: { - home.packages = with pkgs; [ hypridle ]; xdg.configFile."hypr/hypridle.conf".text = '' general { diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix index 908a884..e40a832 100644 --- a/home/hyprland/hyprlock.nix +++ b/home/hyprland/hyprlock.nix @@ -1,7 +1,5 @@ { pkgs, config, ... }: { - home.packages = with pkgs; [ hyprlock ]; - xdg.configFile."hypr/hyprlock.conf".text = '' background { monitor = diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix index d25c538..db80be4 100644 --- a/home/hyprland/hyprpaper.nix +++ b/home/hyprland/hyprpaper.nix @@ -1,5 +1,4 @@ { pkgs, config, ... }: { - home.packages = with pkgs; [ hyprpaper ]; xdg.configFile."hypr/hyprpaper.conf".text = '' preload = ~/.config/wallpapers/${config.theme.wallpaper} diff --git a/home/hyprland/waybar.nix b/home/hyprland/waybar.nix index 51c3f07..a2ce8d0 100644 --- a/home/hyprland/waybar.nix +++ b/home/hyprland/waybar.nix @@ -6,7 +6,7 @@ programs.waybar = { enable = true; - # package = waybar.packages."${pkgs.system}".waybar; + package = waybar.packages."${pkgs.system}".waybar; systemd.enable = true; settings = { mainBar = {