pestctrl/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Laptops extend from user-facing, user-facing needs xorg

Browse source
This commit is contained in:
Benson Chu 2024-03-14 06:04:22 -05:00
parent d32b80a8ba
commit ecb7eb884b
3 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/laptop-things.nix
View file

@ -1,6 +1,10 @@
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }:
{
imports = [
./user-facing.nix
];
services.logind = {
extraConfig = "HandlePowerKey=suspend";
lidSwitch = "suspend";
@ -10,8 +14,8 @@
# Configure keymap in X11
services.xserver = {
layout = "us,us";
xkbVariant = "dvorak,";
layout = lib.mkForce "us,us";
xkbVariant = lib.mkForce "dvorak,";
xkbOptions = "grp:win_space_toggle";
};

46
common/user-facing.nix
View file

@ -7,16 +7,44 @@
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
services = {
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
# media-session.enable = true;
pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
# media-session.enable = true;
};
};
services.xserver = {
# Enable the X11 windowing system.
enable = true;
# Enable the KDE Plasma Desktop Environment.
desktopManager.plasma5.enable = true;
# Enable sddm, add exwm
displayManager = {
sddm.enable = true;
defaultSession = "none+exwm";
};
# Configure keymap in X11
layout = "us";
xkbVariant = "";
libinput = {
enable = true;
touchpad = {
naturalScrolling = true;
};
};
};
fonts = {

8
hosts/NixFrame/configuration.nix
View file

@ -3,7 +3,6 @@
imports = [
# ./home-git-repos.nix
../../common/configuration.nix
../../common/user-facing.nix
../../common/development-machine.nix
../../common/laptop-things.nix
../../common/exwm.nix
@ -18,13 +17,6 @@
networking.hostName = "NixFrame"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
services.syncthing = {
enable = true;
user = "benson";