This commit is contained in:
ari committed 2024-09-26 21:15:10 -04:00
1 parent c651ec9d31
commit a4aa3da89e
11 files changed
+106 -112

No files matched your search

+42 -36
View File
@@ -1,43 +1,49 @@
{ config, lib, pkgs, inputs, ... }:
let
cfg = config.skyg.nixos.desktop.hyprland;
hyprpkgs = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system};
in
{
config = lib.mkIf cfg.enabled {
programs.hyprland = {
enable = true;
# package = hyprpkgs.hyprland;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
xwayland.enable = true;
systemd.setPath.enable = true;
config =
let
hyprpkgs =
if cfg.useDevelopmentMode then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}
else pkgs
;
in
lib.mkIf cfg.enabled {
programs.hyprland = {
enable = true;
package = hyprpkgs.hyprland;
portalPackage = hyprpkgs.xdg-desktop-portal-hyprland;
xwayland.enable = true;
systemd.setPath.enable = true;
};
xdg.portal.extraPortals = [ hyprpkgs.xdg-desktop-portal-hyprland ];
services.hypridle.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
auto-cpufreq
# 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 />
};
xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
services.hypridle.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
auto-cpufreq
# 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 />
};
}
@@ -11,6 +11,8 @@
"Hyprland";
useNWG = mkEnableOption
"nwg-shell experience";
useDevelopmentMode = mkEnableOption
"use the dev mode of hyprland";
};
};
}
+19 -22
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, inputs, ... }:
{ config, lib, pkgs, inputs, system, ... }:
let
cfg = config.skyg.nixos.desktop.hyprland;
in
@@ -7,33 +7,30 @@ in
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
swappy # screenshot editor
hyprshot # screenshots
cliphist # clipboard manager
gnome.nautilus # file manager
wofi # app launcher
wl-screenrec # screen recorder
slurp # helper selection tools
waypaper # wallpaper manager
swww # wallpaper service
waybar # top bar
nwg-panel # top bar
nwg-dock-hyprland # bottom bar
nwg-displays # display management
nwg-bar # logout window
];
environment.systemPackages =
(with pkgs; [
# general utilities
swappy # screenshot editor
hyprshot # screenshots
cliphist # clipboard manager
gnome.nautilus # file manager
wofi # app launcher
wl-screenrec # screen recorder
slurp # helper selection tools
waypaper # wallpaper manager
swww # wallpaper service
waybar # top bar
nwg-panel # top bar
nwg-dock-hyprland # bottom bar
nwg-displays # display management
nwg-bar # logout window
]);
system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/hypr"
if [[ ! -h "$HOME/.config/hypr" ]]; then
+3 -5
View File
@@ -1,17 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.skyg.nixos.desktop.kde;
in
{
options = {
skyg.nixos.desktop.kde = {
enabled = mkEnableOption
enabled = lib.mkEnableOption
"KDE";
};
};
config = mkIf cfg.enabled {
config = lib.mkIf cfg.enabled {
services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
environment.plasma6.excludePackages = with pkgs.kdePackages; [
@@ -20,12 +18,12 @@ in
kate # text editor
gwenview # image viewer
];
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
environment.systemPackages = with pkgs; [
kdePackages.plasma-browser-integration
kdePackages.xdg-desktop-portal-kde
konsave # save configs
];
services.desktopManager.plasma6.notoPackage = pkgs.fira-code;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
};
}
+1
View File
@@ -13,5 +13,6 @@ in
xdg-desktop-portal-gtk
];
programs.xwayland.enable = true;
xdg.portal.enable = true;
};
}