Clean ups

This commit is contained in:
ari committed 2024-09-10 09:20:29 -04:00
1 parent 2473e1a1bc
commit 2105694101
11 files changed
+111 -46

No files matched your search

+3 -3
View File
@@ -7,12 +7,12 @@ in
config = lib.mkIf cfg.enabled {
programs.hyprland = {
enable = true;
package = hyprpkgs.hyprland;
portalPackage = hyprpkgs.xdg-desktop-portal-hyprland;
# package = hyprpkgs.hyprland;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
xwayland.enable = true;
systemd.setPath.enable = true;
};
xdg.portal.extraPortals = [ hyprpkgs.xdg-desktop-portal-hyprland ];
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
services.hypridle.enable = true;
environment.sessionVariables = { NIXOS_OZONE_WL = "1"; };
environment.systemPackages = with pkgs; [
+19 -6
View File
@@ -4,9 +4,18 @@ let
in
{
config = lib.mkIf (cfg.enabled && !cfg.useNWG) {
home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland.plugins = [
inputs.hyprspace.packages.${pkgs.system}.Hyprspace
];
home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
# package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
# plugins = [
# inputs.hyprspace.packages.${pkgs.system}.Hyprspace
# ];
extraConfig = ''
source = ~/.config/hypr/hyprland.d/*.conf
debug:enable_stdout_logs = true
'';
};
programs.hyprlock.enable = true;
environment.systemPackages = with pkgs; [
# general utilities
@@ -26,18 +35,22 @@ in
nwg-bar # logout window
];
system.userActivationScripts.hyprlandMineConfig.text = ''
rm "$HOME/.config/hypr"
rm -f "$HOME/.config/hypr"
if [[ ! -h "$HOME/.config/hypr" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr"
fi
rm "$HOME/.config/waybar"
rm -f "$HOME/.config/waybar"
if [[ ! -h "$HOME/.config/waybar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar"
fi
rm "$HOME/.config/nwg-bar"
rm -f "$HOME/.config/nwg-bar"
if [[ ! -h "$HOME/.config/nwg-bar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar"
fi
rm -f "$HOME/.config/dunst"
if [[ ! -h "$HOME/.config/dunst" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/nwg-bar"
fi
'';
};
}