From c05764274e5043912204b56cb1f032e1d5db6717 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 15 Feb 2017 08:15:35 +0100 Subject: k 5 dymo-cups-drivers: init at 1.4.0 --- makefu/5pkgs/dymo-cups-drivers/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 makefu/5pkgs/dymo-cups-drivers/default.nix (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/dymo-cups-drivers/default.nix b/makefu/5pkgs/dymo-cups-drivers/default.nix new file mode 100644 index 000000000..d47bae6dd --- /dev/null +++ b/makefu/5pkgs/dymo-cups-drivers/default.nix @@ -0,0 +1,17 @@ +{ stdenv, lib, pkgs, fetchurl, cups, ... }: + +stdenv.mkDerivation rec { + name = "dymo-cups-drivers-${version}"; + version = "1.4.0"; + src = fetchurl { + url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${name}.tar.gz"; + sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6"; + }; + buildInputs = [ cups ]; + makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ]; + + # acd_cli gets dumped in bin and gets overwritten by fixupPhase + meta = { + description = "Dymo printer drivers"; + }; +} -- cgit v1.3.1 From 3f3325a55e4a581cc3c7ab066e9fb883b1639bdc Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 18 Feb 2017 05:11:59 +0100 Subject: m x: replace laptop with new x230 (without coreboot) --- makefu/2configs/hw/tp-x230.nix | 10 ++++++++-- makefu/5pkgs/awesomecfg/full.cfg | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'makefu/5pkgs') diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix index 99563a771..855fda952 100644 --- a/makefu/2configs/hw/tp-x230.nix +++ b/makefu/2configs/hw/tp-x230.nix @@ -9,20 +9,26 @@ with import ; kernelModules = [ "kvm-intel" "thinkpad_ec" - # "acpi_call" + "acpi_call" # "thinkpad_acpi" # "tpm-rng" ]; extraModulePackages = [ - # config.boot.kernelPackages.acpi_call + config.boot.kernelPackages.acpi_call ]; }; + + # configured media keys inside awesomerc + # sound.mediaKeys.enable = true; + hardware.bluetooth.enable = true; + services.acpid.enable = true; hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; services.xserver = { videoDriver = "intel"; deviceSection = '' Option "AccelMethod" "sna" + Option "Backlight" "intel_backlight" ''; }; # no entropy source working diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg index 8036e5765..e43341d25 100644 --- a/makefu/5pkgs/awesomecfg/full.cfg +++ b/makefu/5pkgs/awesomecfg/full.cfg @@ -364,6 +364,10 @@ globalkeys = awful.util.table.join( end, {description = "restore minimized", group = "client"}), + awful.key({ }, "XF86MonBrightnessUp", function () + awful.util.spawn("xbacklight -inc 5", false) end), + awful.key({ }, "XF86MonBrightnessDown", function () + awful.util.spawn("xbacklight -dec 5", false) end), awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 5%+", false) end), -- cgit v1.3.1 From f32d84e23d1785463af9242bb616325b6ae58ada Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 1 Mar 2017 15:43:15 +0100 Subject: m 5 wol: rm, is now upstream --- makefu/5pkgs/wol/default.nix | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 makefu/5pkgs/wol/default.nix (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/wol/default.nix b/makefu/5pkgs/wol/default.nix deleted file mode 100644 index a6d54b8a2..000000000 --- a/makefu/5pkgs/wol/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - proj = "wake-on-lan"; - name = "wol-${version}"; - version = "0.7.1"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "mirror://sourceforge/${proj}/${name}.tar.gz"; - sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270"; - }; - - meta = { - description = "simple wake-on-lan client"; - homepage = https://sourceforge.net/projects/wake-on-lan/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; - }; -} -- cgit v1.3.1 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/5pkgs') diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 95ebabc44..43b37cd8c 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 ec6d4adec..000000000 --- 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 000000000..09344d99d --- /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 000000000..518a60eac --- /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 000000000..56d60812e --- /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 000000000..8acc25fcc --- /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 000000000..6b8a5af66 --- /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 000000000..67159a176 --- /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 000000000..3a2a84556 --- /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 000000000..84bb232cd --- /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.3.1 From 7d6945babb1366099beaa453dc86a7410a55db3d Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 1 Mar 2017 15:55:22 +0100 Subject: m 5 default: auto-detect packages --- makefu/5pkgs/default.nix | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 71354a015..25ae2fe4b 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -1,38 +1,35 @@ { pkgs, ... }: -let - inherit (pkgs) callPackage; -in +with import ; { - nixpkgs.config.packageOverrides = rec { - acdcli = callPackage ./acdcli {}; + nixpkgs.config.packageOverrides = oldpkgs: let + + # This callPackage will try to detect obsolete overrides. + callPackage = path: args: let + override = pkgs.callPackage path args; + upstream = optionalAttrs (override ? "name") + (oldpkgs.${(parseDrvName override.name).name} or {}); + in if upstream ? "name" && + override ? "name" && + compareVersions upstream.name override.name != -1 + then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override + else override; + + in {} + // mapAttrs (_: flip callPackage {}) + (filterAttrs (_: dir: pathExists (dir + "/default.nix")) + (subdirsOf ./.)) + // { alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; - awesomecfg = callPackage ./awesomecfg {}; - bintray-upload = callPackage ./bintray-upload {}; - debmirror = callPackage ./debmirror {}; inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client; - elchhub = callPackage ./elchhub {}; - f3 = callPackage ./f3 {}; - farpd = callPackage ./farpd {}; - git-xlsx-textconv = callPackage ./git-xlsx-textconv {}; - mergerfs = callPackage ./mergerfs {}; - mycube-flask = callPackage ./mycube-flask {}; nodemcu-uploader = callPackage ./nodemcu-uploader {}; - ps3netsrv = callPackage ./ps3netsrv {}; pwqgen-ger = callPackage ../../krebs/5pkgs/passwdqc-utils { wordset-file = pkgs.fetchurl { url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; }; }; - qcma = pkgs.qt5.callPackage ./qcma {}; - tw-upload-plugin = callPackage ./tw-upload-plugin {}; - skytraq-logger = callPackage ./skytraq-logger {}; - taskserver = callPackage ./taskserver {}; - udpt = callPackage ./udpt {}; - wol = callPackage ./wol {}; - snapraid = callPackage ./snapraid {}; }; } -- cgit v1.3.1