diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-09 11:34:48 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-09 11:34:48 -0400 |
| commit | 4f997d813e1293e23a044cc517b84438790a67fa (patch) | |
| tree | 4bf9a2f7ffca1d37db5af3d07eb8f6ae7e5edfe3 /nixos | |
| parent | f5a674f640f5bafc1c3ed04553f5bb99cdb5ec3d (diff) | |
Enable synaptics and network manager.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/aji.nix | 4 | ||||
| -rw-r--r-- | nixos/configuration.nix | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/nixos/aji.nix b/nixos/aji.nix index e953204..abda9f8 100644 --- a/nixos/aji.nix +++ b/nixos/aji.nix @@ -43,10 +43,6 @@ ''; services.xserver.xkbModel = "thinkpad60"; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; # The NixOS release to be compatible with for stateful data such as databases. system.stateVersion = "16.03"; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 775ee7a..9ff1f14 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; @@ -99,10 +100,16 @@ services.xserver.windowManager.xmonad.enableContribAndExtras = true; services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [ haskellPackages.xmobar ]; + services.xserver.desktopManager.gnome3.enable = true; services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; + services.xserver.synaptics = { + enable = true; + twoFingerScroll = true; + }; + users = { defaultUserShell = "/run/current-system/sw/bin/fish"; extraUsers.orbekk = { |