Cleaned up sumo + splitting hyprland configs

This commit is contained in:
ari committed 2024-08-30 22:34:54 -04:00
1 parent 4ecf8b50b7
commit bc5adf74ff
40 files changed
+835 -361

No files matched your search

+1 -1
View File
@@ -6,8 +6,8 @@ let
in
{
imports = [
./hyprland
./kde.nix
./hyprland.nix
./wayland.nix
./x11.nix
./packages.nix
-68
View File
@@ -1,68 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.skyg.nixos.desktop.hyprland;
in
{
options = {
skyg.nixos.desktop.hyprland = {
enabled = mkEnableOption
"Hyprland";
};
};
config = mkIf cfg.enabled {
programs.hyprland.enable = true;
# programs.hyprland.xwayland.enable = true;
programs.hyprland.systemd.setPath.enable = true;
services.hypridle.enable = true;
programs.hyprlock.enable = true;
# programs.waybar.enable = true;
environment.sessionVariables = { NIXOS_OZONE_WL = "1"; };
environment.systemPackages = with pkgs; [
# sound
pavucontrol
# notification daemon
dunst
libnotify
# App Support
lxqt.lxqt-policykit
xdg-desktop-portal
xdg-desktop-portal-hyprland
# general utilities
swappy # screenshot editor
hyprshot # screenshots
cliphist # clipboard manager
xfce.thunar # file manager
wofi # app launcher
wl-screenrec # screen recorder
slurp # helper selection tools
waypaper # wallpaper manager
swww # wallpaper service
waybar # top bar
nwg-bar # logout window
hypridle # idle watch
brightnessctl # brightness ctl
networkmanagerapplet # networking
];
# <Sound
services.mpd.enable = true;
services.pipewire.wireplumber.enable = true;
users.users.${config.skyg.user.name}.extraGroups = [ "input" ];
# Sound />
system.userActivationScripts.hyprlandlocalConfig.text = ''
if [[ ! -h "$HOME/.config/hypr" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hypr" "$HOME/.config/hypr"
fi
if [[ ! -h "$HOME/.config/waybar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/waybar" "$HOME/.config/waybar"
fi
if [[ ! -h "$HOME/.config/nwg-bar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/nwg-bar" "$HOME/.config/nwg-bar"
fi
'';
};
}
+40
View File
@@ -0,0 +1,40 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.skyg.nixos.desktop.hyprland;
in
{
config = mkIf cfg.enabled {
programs.hyprland.enable = true;
programs.hyprland.xwayland.enable = true;
programs.hyprland.systemd.setPath.enable = true;
services.hypridle.enable = true;
# programs.hyprlock.enable = true;
# programs.waybar.enable = true;
environment.sessionVariables = { NIXOS_OZONE_WL = "1"; };
environment.systemPackages = with pkgs; [
# sound
pavucontrol
# notification daemon
dunst
libnotify
# App Support
xwaylandvideobridge
lxqt.lxqt-policykit
xdg-desktop-portal
xdg-desktop-portal-hyprland
# general utilities
brightnessctl # brightness ctl
networkmanagerapplet # networking
];
# <Sound
services.mpd.enable = true;
services.pipewire.wireplumber.enable = true;
users.users.${config.skyg.user.name}.extraGroups = [ "input" ];
# Sound />
};
}
@@ -0,0 +1,16 @@
{ lib, ... }:
with lib;
{
import = [
./mine.nix
./nwg-shell.nix
];
options = {
skyg.nixos.desktop.hyprland = {
enabled = mkEnableOption
"Hyprland";
useNWG = mkEnableOption
"nwg-shell experience";
};
};
}
+39
View File
@@ -0,0 +1,39 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.skyg.nixos.desktop.hyprland;
in
{
config = mkIf (cfg.enabled && !cfg.useNWG) {
programs.hyprlock.enable = true;
environment.systemPackages = with pkgs; [
# general utilities
swappy # screenshot editor
hyprshot # screenshots
cliphist # clipboard manager
xfce.thunar # file manager
wofi # app launcher
wl-screenrec # screen recorder
slurp # helper selection tools
waypaper # wallpaper manager
swww # wallpaper service
waybar # top bar
nwg-bar # logout window
];
system.userActivationScripts.hyprlandMineConfig.text = ''
rm "$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"
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"
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
'';
};
}