Merge remote-tracking branch 'origin/master'

krebs/3modules/default.nix

@@ -132,7 +132,7 @@ let
 
       services.openssh.hostKeys =
         let inherit (config.krebs.build.host.ssh) privkey; in
-        mkIf (privkey != null) (mkForce [privkey]);
+        mkIf (privkey != null) [privkey];
 
       # TODO use imports for merging
       services.openssh.knownHosts =

krebs/5pkgs/haskell/blessings.nix

@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       version = "2.2.0";
       sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
     };
-  }.${versions.majorMinor nixpkgsVersion};
+  }.${versions.majorMinor version};
 
 in mkDerivation {
   pname = "blessings";

krebs/5pkgs/haskell/email-header.nix

@@ -20,7 +20,7 @@ with import <stockholm/lib>;
       rev = "refs/tags/v${cfg.version}";
       sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x";
     };
-  }.${versions.majorMinor nixpkgsVersion};
+  }.${versions.majorMinor version};
 
 in mkDerivation {
   pname = "email-header";

krebs/5pkgs/simple/irc-announce/default.nix

@@ -15,7 +15,7 @@ pkgs.writeDashBin "irc-announce" ''
 
   IRC_SERVER=$1
   IRC_PORT=$2
-  IRC_NICK=$3$$
+  IRC_NICK=$3_$$
   IRC_CHANNEL=$4
   message=$5
 

krebs/5pkgs/simple/ssh-audit.nix

@@ -0,0 +1,55 @@
+{ fetchFromGitHub, python3Packages, stdenv }:
+
+python3Packages.buildPythonPackage rec {
+  inherit (meta) version;
+
+  pname = "ssh-audit";
+
+  src = fetchFromGitHub {
+    owner = "arthepsy";
+    repo = pname;
+    rev = "refs/tags/v${meta.version}";
+    sha256 = "0akrychkdym9f6830ysq787c9nc0bkyqvy4h72498lyghwvwc2ms";
+  };
+
+  checkInputs = [
+    python3Packages.pytest
+    python3Packages.pytestcov
+  ];
+
+  checkPhase = ''
+    py.test --cov-report= --cov=ssh-audit -v test
+  '';
+
+  postPatch = ''
+    printf %s "$setupPy" > setup.py
+    mkdir scripts
+    cp ssh-audit.py scripts/ssh-audit
+    mkdir ssh-audit
+    cp ssh-audit.py ssh-audit/__init__.py
+  '';
+
+  setupPy = /* py */ ''
+    from distutils.core import setup
+    setup(
+      author='arthepsy',
+      description='${meta.description}',
+      license='${meta.license.spdxId}',
+      name='${pname}',
+      packages=['ssh-audit'],
+      scripts=['scripts/ssh-audit'],
+      url='${meta.homepage}',
+      version='${version}',
+    )
+  '';
+
+  meta = {
+    description = "tool for ssh server auditing";
+    homepage = "https://github.com/arthepsy/ssh-audit";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [
+      stdenv.lib.maintainers.tv
+    ];
+    version = "1.7.0";
+  };
+}

krebs/nixpkgs.json

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "cf3e277dd0bd710af0df667e9364f4bd80c72713",
-  "date": "2019-04-24T23:55:21+02:00",
-  "sha256": "1abyadl3sxf67yi65758hq6hf2j07afgp1fmkk7kd94dadx6r6f4",
+  "rev": "705986f5a986be5c5ae13193b487c7ec8ca05f16",
+  "date": "2019-05-18T20:38:59-04:00",
+  "sha256": "0zpch2cpl2yx0mp7hnyjd03hqs7rxza9wc2p97njsdzhi56gxwxp",
   "fetchSubmodules": false
 }

lass/2configs/vim.nix

@@ -11,6 +11,9 @@ let
       (hiPrio (pkgs.python3.withPackages (ps: [
         ps.python-language-server
         ps.pyls-isort
+        ps.pyflakes
+        ps.flake8
+        ps.yapf
       ])))
     ];
 
@@ -72,10 +75,6 @@ let
 
     au BufRead,BufNewFile /dev/shm/* set nobackup nowritebackup noswapfile
 
-    "Syntastic config
-    "let g:syntastic_python_checkers=['flake8']
-    "let g:syntastic_python_flake8_post_args='--ignore=E501'
-
     nnoremap <F5> :call LanguageClient_contextMenu()<CR>
     set hidden
     let g:LanguageClient_serverCommands = {
@@ -83,7 +82,10 @@ let
         \ 'go': ['~/go/bin/go-langserver']
         \ }
 
-    let g:LanguageClient_diagnosticsDisplay = { 2: { "signText": "W" } }
+    let g:LanguageClient_diagnosticsDisplay = {
+        \ 1: { "signText": "E" },
+        \ 2: { "signText": "W" }
+        \ }
 
     nmap <esc>q :buffer 
     nmap <M-q> :buffer 
@@ -126,7 +128,6 @@ let
   extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
     pkgs.vimPlugins.ack-vim
     pkgs.vimPlugins.Gundo
-    #pkgs.vimPlugins.Syntastic
     pkgs.vimPlugins.undotree
     pkgs.vimPlugins.vim-go
     pkgs.vimPlugins.fzf-vim

makefu/1systems/x/config.nix

@@ -196,4 +196,6 @@
 
   services.syncthing.user = lib.mkForce "makefu";
   services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/";
+  # latest kernel (5.0) has issues with wifi card
+  boot.kernelPackages = pkgs.linuxPackages;
 }

makefu/2configs/hw/network-manager.nix

@@ -30,4 +30,7 @@
   state = [
     "/etc/NetworkManager/system-connections"  #NM stateful config files
   ];
+  networking.networkmanager.dispatcherScripts = [
+    { source = "${pkgs.prison-break}/bin/prison-break"; }
+  ];
 }

submodules/krops

@@ -1 +1 @@
-Subproject commit 5b8fb8dc0ee14672d7fd533bd98635b8725dbb29
+Subproject commit ee41207df1ce718e0b154ed8047384118a0133a4

tv/2configs/urlwatch.nix

@@ -42,6 +42,9 @@ in {
       # ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github*
       (json https://api.github.com/meta)
 
+      # ref <nixpkgs/pkgs/tools/security/ssh-audit>
+      (json https://api.github.com/repos/arthepsy/ssh-audit/tags)
+
       # 2014-12-20 ref src/nixpkgs/pkgs/tools/networking/tlsdate/default.nix
       (json https://api.github.com/repos/ioerror/tlsdate/tags)
 

tv/2configs/xserver/default.nix

@@ -72,6 +72,7 @@ in {
       exec ${xmonad}
     '';
     xmonad-ready = pkgs.writeDash "xmonad-ready" ''
+      ${pkgs.systemd}/bin/systemd-notify --ready
       {
         ${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name}
         ${pkgs.xorg.xhost}/bin/xhost -LOCAL:
@@ -119,6 +120,9 @@ in {
       SyslogIdentifier = "xmonad";
       User = cfg.user.name;
       WorkingDirectory = cfg.user.home;
+
+      NotifyAccess = "all";
+      Type = "notify";
     };
   };
 

tv/3modules/Xresources.nix

@@ -21,8 +21,7 @@ in {
     });
     systemd.services.${if cfg.enable then "Xresources" else null} = {
       wantedBy = [ "graphical.target" ];
-      after = [ "xserver.service" ];
-      requires = [ "xserver.service" ];
+      after = [ "xmonad.service" ];
       environment = {
         DISPLAY = ":${toString config.services.xserver.display}";
       };

tv/5pkgs/default.nix

@@ -45,7 +45,7 @@ foldl' mergeAttrs {}
       self.callPackage ./compat/18.03/pass {
         pass-otp = self.callPackage ./compat/18.03/pass-otp {};
       };
-  }.${versions.majorMinor nixpkgsVersion} or
+  }.${versions.majorMinor version} or
       super.pass.withExtensions (ext: [
         ext.pass-otp
       ]);