Merge remote-tracking branch 'origin/master'

10 files changed, 36 insertions, 9 deletions

diff --git a/jeschli/2configs/zsh.nix b/jeschli/2configs/zsh.nix
index be5b661..0f6775e 100644
--- a/jeschli/2configs/zsh.nix
+++ b/jeschli/2configs/zsh.nix
@@ -53,8 +53,8 @@
       eval $(dircolors -b ${pkgs.fetchFromGitHub {
         owner = "trapd00r";
         repo = "LS_COLORS";
-        rev = "master";
-        sha256="05lh5w3bgj9h8d8lrbbwbzw8788709cnzzkl8yh7m1dawkpf6nlp";
+        rev = "a75fca8545f91abb8a5f802981033ef54bf1eac0";
+        sha256="1lzj0qnj89mzh76ha137mnz2hf86k278rh0y9x124ghxj9yqsnb4";
       }}/LS_COLORS)
 
       #beautiful colors
diff --git a/nin/6tests/dummysecrets/hashedPasswords.nix b/nin/0tests/dummysecrets/hashedPasswords.nix
index 0967ef4..0967ef4 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 e69de29..e69de29 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 483a4f8..5e81afd 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 9fb2cb3..ae13c55 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>;
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index c3418e7..6e4830a 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -42,7 +42,7 @@ let {
     kirk = {
       cgit.desc = "IRC tools";
     };
-    kops = {
+    krops = {
       cgit.desc = "deployment tools";
     };
     load-env = {};
@@ -54,6 +54,7 @@ let {
     netcup = {
       cgit.desc = "netcup command line interface";
     };
+    nix-writers = {};
     populate = {
       cgit.desc = "source code installer";
     };
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 897def8..aa71be7 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -34,7 +34,7 @@ with import <stockholm/lib>;
 
       ## other
 
-      https://nixos.org/channels/nixos-17.09/git-revision
+      https://nixos.org/channels/nixos-18.03/git-revision
       https://nixos.org/channels/nixos-unstable/git-revision
 
       ## 2014-10-17
diff --git a/tv/5pkgs/simple/otpmenu.nix b/tv/5pkgs/simple/otpmenu.nix
new file mode 100644
index 0000000..b35e160
--- /dev/null
+++ b/tv/5pkgs/simple/otpmenu.nix
@@ -0,0 +1,15 @@
+{ dmenu, gnused, pass, writeDashBin, xdotool }:
+
+writeDashBin "otpmenu" ''
+  set -efu
+
+  x=$(
+    ${pass}/bin/pass git ls-files '*/otp.gpg' \
+      | ${gnused}/bin/sed 's:/otp\.gpg$::' \
+      | ${dmenu}/bin/dmenu -f -p OTP
+  )
+
+  otp=$(${pass}/bin/pass otp code "$x/otp")
+
+  printf %s "$otp" | ${xdotool}/bin/xdotool type -f -
+''
diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix
index d474b7e..cb59e85 100644
--- a/tv/5pkgs/simple/xmonad-tv/default.nix
+++ b/tv/5pkgs/simple/xmonad-tv/default.nix
@@ -133,6 +133,7 @@ myKeys conf = Map.fromList $
     [ ((_4  , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing)
     , ((_4S , xK_c      ), kill)
 
+    , ((_4  , xK_o      ), forkFile "${pkgs.otpmenu}/bin/otpmenu" [] Nothing)
     , ((_4  , xK_p      ), forkFile "${pkgs.pass}/bin/passmenu" ["--type"] Nothing)
 
     , ((_4  , xK_x      ), chooseAction spawnTermAt)
diff --git a/tv/source.nix b/tv/source.nix
index e5e5e04..14527d9 100644
--- a/tv/source.nix
+++ b/tv/source.nix
@@ -16,8 +16,7 @@ in
     {
       nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
       nixpkgs.git = {
-        # nixos-17.09
-        ref = mkDefault "53e6d671a9662922080635482b7e1c418d2cdc72";
+        ref = mkDefault "7cbf6ca1c84dfc917c1a99524e082fb677501844";
         url = https://github.com/NixOS/nixpkgs;
       };
       secrets.file = getAttr builder {