refactor(wim): move stuff from config.nix to desktop.nix

This commit is contained in:
matt1432 2023-10-18 12:42:11 -04:00
parent 34a1da0e89
commit 32e2e974ca
2 changed files with 48 additions and 47 deletions

View file

@ -1,4 +1,4 @@
{ hyprland, pkgs, ... }: { { ... }: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -9,6 +9,7 @@
../../modules/proton-bridge.nix ../../modules/proton-bridge.nix
../../modules/sddm-wayland.nix ../../modules/sddm-wayland.nix
./modules/desktop.nix
./modules/security.nix ./modules/security.nix
]; ];
@ -16,9 +17,6 @@
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "input" "uinput" "adm" "mlocate" "video" "libvirtd" ]; extraGroups = [ "wheel" "input" "uinput" "adm" "mlocate" "video" "libvirtd" ];
}; };
programs.dconf.enable = true;
# TODO: use hm for tmux # TODO: use hm for tmux
home-manager.users = { home-manager.users = {
matt = { matt = {
@ -49,49 +47,6 @@
firewall.enable = false; firewall.enable = false;
}; };
services = {
xserver = {
displayManager = {
sessionPackages = [
hyprland.packages.x86_64-linux.default
];
defaultSession = "hyprland";
autoLogin = {
enable = true;
user = "matt";
};
};
libinput.enable = true;
};
dbus.enable = true;
gvfs.enable = true;
flatpak.enable = true;
tlp.enable = true;
};
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
};
environment.systemPackages = with pkgs; [
# for sddm
plasma5Packages.plasma-framework
plasma5Packages.plasma-workspace
qemu
wl-clipboard
alsa-utils
evtest
plasma5Packages.kio-admin
plasma5Packages.ksshaskpass
];
# Set your time zone. # Set your time zone.
time.timeZone = "America/Montreal"; time.timeZone = "America/Montreal";

View file

@ -0,0 +1,46 @@
{ hyprland, pkgs, ... }: {
programs.dconf.enable = true;
services = {
xserver = {
displayManager = {
sessionPackages = [
hyprland.packages.x86_64-linux.default
];
defaultSession = "hyprland";
autoLogin = {
enable = true;
user = "matt";
};
};
libinput.enable = true;
};
dbus.enable = true;
gvfs.enable = true;
flatpak.enable = true;
tlp.enable = true;
};
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
};
environment.systemPackages = with pkgs; [
# for sddm
plasma5Packages.plasma-framework
plasma5Packages.plasma-workspace
qemu
wl-clipboard
alsa-utils
evtest
plasma5Packages.kio-admin
plasma5Packages.ksshaskpass
];
}