Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
83decf4907
@ -1,4 +1,6 @@
|
||||
{ stdenv, coreutils,makeWrapper, cac-api, cac-cert, cac-panel, gnumake, gnused, jq, openssh, ... }:
|
||||
{ stdenv, coreutils, makeWrapper,
|
||||
cac-api, cac-cert, cac-panel, gnumake, gnused, jq, openssh, sshpass,
|
||||
... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${shortname}-${version}";
|
||||
@ -21,6 +23,7 @@ stdenv.mkDerivation rec {
|
||||
gnused
|
||||
jq
|
||||
openssh
|
||||
sshpass
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -40,7 +40,6 @@ in {
|
||||
networking.firewall.allowedTCPPorts = [ 80 655 8080 ];
|
||||
|
||||
# services.openssh.allowSFTP = false;
|
||||
krebs.build.source.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
|
||||
|
||||
# copy config from <secrets/sabnzbd.ini> to /var/lib/sabnzbd/
|
||||
services.sabnzbd.enable = true;
|
||||
|
@ -14,6 +14,7 @@ let
|
||||
|
||||
priv-repos = mapAttrs make-priv-repo {
|
||||
autosync = { };
|
||||
pass = { };
|
||||
};
|
||||
|
||||
# TODO move users to separate module
|
||||
|
@ -15,7 +15,7 @@ let
|
||||
tinc_graphs = {
|
||||
desc = "Tinc Advanced Graph Generation";
|
||||
};
|
||||
cac = { };
|
||||
cac-api = { };
|
||||
init-stockholm = {
|
||||
desc = "Init stuff for stockholm";
|
||||
};
|
||||
|
62
makefu/2configs/laptop-utils.nix
Normal file
62
makefu/2configs/laptop-utils.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ 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
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
# core
|
||||
at_spi2_core
|
||||
acpi
|
||||
bc
|
||||
exif
|
||||
file
|
||||
ntfs3g
|
||||
pv
|
||||
proot
|
||||
sshpass
|
||||
unzip
|
||||
unrar
|
||||
usbutils
|
||||
zip
|
||||
|
||||
# dev
|
||||
python35Packages.virtualenv
|
||||
|
||||
|
||||
# gui
|
||||
clipit
|
||||
feh
|
||||
keepassx
|
||||
pcmanfm
|
||||
skype
|
||||
tightvnc
|
||||
gnome3.dconf
|
||||
vlc
|
||||
virtmanager
|
||||
wireshark
|
||||
xdotool
|
||||
|
||||
# browser
|
||||
firefox
|
||||
chromium
|
||||
|
||||
# sectools
|
||||
aria2
|
||||
binwalk
|
||||
dnsmasq
|
||||
iodine
|
||||
mtr
|
||||
nmap
|
||||
|
||||
|
||||
# stuff
|
||||
cac-cli
|
||||
cac-panel
|
||||
krebspaste
|
||||
ledger
|
||||
password-store
|
||||
];
|
||||
}
|
@ -3,6 +3,7 @@
|
||||
with config.krebs.lib;
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
abook
|
||||
msmtp
|
||||
mutt-kz
|
||||
notmuch
|
||||
@ -10,5 +11,4 @@ with config.krebs.lib;
|
||||
imapfilter
|
||||
gnupg
|
||||
];
|
||||
|
||||
}
|
||||
|
@ -11,21 +11,11 @@ with config.krebs.lib;
|
||||
./base-gui.nix
|
||||
./fetchWallpaper.nix
|
||||
./zsh-user.nix
|
||||
./laptop-utils.nix
|
||||
];
|
||||
|
||||
users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
|
||||
|
||||
environment.systemPackages = with pkgs;[
|
||||
vlc
|
||||
firefox
|
||||
chromium
|
||||
keepassx
|
||||
ntfs3g
|
||||
at_spi2_core
|
||||
gnome3.dconf
|
||||
virtmanager
|
||||
krebspaste
|
||||
];
|
||||
|
||||
services.redshift = {
|
||||
enable = true;
|
||||
|
@ -9,7 +9,8 @@ in
|
||||
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
|
||||
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
|
||||
awesomecfg = callPackage ./awesomecfg {};
|
||||
tw-upload-plugin = callPackage ./tw-upload-plugin {};
|
||||
nodemcu-uploader = callPackage ./nodemcu-uploader {};
|
||||
mycube-flask = callPackage ./mycube-flask {};
|
||||
tw-upload-plugin = callPackage ./tw-upload-plugin {};
|
||||
};
|
||||
}
|
||||
|
22
makefu/5pkgs/nodemcu-uploader/default.nix
Normal file
22
makefu/5pkgs/nodemcu-uploader/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, pkgs, pythonPackages, fetchurl, ... }:
|
||||
|
||||
with pythonPackages; buildPythonPackage rec {
|
||||
name = "nodemcu-uploader-${version}";
|
||||
version = "0.2.2";
|
||||
disabled = isPy3k || isPyPy;
|
||||
propagatedBuildInputs = [
|
||||
pyserial
|
||||
];
|
||||
src = fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/n/nodemcu-uploader/nodemcu-uploader-${version}.tar.gz";
|
||||
sha256 = "090giz84y9y3idgifp0yh80qqyv2czv6h3y55wyrlgf7qfbwbrvn";
|
||||
};
|
||||
# ImportError: No module named tests
|
||||
# not sure what to do here
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = https://github.com/kmpm/nodemcu-uploader;
|
||||
description = "tool for uploading files to NodeMCU filesystem";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user