lots of changes

Author: disassembler

build-machines.nix

@@ -1,27 +1,27 @@
 {
   darwin = {
-    #ohrid = {
-    #  hostName = "10.40.33.170";
-    #  maxJobs = 2;
-    #  sshUser = "sam";
-    #  sshKey = "/etc/nixos/keys/build";
-    #  system = "x86_64-darwin";
-    #};
+    ohrid = {
+      hostName = "10.40.33.170";
+      maxJobs = 2;
+      sshUser = "root";
+      sshKey = "/etc/nixos/keys/build";
+      system = "x86_64-darwin";
+    };
     #macvm = {
     #  hostName = "10.40.33.160";
     #  maxJobs = 1;
     #  sshUser = "sam";
     #  sshKey = "/etc/nixos/keys/build";
     #  system = "x86_64-darwin";
     #};
-    sarov-mac = {
-      hostName = "sarov-mac";
-      maxJobs = 2;
-      sshUser = "builder";
-      sshKey = "/etc/nixos/keys/build";
-      system = "x86_64-darwin";
+    #sarov-mac = {
+    #  hostName = "sarov-mac";
+    #  maxJobs = 2;
+    #  sshUser = "builder";
+    #  sshKey = "/etc/nixos/keys/build";
+    #  system = "x86_64-darwin";
 
-    };
+    #};
   };
   linux = {
     optina = {

cachix.nix

@@ -0,0 +1,14 @@
+
+# WARN: this file will get overwritten by $ cachix use <name>
+{ pkgs, lib, ... }:
+
+let
+  folder = ./cachix;
+  toImport = name: value: folder + ("/" + name);
+  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
+  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
+in {
+  inherit imports;
+  nix.binaryCaches = ["https://cache.nixos.org/"];
+}
+    

cachix/hercules-ci.nix

@@ -0,0 +1,12 @@
+
+{
+  nix = {
+    binaryCaches = [
+      "https://hercules-ci.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
+    ];
+  };
+}
+    

cachix/iohk.nix

@@ -0,0 +1,12 @@
+
+{
+  nix = {
+    binaryCaches = [
+      "https://iohk.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo="
+    ];
+  };
+}
+    

hardware-configurations/irkutsk.nix

@@ -17,6 +17,15 @@
       fsType = "zfs";
     };
 
+  fileSystems."/nix" = { device = "zpool/nix";
+      fsType = "zfs";
+    };
+  fileSystems."/var/lib/docker" = { device = "zpool/docker";
+      fsType = "zfs";
+    };
+  fileSystems."/var/lib/containers" = { device = "zpool/containers";
+      fsType = "zfs";
+    };
   fileSystems."/home" =
     { device = "zpool/home";
       fsType = "zfs";

machines/irkutsk.nix

@@ -1,29 +1,17 @@
 let
   custom_modules = import ../modules/modules-list.nix;
-  nixosHardware = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixos-hardware/archive/36d8bd88cd72cfa8ee4162e6580f0a8e7de132ba.tar.gz";
-    sha256 = "00w075mlap81m82ria1s4z6aki3sgdap84lzfkxx747w2as7i1sv";
-  };
-  ouroborosNetwork = builtins.fetchTarball {
-    url = "https://github.com/input-output-hk/ouroboros-network/archive/7bed99644a4c2e291478573c6bcafe28e2767bed.tar.gz";
-    sha256 = "10s3c7zpa3a8zv875qzsiiw7anbx4pyl0j8ihlxh2k8zgfi6s4xp";
-  };
-  jormungandr = builtins.fetchTarball {
-    url = "https://github.com/input-output-hk/jormungandr-nix/archive/243a38acd7ed0ffdc494fb8c824de6ebce0f6301.tar.gz";
-    sha256 = "0sjjbiw2z84d7nj9pf8qhi595b4vxb8fmny2zfgjml39hx52sjdd";
-  };
-
 in {
   disabledModules = [ "services/networking/jormungandr.nix" ];
   imports =
   [ # Include the results of the hardware scan.
     ../hardware-configurations/irkutsk.nix
     # Machine specific config
     ../nixconfigs/irkutsk.nix
-    (import (nixosHardware + "/dell/xps/13-9380"))
-    /home/sam/work/iohk/cardano-node/scratch/nix/nixos
-    /home/sam/work/iohk/cardano-byron-proxy/master/nix/nixos
-    /home/sam/work/iohk/jormungandr-nix/nixos
+    <nixos-hardware/dell/xps/13-9380>
+    #/home/sam/work/iohk/cardano-node/fix-defaults/nix/nixos
+    #/home/sam/work/iohk/cardano-byron-proxy/master/nix/nixos
+    #/home/sam/work/iohk/jormungandr-nix/reward-api/nixos
+    ../cachix.nix
   ] ++ custom_modules;
 
 }

modules/profiles/tmux/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: 
+{ config, pkgs, lib, ... }:
 
 with lib;
 
@@ -9,7 +9,7 @@ with lib;
     programs.tmux = {
       enable = true;
       newSession = true;
-      extraTmuxConf = builtins.readFile ./tmux.conf;
+      extraConfig = builtins.readFile ./tmux.conf;
       terminal = "screen-256color";
     };
 

modules/profiles/vim.nix

@@ -6,6 +6,7 @@ let
   nvim = pkgs.neovim.override {
     vimAlias = true;
     configure = customization;
+    extraPython3Packages = ps: [ ps.requests ps.html2text ps.markdown ];
   };
   vim = pkgs.vim_configurable.customize {
     name = "vim";

modules/profiles/vim/customization.nix

@@ -35,7 +35,7 @@ in
           "vim-markdown"
           "gitgutter"
           "vim-nix"
-          "deoplete_nvim"
+          #"deoplete_nvim"
           "repeat"
           "nerdtree"
           "UltiSnips"
@@ -46,6 +46,7 @@ in
           "splice_vim"
           "markdown_wiki"
           "tagbar"
+          "confluence"
         ] ++ (pkgs.lib.optionals dev dev_plugin_names);
       }
     ];

modules/profiles/vim/plugins.nix

@@ -1,4 +1,4 @@
-{ pkgs, fetchgit }:
+{ pkgs, fetchgit, fetchFromGitHub, python3 }:
 
 let
   buildVimPlugin = pkgs.vimUtils.buildVimPluginFrom2Nix;
@@ -139,4 +139,15 @@ in {
     };
     dependencies = [];
   };
+  "confluence" = buildVimPlugin {
+    name = "confluence";
+    #src = fetchFromGitHub {
+    #  owner = "lusis";
+    #  repo = "confluence-vim";
+    #  rev = "8dd36c41ba79f3d1888555b777159129c94165f9";
+    #  sha256 = "1q2j1bn8izyzr3g8jsn9rcpcw02acvgg8r4f5m5kmqzk9kww558m";
+    #};
+    src = /home/sam/work/iohk/confluence-vim;
+    dependencies = [];
+  };
 }

modules/profiles/vim/vimrc.nix

@@ -10,6 +10,10 @@ generic +
 (pkgs.lib.optionalString dev ''
  " wakatime
  let g:wakatime_Binary = "${pkgs.wakatime}/bin/wakatime"
+ let g:confluence_url = "https://input-output.atlassian.net/wiki/rest/api/content"
+ let g:confluence_user = "[email protected]"
+ let g:confluence_apikey = "fLo3kHsKgBitys99G3pCCEE2"
+
  ${haskell}
  ${javascript}
 '')

modules/profiles/zsh.nix

@@ -4,9 +4,7 @@ with lib;
 
 let
   cfg = config.profiles.zsh;
-  zsh_config = import ./zsh/config.nix {
-    inherit (pkgs) writeText zsh-prezto less;
-  };
+  zsh_config = pkgs.callPackage ./zsh/config.nix {};
 in {
   options.profiles.zsh = {
     enable = mkEnableOption "enable zsh profile";

modules/profiles/zsh/config.nix

@@ -1,4 +1,4 @@
-{ writeText, zsh-prezto, less }:
+{ writeText, zsh-prezto, less, coreutils }:
 
 let
   self = writeText "zsh-config"
@@ -100,6 +100,7 @@ let
       alias ssht="TERM=screen-256color ssh"
       alias nshell="nix-shell --run zsh"
       alias vi="nvim"
+      alias cpf="${coreutils}/bin/cp"
       # only init if installed.
       fasd_cache="$HOME/.fasd-init-bash"
       if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then
@@ -137,24 +138,24 @@ let
       alias -g G='| grep' # now you can do: ls foo G something
     '';
 in {
-  environment_etc =
-    [ { source = "${zsh-prezto}/runcoms/zlogin";
-        target = "zlogin";
-      }
-      { source = "${zsh-prezto}/runcoms/zlogout";
-        target = "zlogout";
-      }
-      { source = self;
-        target = "zpreztorc";
-      }
-      { source = "${zsh-prezto}/runcoms/zprofile";
-        target = "zprofile.local";
-      }
-      { source = "${zsh-prezto}/runcoms/zshenv";
-        target = "zshenv.local";
-      }
-      { source = "${zsh-prezto}/runcoms/zshrc";
-        target = "zshrc.local";
-      }
-    ];
+  environment_etc = {
+    zlogin = {
+      source = "${zsh-prezto}/runcoms/zlogin";
+    };
+    zlogout = {
+      source = "${zsh-prezto}/runcoms/zlogout";
+    };
+    zpreztorc = {
+      source = self;
+    };
+    "zprofile.local" = {
+      source = "${zsh-prezto}/runcoms/zprofile";
+    };
+    "zshenv.local" = {
+      source = "${zsh-prezto}/runcoms/zshenv";
+    };
+    "zshrc.local" = {
+      source = "${zsh-prezto}/runcoms/zshrc";
+    };
+  };
 }