From d19aedb81c0e5aa7a292ff00aaf870ab3c0579ea Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 20 Apr 2019 09:46:04 +0200 Subject: [PATCH 01/13] ma x.r: use stable kernel due to wifi issues --- makefu/1systems/x/config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 3c5e50c4b..32a548954 100644 --- a/makefu/1systems/x/config.nix +++ b/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; } From e48a8c8beacbdd51580839b362b4bd90ce264277 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 25 Apr 2019 03:32:35 +0200 Subject: [PATCH 02/13] tv xmonad: Type = notify --- tv/2configs/xserver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 012caff73..357744533 100644 --- a/tv/2configs/xserver/default.nix +++ b/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"; }; }; From 1b17a8dd03c57c2b02263c2ec471fe2ef61312e8 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 25 Apr 2019 03:33:18 +0200 Subject: [PATCH 03/13] tv Xresources: start after xmonad --- tv/3modules/Xresources.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix index 983b8bc2e..ce7ac9ac2 100644 --- a/tv/3modules/Xresources.nix +++ b/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}"; }; From 95f6a06c5acfb6054236ea2f5aee42975dd909ec Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Apr 2019 20:31:03 +0200 Subject: [PATCH 04/13] prison-break: move to krebs --- {makefu/5pkgs => krebs/5pkgs/simple}/prison-break/default.nix | 0 .../5pkgs => krebs/5pkgs/simple}/prison-break/straight-plugin.nix | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {makefu/5pkgs => krebs/5pkgs/simple}/prison-break/default.nix (100%) rename {makefu/5pkgs => krebs/5pkgs/simple}/prison-break/straight-plugin.nix (100%) diff --git a/makefu/5pkgs/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix similarity index 100% rename from makefu/5pkgs/prison-break/default.nix rename to krebs/5pkgs/simple/prison-break/default.nix diff --git a/makefu/5pkgs/prison-break/straight-plugin.nix b/krebs/5pkgs/simple/prison-break/straight-plugin.nix similarity index 100% rename from makefu/5pkgs/prison-break/straight-plugin.nix rename to krebs/5pkgs/simple/prison-break/straight-plugin.nix From 98f0d7fef497037f82711cc62db61008e26280b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Apr 2019 20:36:31 +0200 Subject: [PATCH 05/13] ma network-manager: add prison-break --- makefu/2configs/hw/network-manager.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix index 3b9d04549..d7b262b91 100644 --- a/makefu/2configs/hw/network-manager.nix +++ b/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"; } + ]; } From 2124814a04c4052f73c935927931c85812421c43 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 28 Apr 2019 14:35:10 +0200 Subject: [PATCH 06/13] krops: 1.11.1 -> 1.14.0 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 5b8fb8dc0..ee41207df 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 5b8fb8dc0ee14672d7fd533bd98635b8725dbb29 +Subproject commit ee41207df1ce718e0b154ed8047384118a0133a4 From c7d02cb595f59fd6f4cd471eb44aa3e1b2c13dd7 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 20:25:53 +0200 Subject: [PATCH 07/13] ssh-audit: init at 1.7.0 --- krebs/5pkgs/simple/ssh-audit.nix | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 krebs/5pkgs/simple/ssh-audit.nix diff --git a/krebs/5pkgs/simple/ssh-audit.nix b/krebs/5pkgs/simple/ssh-audit.nix new file mode 100644 index 000000000..7d2e6fb34 --- /dev/null +++ b/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"; + }; +} From 451b61ef0da49e12cb514e4f565b69b4bf343152 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 20:30:01 +0200 Subject: [PATCH 08/13] tv urlwatch: add ssh-audit --- tv/2configs/urlwatch.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 7467e8e67..40dc7d237 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -42,6 +42,9 @@ in { # ref , services.openssh.knownHosts.github* (json https://api.github.com/meta) + # ref + (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) From df6007c2eb3c6fab9106c3fc591fded7221b1708 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 21:50:07 +0200 Subject: [PATCH 09/13] treewide: nixpkgsVersion -> version --- krebs/5pkgs/haskell/blessings.nix | 2 +- krebs/5pkgs/haskell/email-header.nix | 2 +- tv/5pkgs/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix index c35706ebf..7abebba56 100644 --- a/krebs/5pkgs/haskell/blessings.nix +++ b/krebs/5pkgs/haskell/blessings.nix @@ -14,7 +14,7 @@ with import ; version = "2.2.0"; sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1"; }; - }.${versions.majorMinor nixpkgsVersion}; + }.${versions.majorMinor version}; in mkDerivation { pname = "blessings"; diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix index 6689f1d2c..fe4bb839b 100644 --- a/krebs/5pkgs/haskell/email-header.nix +++ b/krebs/5pkgs/haskell/email-header.nix @@ -20,7 +20,7 @@ with import ; rev = "refs/tags/v${cfg.version}"; sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x"; }; - }.${versions.majorMinor nixpkgsVersion}; + }.${versions.majorMinor version}; in mkDerivation { pname = "email-header"; diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 8f960dd79..2f6b67e73 100644 --- a/tv/5pkgs/default.nix +++ b/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 ]); From 397fad23666f0705f03af166ad0b9a7d87104e4d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 May 2019 10:27:57 +0200 Subject: [PATCH 10/13] nixpkgs: cf3e277 -> 04954e3 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 0bc3abf9c..ae75f6074 100644 --- a/krebs/nixpkgs.json +++ b/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": "04954e39df88487bf5b6bb5e532520e83a6c22ea", + "date": "2019-05-04T20:25:55-04:00", + "sha256": "1l6wc13mwwhv0msa0596wvsq2j2kxj1wjchdz4v1zzia781rpd8m", "fetchSubmodules": false } From 3128953fa34d3683444e843d80a6adc2d67bf7ea Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 14 May 2019 14:30:21 +0200 Subject: [PATCH 11/13] l vim: reactivate flake8 --- lass/2configs/vim.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 4f7bd4437..4b15e6cbd 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -11,6 +11,7 @@ let (hiPrio (pkgs.python3.withPackages (ps: [ ps.python-language-server ps.pyls-isort + ps.flake8 ]))) ]; @@ -73,8 +74,8 @@ 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' + let g:syntastic_python_checkers=['flake8'] + let g:syntastic_python_flake8_post_args='--ignore=E501' nnoremap :call LanguageClient_contextMenu() set hidden @@ -126,7 +127,7 @@ let extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [ pkgs.vimPlugins.ack-vim pkgs.vimPlugins.Gundo - #pkgs.vimPlugins.Syntastic + pkgs.vimPlugins.Syntastic pkgs.vimPlugins.undotree pkgs.vimPlugins.vim-go pkgs.vimPlugins.fzf-vim From 62535247901c883e8bb0fb2ec61248566a7ff60e Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 14 May 2019 14:53:13 +0200 Subject: [PATCH 12/13] l vim: remove syntastic (flake8 works over lsp) --- lass/2configs/vim.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 4b15e6cbd..2d4196f1b 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -73,10 +73,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 :call LanguageClient_contextMenu() set hidden let g:LanguageClient_serverCommands = { @@ -127,7 +123,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 From e9f96d7757f48000c6c4a4c1317bf4debab16a27 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 14 May 2019 15:11:42 +0200 Subject: [PATCH 13/13] l vim: add more python lsp tools --- lass/2configs/vim.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 2d4196f1b..a26255d49 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -11,7 +11,9 @@ let (hiPrio (pkgs.python3.withPackages (ps: [ ps.python-language-server ps.pyls-isort + ps.pyflakes ps.flake8 + ps.yapf ]))) ];