This commit is contained in:
Daniel Langbein 2023-09-14 11:53:32 +02:00
parent ad6613d8fb
commit cccabdb91b
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
5 changed files with 46 additions and 41 deletions

View File

@ -15,17 +15,18 @@ in
[
# Include the results of the hardware scan.
./hardware-configuration.nix
# Home Manager.
(import "${home-manager}/nixos")
../../modules/home-manager.nix
# NUR.
../../modules/nur.nix
../../modules/base.nix
../../modules/base-gnome.nix
../../modules/programs.nix
../../modules/autostart.nix
../../modules/wallpaper.nix
../../modules/fwupd.nix
../../modules/fwupd-gnome.nix
../../modules/print-and-scan.nix
#../../modules/fde-ssh-unlock.nix
../../modules/nextcloud-integration.nix

View File

@ -15,17 +15,18 @@ in
[
# Include the results of the hardware scan.
./hardware-configuration.nix
# Home Manager.
(import "${home-manager}/nixos")
../../modules/home-manager.nix
# NUR.
../../modules/nur.nix
../../modules/base.nix
../../modules/base-gnome.nix
../../modules/programs.nix
../../modules/autostart.nix
../../modules/wallpaper.nix
../../modules/fwupd.nix
../../modules/fwupd-gnome.nix
../../modules/print-and-scan.nix
#../../modules/fde-ssh-unlock.nix
../../modules/nextcloud-integration.nix

38
modules/base-gnome.nix Normal file
View File

@ -0,0 +1,38 @@
{ config, pkgs, ... }:
{
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true;
# Toggles, weather the Wayland or X11 GNOME session is started.
services.xserver.displayManager.gdm.wayland = false;
services.xserver.desktopManager.gnome.enable = true;
# Configure keymap in X11.
services.xserver = {
layout = "de";
xkbVariant = "nodeadkeys";
};
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this.
#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;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
}

View File

@ -38,44 +38,9 @@
LC_TIME = "de_DE.UTF-8";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true;
# Toggles, weather the Wayland or X11 GNOME session is started.
services.xserver.displayManager.gdm.wayland = false;
services.xserver.desktopManager.gnome.enable = true;
# Configure keymap in X11.
services.xserver = {
layout = "de";
xkbVariant = "nodeadkeys";
};
# Configure console keymap.
console.keyMap = "de-latin1-nodeadkeys";
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this.
#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;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Allow unfree packages.
nixpkgs.config.allowUnfree = true;