Compare commits

..

No commits in common. "1991d9a06c21d68a481dd53cd3187ddec65b2497" and "76f4b51c79aa0f88fd9a27b098cd7eb0875ba6a1" have entirely different histories.

2 changed files with 54 additions and 35 deletions

View File

@ -7,12 +7,15 @@
{ {
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
# boot.kernelPackages = pkgs.linuxPackages_6_6;
# boot.extraModulePackages = [ pkgs.zfsUnstable ];
# boot.kernelModules = [ "zfs" ];
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
imports = [ imports = [
./modules/networking.nix ./modules/networking.nix
./modules/nix-settings.nix ./modules/nix-settings.nix
./modules/gnome.nix
]; ];
# Set your time zone. # Set your time zone.
@ -47,6 +50,56 @@
}; };
}; };
# Enable the X11 windowing system.
services.xserver = {
enable = true;
# enable = false;
xkb = {
layout = "us";
variant = "";
options = "caps_lock:esc";
};
# videoDrivers = [
# "displaylink" # broken
# "modesetting"
# ];
# Enable the GNOME Desktop Environment.
desktopManager = {
xterm.enable = false;
gnome.enable = true;
# xfce = {
# enable = true;
# # noDesktop = true;
# enableXfwm = false;
# };
# plasma6.enable = true;
};
displayManager.gdm.enable = true;
# displayManager.defaultSession = "xfce+stumpwm";
# windowManager = {
# stumpwm.enable = true;
# # xmonad.enable = true;
# };
};
# console.useXkbConfig = true;
# console.keyMap = ./galvatron/keys.map;
environment.gnome.excludePackages = with pkgs.gnome; [
baobab
cheese
epiphany
eog
yelp
simple-scan
geary
gnome-calculator
gnome-calendar
gnome-weather
gnome-maps
gnome-contacts
pkgs.gnome-console
totem
];
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;

View File

@ -1,34 +0,0 @@
{ config, lib, pkgs, nixos-unstable, inputs, ... }:
{
# Enable the X11 windowing system.
services.xserver = {
enable = true;
xkb = {
layout = "us";
variant = "";
options = "caps_lock:esc";
};
# Enable the GNOME Desktop Environment.
desktopManager = {
xterm.enable = false;
gnome.enable = true;
};
displayManager.gdm.enable = true;
};
environment.gnome.excludePackages = with pkgs.gnome; [
baobab
cheese
epiphany
eog
yelp
simple-scan
geary
gnome-calculator
gnome-calendar
gnome-weather
gnome-maps
gnome-contacts
pkgs.gnome-console
totem
];
}