From 0037e0c22e17039cbe1856e4fbf7b53434cb6fb8 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Fri, 21 Oct 2016 22:17:32 -0400 Subject: Add software. --- nixos/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nixos') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 12a21d4..c5eaca8 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -66,6 +66,7 @@ trayer rxvt_unicode-with-plugins xsel + geeqie # fonts source-code-pro @@ -98,6 +99,8 @@ services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; + services.cron.enable = true; + users = { defaultUserShell = "/run/current-system/sw/bin/fish"; extraUsers.orbekk = { -- cgit v1.2.3 From 8d9be2536db7ce5994bab5448f8466d2da305d3c Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Fri, 21 Oct 2016 22:24:48 -0400 Subject: Remove merge markers. --- nixos/configuration.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'nixos') 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"; -- cgit v1.2.3 From 728cc79dbf6770afde3ef1a364b03859ed70df79 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 22 Oct 2016 16:51:27 -0400 Subject: minecraft. --- nixos/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nixos') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a185578..89a8277 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -75,6 +75,8 @@ geeqie gnupg myWine + minecraft + mumble # fonts source-code-pro -- cgit v1.2.3