diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:24:48 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:24:48 -0400 |
| commit | 8d9be2536db7ce5994bab5448f8466d2da305d3c (patch) | |
| tree | 4ba2ec69fa3d19ce29ea7073b6e28e8a0a58a3a9 /nixos | |
| parent | 9b1c2784b1f3b0ac101c99a614594c69f3178e5f (diff) | |
Remove merge markers.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/configuration.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 66d6f8d..a185578 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -74,6 +74,7 @@ xsel geeqie gnupg + myWine # fonts source-code-pro @@ -107,14 +108,11 @@ 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"; |