Merge branch 'master' of enklave.r:stockholm

This commit is contained in:
jeschli 2019-05-18 18:33:02 +02:00
commit 74ade272c8
2 changed files with 27 additions and 23 deletions

View File

@ -2,13 +2,14 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
{ {
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
<stockholm/jeschli> <stockholm/jeschli>
# <stockholm/jeschli/2configs/xdg.nix>
# <stockholm/jeschli/2configs/xserver>
<stockholm/jeschli/2configs/urxvt.nix> <stockholm/jeschli/2configs/urxvt.nix>
<stockholm/jeschli/2configs/emacs.nix> <stockholm/jeschli/2configs/emacs.nix>
]; ];
@ -29,7 +30,8 @@
allowDiscards = true; allowDiscards = true;
} ]; } ];
# networking.hostName = "bolide"; # Define your hostname. # networking.hostName = "bolide"; # Define your hostname.
networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true;
# Select internationalisation properties. # Select internationalisation properties.
# i18n = { # i18n = {
@ -103,36 +105,37 @@
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Enable CUPS to print documents. services.xserver = {
# services.printing.enable = true;
# Enable the X11 windowing system. enable = true;
services.xserver.enable = true;
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e";
services.xserver.displayManager.sddm.enable = true; desktopManager = {
services.xserver.windowManager.xmonad.enable = true; xfce.enable = true;
services.xserver.windowManager.xmonad.enableContribAndExtras = true; gnome3.enable = true;
# Enable touchpad support. };
# services.xserver.libinput.enable = true; # # Don't install feh into systemPackages
# # refs <nixpkgs/nixos/modules/services/x11/desktop-managers>
# desktopManager.session = lib.mkForce [];
#
# enable = true;
# display = 11;
# tty = 11;
#
# dpi = 96;
# Enable the KDE Desktop Environment. videoDrivers = [ "nvidia" ];
# services.xserver.displayManager.sddm.enable = true; };
# services.xserver.desktopManager.plasma5.enable = true;
services.xserver.windowManager.i3.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.extraUsers.jeschli = { users.extraUsers.jeschli = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["docker" "vboxusers" "audio"];
uid = 1000; uid = 1000;
}; };
hardware.pulseaudio.enable = true;
# This value determines the NixOS release with which your system is to be # This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database # compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you # servers. You should change this only after NixOS release notes say you

View File

@ -29,4 +29,5 @@
nix.maxJobs = lib.mkDefault 8; nix.maxJobs = lib.mkDefault 8;
powerManagement.cpuFreqGovernor = "powersave"; powerManagement.cpuFreqGovernor = "powersave";
hardware.pulseaudio.enable = true;
} }