diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2017-02-24 21:20:00 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2017-02-24 21:20:00 -0500 |
| commit | d1bb6455bbc962e51d10814aef2344566b7ce0f0 (patch) | |
| tree | 970fb2c92b8295422407d53a77e0d59fcc59a2ca /nixos | |
| parent | 1164367688527858866defdc62347a3b934ac23c (diff) | |
Update config.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/configuration.nix | 21 | ||||
| -rw-r--r-- | nixos/pincer.nix | 8 |
2 files changed, 21 insertions, 8 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c65ff35..8e3df93 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,6 +8,7 @@ hardware.pulseaudio.tcp.anonymousClients.allowAll = true; hardware.enableAllFirmware = true; + boot.earlyVconsoleSetup = true; boot.cleanTmpDir = true; networking.networkmanager.enable = true; @@ -17,13 +18,6 @@ programs.zsh.enable = true; programs.fish.enable = true; - # Select internationalisation properties. - # i18n = { - # consoleFont = "Lat2-Terminus16"; - # consoleKeyMap = "us"; - # defaultLocale = "en_US.UTF-8"; - # }; - # Set your time zone. time.timeZone = "America/New_York"; @@ -106,7 +100,6 @@ #rxvt-unicode-with-perl-with-unicode3-with-plugins unzip linssid - lxc nix-repl youtube-dl vlc @@ -148,6 +141,12 @@ }; # Enable the X11 windowing system. + services.xserver.displayManager.slim = { + enable = true; + autoLogin = true; + defaultUser = "orbekk"; + }; + services.xserver.enable = true; services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.xmonad.enableContribAndExtras = true; @@ -158,6 +157,12 @@ services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; + i18n = { + consoleFont = "ter-132n"; + consoleKeyMap = "dvorak"; + consolePackages = [ pkgs.terminus_font ]; + }; + services.cron.enable = true; services.xserver.synaptics = { enable = true; diff --git a/nixos/pincer.nix b/nixos/pincer.nix index 449ee68..6330e40 100644 --- a/nixos/pincer.nix +++ b/nixos/pincer.nix @@ -8,6 +8,13 @@ networking.firewall.allowedTCPPorts = [5201 34196 34197 5556 5558]; networking.firewall.allowedUDPPorts = [5201 34196 34197]; + # hardware.pulseaudio.systemWide = true; + # hardware.pulseaudio.enable = true; + # hardware.pulseaudio.tcp.enable = true; + # hardware.pulseaudio.tcp.anonymousClients.allowAll = true; + # hardware.pulseaudio.zeroconf.discovery.enable = true; + # hardware.pulseaudio.zeroconf.publish.enable = true; + hardware.opengl.driSupport32Bit = true; boot.loader.systemd-boot.enable = true; boot.loader.timeout = 0; @@ -91,6 +98,7 @@ SATA_LINKPWR_ON_BAT=max_performance ''; + services.xserver.xkbModel = "thinkpad60"; # The NixOS release to be compatible with for stateful data such as databases. |