Merge branch 'master' of enklave.r:stockholm

2 files changed, 27 insertions, 23 deletions

diff --git a/jeschli/1systems/bolide/config.nix b/jeschli/1systems/bolide/config.nix
index 699a85b..748a9d7 100644
--- a/jeschli/1systems/bolide/config.nix
+++ b/jeschli/1systems/bolide/config.nix
@@ -2,13 +2,14 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
-
+{ config, pkgs, lib, ... }:
 {
   imports =
     [
       ./hardware-configuration.nix
       <stockholm/jeschli>
+  #    <stockholm/jeschli/2configs/xdg.nix>
+  #    <stockholm/jeschli/2configs/xserver>
       <stockholm/jeschli/2configs/urxvt.nix>
       <stockholm/jeschli/2configs/emacs.nix>
     ];
@@ -29,7 +30,8 @@
     allowDiscards = true;
   } ];
 #  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.
   # i18n = {
@@ -103,36 +105,37 @@
  # Enable the OpenSSH daemon.
  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.printing.enable = true;
+  services.xserver = {
+
+    enable = true;
 
- # Enable the X11 windowing system.
- services.xserver.enable = true;
- # services.xserver.layout = "us";
- # services.xserver.xkbOptions = "eurosign:e";
+    desktopManager = {
+      xfce.enable = true;
+      gnome3.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;
 
- services.xserver.displayManager.sddm.enable = true;
- services.xserver.windowManager.xmonad.enable = true;
- services.xserver.windowManager.xmonad.enableContribAndExtras = true;
- # Enable touchpad support.
- # services.xserver.libinput.enable = true;
+    videoDrivers = [ "nvidia" ];
+  };
 
- # Enable the KDE Desktop Environment.
- # 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 = {
     isNormalUser = true;
+    extraGroups = ["docker" "vboxusers" "audio"];
     uid = 1000;
   };
 
+  hardware.pulseaudio.enable = true;
  # This value determines the NixOS release with which your system is to be
  # compatible, in order to avoid breaking some software such as database
  # servers. You should change this only after NixOS release notes say you
diff --git a/jeschli/1systems/bolide/hardware-configuration.nix b/jeschli/1systems/bolide/hardware-configuration.nix
index 183b29e..042b746 100644
--- a/jeschli/1systems/bolide/hardware-configuration.nix
+++ b/jeschli/1systems/bolide/hardware-configuration.nix
@@ -29,4 +29,5 @@
 
   nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = "powersave";
+  hardware.pulseaudio.enable = true;
 }