From 8bacb23ad46c7c4feb8ba097ce2c221579065c2e Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 1 Mar 2017 15:45:50 +0100 Subject: m 5 esptool: ninit --- makefu/2configs/base-gui.nix | 2 +- makefu/2configs/laptop-utils.nix | 65 ------------------------------------- makefu/2configs/tools/all.nix | 10 ++++++ makefu/2configs/tools/core-gui.nix | 25 ++++++++++++++ makefu/2configs/tools/core.nix | 41 +++++++++++++++++++++++ makefu/2configs/tools/dev.nix | 10 ++++++ makefu/2configs/tools/extra-gui.nix | 12 +++++++ makefu/2configs/tools/media.nix | 12 +++++++ makefu/2configs/tools/sec.nix | 15 +++++++++ makefu/5pkgs/esptool/default.nix | 32 ++++++++++++++++++ 10 files changed, 158 insertions(+), 66 deletions(-) delete mode 100644 makefu/2configs/laptop-utils.nix create mode 100644 makefu/2configs/tools/all.nix create mode 100644 makefu/2configs/tools/core-gui.nix create mode 100644 makefu/2configs/tools/core.nix create mode 100644 makefu/2configs/tools/dev.nix create mode 100644 makefu/2configs/tools/extra-gui.nix create mode 100644 makefu/2configs/tools/media.nix create mode 100644 makefu/2configs/tools/sec.nix create mode 100644 makefu/5pkgs/esptool/default.nix (limited to 'makefu') diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 95ebabc4..43b37cd8 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -82,7 +82,7 @@ in URxvt.perl-ext: default,url-select URxvt.keysym.M-u: perl:url-select:select_next - URxvt.url-select.launcher: chromium + URxvt.url-select.launcher: firefox -new-tab URxvt.url-select.underline: true URxvt.searchable-scrollback: CM-s ''; diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix deleted file mode 100644 index ec6d4ade..00000000 --- a/makefu/2configs/laptop-utils.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ pkgs, ... }: - -# tools i use when actually working with the host. -# package version will now be maintained by nix-rebuild -# -# essentially `nix-env -q` of the main user -# TODO: split gui and non-gui -{ - nixpkgs.config.firefox = { - enableAdobeFlash = true; - }; - - krebs.per-user.makefu.packages = with pkgs; [ - # core - at_spi2_core - acpi - bc - exif - file - ntfs3g - pv - proot - sshpass - unzip - unrar - usbutils - zip - - # dev - python35Packages.virtualenv - - - # gui - chromium - clipit - feh - firefox - keepassx - pcmanfm - skype - mirage - tightvnc - gnome3.dconf - vlc - virtmanager - wireshark - xdotool - - # sectools - aria2 - pythonPackages.binwalk-full - dnsmasq - iodine - mtr - nmap - - - # stuff - cac-api - cac-panel - krebspaste - ledger - pass - ]; -} diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix new file mode 100644 index 00000000..09344d99 --- /dev/null +++ b/makefu/2configs/tools/all.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ./core.nix + ./core-gui.nix + ./extra-gui.nix + ./dev.nix + ./sec.nix + ./media.nix + ]; +} diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix new file mode 100644 index 00000000..518a60ea --- /dev/null +++ b/makefu/2configs/tools/core-gui.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: + +{ + nixpkgs.config.firefox = { + enableAdobeFlash = true; + }; + + krebs.per-user.makefu.packages = with pkgs; [ + chromium + clipit + feh + firefox + keepassx + pcmanfm + skype + mirage + tightvnc + gnome3.dconf + vlc + wireshark + xdotool + scrot + + ]; +} diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix new file mode 100644 index 00000000..56d60812 --- /dev/null +++ b/makefu/2configs/tools/core.nix @@ -0,0 +1,41 @@ +{ pkgs, ... }: + +# tools i use when actually working with the host. +# package version will now be maintained by nix-rebuild +# +# essentially `nix-env -q` of the main user +{ + krebs.per-user.makefu.packages = with pkgs; [ + at_spi2_core + acpi + bc + exif + file + ntfs3g + pv + proot + sshpass + usbutils + p7zip + hdparm + inetutils + ncftp + mutt + tcpdump + sysstat + which + weechat + curl + wget + wol + tmux + smartmontools + iftop + + cac-api + cac-panel + krebspaste + ledger + pass + ]; +} diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix new file mode 100644 index 00000000..8acc25fc --- /dev/null +++ b/makefu/2configs/tools/dev.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + krebs.per-user.makefu.packages = with pkgs;[ + nodemcu-uploader + esptool + python35Packages.virtualenv + flashrom + ]; +} diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix new file mode 100644 index 00000000..6b8a5af6 --- /dev/null +++ b/makefu/2configs/tools/extra-gui.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +{ + krebs.per-user.makefu.packages = with pkgs;[ + inkscape + gimp + skype + virtmanager + synergy + + ]; +} diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix new file mode 100644 index 00000000..67159a17 --- /dev/null +++ b/makefu/2configs/tools/media.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +{ + nixpkgs.config.firefox = { + enableAdobeFlash = true; + }; + + krebs.per-user.makefu.packages = with pkgs; [ + kodi + streamripper + ]; +} diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix new file mode 100644 index 00000000..3a2a8455 --- /dev/null +++ b/makefu/2configs/tools/sec.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + krebs.per-user.makefu.packages = with pkgs; [ + aria2 + mitmproxy + pythonPackages.binwalk-full + dnsmasq + iodine + mtr + nmap + msf + thc-hydra + ]; +} diff --git a/makefu/5pkgs/esptool/default.nix b/makefu/5pkgs/esptool/default.nix new file mode 100644 index 00000000..84bb232c --- /dev/null +++ b/makefu/5pkgs/esptool/default.nix @@ -0,0 +1,32 @@ +{ pkgs, fetchFromGitHub, ... }: +with pkgs.python2Packages; +let + pyaes = buildPythonPackage rec { + name = "pyaes-${version}"; + version = "1.6.0"; + src = fetchFromGitHub { + owner = "ricmoo"; + repo = "pyaes"; + rev = "v${version}"; + sha256 = "04934a9zgwc8g3qhfrkcfv0bs557paigllnkrnfhp9m1azr3bfqb"; + }; + doCheck = false; + }; +in +buildPythonPackage rec { + name = "esptool-${version}"; + version = "2.0beta2"; + propagatedBuildInputs = [ + pyserial + flake8 + ecdsa + pyaes + ]; + src = fetchFromGitHub { + owner = "themadinventor"; + repo = "esptool"; + rev = "v${version}"; + sha256 = "0n96pyi1k4qlyfqk5k7xpgq8726wz74qvd3gqjg0bpsl3wr7l94i"; + }; + doCheck = false; +} -- cgit v1.2.3