refactor: move stuff to hyprland config

This commit is contained in:
matt1432 2023-12-04 01:13:24 -05:00
commit 8c7a36554e
9 changed files with 109 additions and 177 deletions
modules

View file

@ -7,17 +7,19 @@
# Nix stuff
optionals = lib.lists.optionals;
isNvidia = config.hardware.nvidia.modesetting.enable;
isTouchscreen = config.hardware.sensor.iio.enable;
# Executables' paths
regreetBin = "${lib.getExe config.programs.regreet.package}";
hyprBin = "${config
hyprland = config
.home-manager
.users
.${config.vars.user}
.wayland
.windowManager
.hyprland
.finalPackage}/bin";
.finalPackage;
# Executables' paths
hyprBin = "${hyprland}/bin";
regreetBin = "${lib.getExe config.programs.regreet.package}";
# Show Regreet on all monitors
dupeMonitors = pkgs.writeShellScriptBin "dupeMonitors" ''
@ -88,12 +90,28 @@ in {
};
};
services.greetd = {
enable = true;
settings = {
default_session = {
command = "${hyprBin}/Hyprland --config ${hyprConf}";
user = "greeter";
services = {
xserver = {
displayManager = {
sessionPackages = [hyprland];
};
libinput.enable = true;
wacom.enable = isTouchscreen;
};
greetd = {
enable = true;
settings = {
default_session = {
command = "${hyprBin}/Hyprland --config ${hyprConf}";
user = "greeter";
};
initial_session = {
command = "${hyprBin}/Hyprland";
user = config.vars.user;
};
};
};
};

View file

@ -20,6 +20,32 @@
gset = pkgs.gsettings-desktop-schemas;
polkit = pkgs.plasma5Packages.polkit-kde-agent;
in {
# SYSTEM CONFIG
imports = [../greetd];
programs = {
kdeconnect.enable = true;
dconf.enable = true;
};
services = {
dbus.enable = true;
gvfs.enable = true;
};
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
};
environment.systemPackages = with pkgs; [
plasma5Packages.kio-admin
];
# HOME-MANAGER CONFIG
home-manager.users.${config.vars.user} = {
imports = [
../../home/theme.nix
@ -197,9 +223,11 @@ in {
bluez-tools
brightnessctl
pulseaudio
alsa-utils
gnome.seahorse
p7zip # for reshade
gtklock
gtklock # FIXME: find replacement
swww
## libs