running vm that mostly works

This commit is contained in:
Noah Masur
2025-03-08 18:08:17 -05:00
parent 1b05fa3745
commit cd0b7debd4
15 changed files with 204 additions and 139 deletions

View File

@ -6,6 +6,7 @@
}:
let
inherit (config.nmasur.settings) username;
cfg = config.nmasur.presets.services.lightdm;
in
@ -13,10 +14,10 @@ in
options.nmasur.presets.services.lightdm = {
enable = lib.mkEnableOption "Lightdm display manager";
wallpaper = {
wallpaper = lib.mkOption {
type = lib.types.nullOr lib.types.path;
description = "Wallpaper background image file";
default = "${pkgs.wallpapers}/gruvbox/road.jpg";
default = "${pkgs.nmasur.wallpapers}/gruvbox/road.jpg";
};
gtk.theme = {
name = lib.mkOption {
@ -29,6 +30,8 @@ in
config = lib.mkIf cfg.enable {
programs.fish.enable = lib.mkIf (config.home-manager.users.${username}.programs.fish.enable) true; # Needed for LightDM to remember username
services.xserver = {
enable = true;

View File

@ -29,6 +29,8 @@ in
# Define a user account. Don't forget to set a password with passwd.
users.users.${username} = {
# Use fish by default if enabled in home-manager
shell = lib.mkIf (config.home-manager.users.${username}.programs.fish.enable) pkgs.fish;
# Create a home directory for human user
isNormalUser = lib.mkDefault true;
@ -59,6 +61,11 @@ in
};
# Extending time for home-manager build for things like nix-index cache
systemd.services."home-manager-${username}" = {
serviceConfig.TimeoutStartSec = lib.mkForce "45m";
};
allowUnfreePackages = config.home-manager.users.${username}.allowUnfreePackages;
};

View File

@ -17,6 +17,7 @@ in
config = lib.mkIf cfg.enable {
nmasur.presets.services.kanata.enable = lib.mkDefault true;
nmasur.presets.services.lightdm.enable = lib.mkDefault true;
# Mouse customization
services.ratbagd.enable = lib.mkDefault true;
@ -34,10 +35,11 @@ in
};
# Enable touchpad support
services.libinput.enable = true;
services.libinput.enable = lib.mkDefault true;
services.xserver = {
enable = lib.mkDefault true;
xkb.layout = lib.mkDefault "us";
# Keyboard responsiveness