From 47c0b0261eabdf230bfc7a375a3a008a04b61c4a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 9 May 2018 11:11:50 +0200
Subject: krebs: 6tests -> 0tests

---
 nin/0tests/dummysecrets/hashedPasswords.nix | 1 +
 nin/0tests/dummysecrets/ssh.id_ed25519      | 0
 nin/6tests/dummysecrets/hashedPasswords.nix | 1 -
 nin/6tests/dummysecrets/ssh.id_ed25519      | 0
 nin/source.nix                              | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 nin/0tests/dummysecrets/hashedPasswords.nix
 create mode 100644 nin/0tests/dummysecrets/ssh.id_ed25519
 delete mode 100644 nin/6tests/dummysecrets/hashedPasswords.nix
 delete mode 100644 nin/6tests/dummysecrets/ssh.id_ed25519

(limited to 'nin')

diff --git a/nin/0tests/dummysecrets/hashedPasswords.nix b/nin/0tests/dummysecrets/hashedPasswords.nix
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/nin/0tests/dummysecrets/hashedPasswords.nix
@@ -0,0 +1 @@
+{}
diff --git a/nin/0tests/dummysecrets/ssh.id_ed25519 b/nin/0tests/dummysecrets/ssh.id_ed25519
new file mode 100644
index 000000000..e69de29bb
diff --git a/nin/6tests/dummysecrets/hashedPasswords.nix b/nin/6tests/dummysecrets/hashedPasswords.nix
deleted file mode 100644
index 0967ef424..000000000
--- a/nin/6tests/dummysecrets/hashedPasswords.nix
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/nin/6tests/dummysecrets/ssh.id_ed25519 b/nin/6tests/dummysecrets/ssh.id_ed25519
deleted file mode 100644
index e69de29bb..000000000
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>;
-- 
cgit v1.2.3


From 9dadc86d9cfb24fb9d1a7e4cdeec626331339982 Mon Sep 17 00:00:00 2001
From: nin <nin@c-base.org>
Date: Thu, 14 Jun 2018 20:22:33 +0200
Subject: nin axon: add login manager & some programs

---
 nin/1systems/axon/config.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'nin')

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}
     '';
-- 
cgit v1.2.3