diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:18:54 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:18:54 -0400 |
| commit | 8e6bcd805de72beab6f4833b254027b601d6db15 (patch) | |
| tree | 0b472943e63e22b528576440ccf9f9a4eee61a3d /nixos/configuration.nix | |
| parent | 390d96035fb0c59ecc83832c1fea7317ff486c0c (diff) | |
| parent | 9b1c2784b1f3b0ac101c99a614594c69f3178e5f (diff) | |
Merge branch 'master' of sabaki:/storage/projects/dotfiles
Diffstat (limited to 'nixos/configuration.nix')
| -rw-r--r-- | nixos/configuration.nix | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 775ee7a..66d6f8d 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,7 +8,8 @@ boot.cleanTmpDir = true; - networking.wireless.enable = true; + networking.networkmanager.enable = true; + # networking.wireless.enable = true; networking.firewall.enable = true; programs.zsh.enable = true; @@ -53,7 +54,7 @@ pavucontrol powertop kde4.digikam - emacs25pre + emacs25 sshfsFuse xorg.xbacklight rtorrent @@ -71,6 +72,8 @@ pass rxvt_unicode-with-plugins xsel + geeqie + gnupg # fonts source-code-pro @@ -99,10 +102,20 @@ services.xserver.windowManager.xmonad.enableContribAndExtras = true; services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [ haskellPackages.xmobar ]; + services.xserver.desktopManager.xfce.enable = true; services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; +<<<<<<< HEAD + services.cron.enable = true; +======= + services.xserver.synaptics = { + enable = true; + twoFingerScroll = true; + }; +>>>>>>> 27ee6b1aaf71715da579633f2f8e1a7baa0224c8 + users = { defaultUserShell = "/run/current-system/sw/bin/fish"; extraUsers.orbekk = { @@ -113,6 +126,13 @@ extraGroups = ["wheel" "networkmanager" "dialout" "uucp"]; shell = "/run/current-system/sw/bin/fish"; }; + extraUsers.guest = { + isNormalUser = true; + home = "/home/guest"; + uid = 10001; + description = "Guest"; + extraGroups = ["networkmanager"]; + }; }; nix.maxJobs = 4; |