summaryrefslogtreecommitdiffstats
path: root/nin
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
committerjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
commit8eca9165ce6ffaba1076a916bfa475eb935f0a6f (patch)
treeb2339ecdb48bd1135a1352b9993732ad0e35c02c /nin
parent05c8cf3df5f6166c21dfd2dc316bf5de957dce94 (diff)
parentc19baeee138f9455ef570e609c045d312d6cc0f4 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'nin')
-rw-r--r--nin/0tests/dummysecrets/hashedPasswords.nix (renamed from nin/6tests/dummysecrets/hashedPasswords.nix)0
-rw-r--r--nin/0tests/dummysecrets/ssh.id_ed25519 (renamed from nin/6tests/dummysecrets/ssh.id_ed25519)0
-rw-r--r--nin/1systems/axon/config.nix15
-rw-r--r--nin/source.nix2
4 files changed, 14 insertions, 3 deletions
diff --git a/nin/6tests/dummysecrets/hashedPasswords.nix b/nin/0tests/dummysecrets/hashedPasswords.nix
index 0967ef424..0967ef424 100644
--- a/nin/6tests/dummysecrets/hashedPasswords.nix
+++ b/nin/0tests/dummysecrets/hashedPasswords.nix
diff --git a/nin/6tests/dummysecrets/ssh.id_ed25519 b/nin/0tests/dummysecrets/ssh.id_ed25519
index e69de29bb..e69de29bb 100644
--- a/nin/6tests/dummysecrets/ssh.id_ed25519
+++ b/nin/0tests/dummysecrets/ssh.id_ed25519
diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix
index 483a4f84b..5e81afdbd 100644
--- a/nin/1systems/axon/config.nix
+++ b/nin/1systems/axon/config.nix
@@ -59,7 +59,11 @@ with lib;
# nin config
time.timeZone = "Europe/Berlin";
- services.xserver.enable = true;
+ services.xserver = {
+ enable = true;
+
+ displayManager.lightdm.enable = true;
+ };
networking.networkmanager.enable = true;
#networking.wireless.enable = true;
@@ -76,12 +80,19 @@ with lib;
#nixpkgs.config.steam.java = true;
environment.systemPackages = with pkgs; [
+ atom
+ chromium
firefox
git
+ htop
+ keepassx
lmms
networkmanagerapplet
+ openvpn
python
+ ruby
steam
+ taskwarrior
thunderbird
vim
virtmanager
@@ -109,7 +120,7 @@ with lib;
Control + p
'';
in {
- enable = true;
+ enable = true;
extraSessionCommands = ''
${pkgs.xbindkeys}/bin/xbindkeys -f ${xbindConfig}
'';
diff --git a/nin/source.nix b/nin/source.nix
index 9fb2cb390..ae13c5583 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -13,7 +13,7 @@ in
evalSource (toString _file) {
nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix";
secrets.file = getAttr builder {
- buildbot = toString <stockholm/nin/6tests/dummysecrets>;
+ buildbot = toString <stockholm/nin/0tests/dummysecrets>;
nin = "/home/nin/secrets/${name}";
};
stockholm.file = toString <stockholm>;