summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--krebs/source.nix2
-rw-r--r--makefu/3modules/awesome-extra.nix10
-rw-r--r--makefu/5pkgs/awesomecfg/default.nix25
-rw-r--r--makefu/5pkgs/awesomecfg/full.cfg14
-rw-r--r--makefu/5pkgs/custom/default.nix3
-rw-r--r--makefu/5pkgs/custom/qcma/default.nix36
-rw-r--r--makefu/5pkgs/dionaea/default.nix50
-rw-r--r--makefu/5pkgs/farpd/default.nix63
-rw-r--r--makefu/5pkgs/mcomix/default.nix4
-rw-r--r--makefu/5pkgs/opl-utils/default.nix3
-rw-r--r--makefu/5pkgs/shackie/default.nix33
-rw-r--r--nin/1systems/axon/config.nix4
-rw-r--r--nin/2configs/ableton.nix20
-rw-r--r--nin/2configs/git.nix11
-rw-r--r--nin/2configs/im.nix19
-rw-r--r--nin/source.nix5
17 files changed, 95 insertions, 208 deletions
diff --git a/.gitignore b/.gitignore
index e1c6ef949..d17552e83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/.graveyard
/TODO
+result
diff --git a/krebs/source.nix b/krebs/source.nix
index c2fbbc5f8..b22ef3574 100644
--- a/krebs/source.nix
+++ b/krebs/source.nix
@@ -18,7 +18,7 @@ in
stockholm.file = toString <stockholm>;
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "d09e425aea3e09b6cec5c7b05cc0603f6853748b"; # nixos-17.09 @ 2018-02-22
+ ref = "c5bc83b503dfb29eb27c1deb0268f15c1858e7ce"; # nixos-17.09 @ 2018-02-27
};
}
override
diff --git a/makefu/3modules/awesome-extra.nix b/makefu/3modules/awesome-extra.nix
index 0561c15a8..e4a79aa87 100644
--- a/makefu/3modules/awesome-extra.nix
+++ b/makefu/3modules/awesome-extra.nix
@@ -29,15 +29,7 @@ let
nixpkgs.config.packageOverrides = pkgs: rec {
awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
postFixup = let
- rclua = pkgs.substituteAll {
- src = cfg.baseConfig;
- modkey = cfg.modkey;
- # inherit (cfg) modkey;
- amixer = "${pkgs.alsaUtils}/bin/amixer";
- xlock = "${pkgs.xlockmore}/bin/xlock";
- xbacklight = "${pkgs.xorg.xbacklight}/bin/xbacklight";
-
- };
+ rclua = cfg.baseConfig.override { inherit (cfg) modkey; };
in "cp ${rclua} $out/etc/xdg/awesome/rc.lua";
});
};
diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index 3c9340692..7e9724ec8 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -1,7 +1,24 @@
-_:
+{ pkgs
+, lib
+, alsaUtils
+, xlockmore
+, xbacklight
+, modkey?"Mod4"
+, ... }:
{
- # replace: @amixer@ @xlock@ @xbacklight@
- full = ./full.cfg;
- kiosk = ./kiosk.lua;
+ # replace: @alsaUtils@ @xlockmore@ @xbacklight@ @modkey@
+ full = lib.makeOverridable pkgs.substituteAll {
+ name = "awesome_full_config";
+ inherit alsaUtils xlockmore xbacklight modkey;
+ isExecutable = false;
+ src = ./full.cfg;
+ };
+
+ kiosk = lib.makeOverridable pkgs.substituteAll {
+ name = "awesome_kiosk_config";
+ inherit alsaUtils xlockmore xbacklight modkey;
+ isExecutable = false;
+ src = ./kiosk.lua;
+ };
}
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 993942771..3488d0102 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -365,22 +365,22 @@ globalkeys = awful.util.table.join(
{description = "restore minimized", group = "client"}),
awful.key({ }, "XF86MonBrightnessUp", function ()
- awful.util.spawn("@xbacklight@ -inc 5", false) end),
+ awful.util.spawn("@xbacklight@/bin/xbacklight -inc 5", false) end),
awful.key({ }, "XF86MonBrightnessDown", function ()
- awful.util.spawn("@xbacklight@ -dec 5", false) end),
+ awful.util.spawn("@xbacklight@/bin/xbacklight -dec 5", false) end),
awful.key({ }, "XF86AudioRaiseVolume", function ()
- awful.util.spawn("@amixer@ set Master 5%+", false) end),
+ awful.util.spawn("@alsaUtils@/bin/amixer set Master 5%+", false) end),
awful.key({ }, "XF86AudioLowerVolume", function ()
- awful.util.spawn("@amixer@ set Master 5%-", false) end),
+ awful.util.spawn("@alsaUtils@/bin/amixer set Master 5%-", false) end),
awful.key({ }, "XF86AudioMute", function ()
- awful.util.spawn("@amixer@ -q -D default sset Master toggle", false) end),
+ awful.util.spawn("@alsaUtils@/bin/amixer -q -D default sset Master toggle", false) end),
-- Prompt
awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
{description = "run prompt", group = "launcher"}),
- awful.key({ modkey,"Control" }, "BackSpace", function () awful.util.spawn("@xlock@ -mode blank") end),
- awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("@xlock@ -mode blank") end),
+ awful.key({ modkey,"Control" }, "BackSpace", function () awful.util.spawn("@xlockmore@/bin/xlock -mode blank") end),
+ awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("@xlockmore@/bin/xlock -mode blank") end),
awful.key({ modkey }, "x",
function ()
diff --git a/makefu/5pkgs/custom/default.nix b/makefu/5pkgs/custom/default.nix
deleted file mode 100644
index 626938cdc..000000000
--- a/makefu/5pkgs/custom/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{}:
-{
-}
diff --git a/makefu/5pkgs/custom/qcma/default.nix b/makefu/5pkgs/custom/qcma/default.nix
index d67cda142..dfb57c880 100644
--- a/makefu/5pkgs/custom/qcma/default.nix
+++ b/makefu/5pkgs/custom/qcma/default.nix
@@ -1,6 +1,9 @@
{ lib, stdenv, fetchFromGitHub, fetchgit, libusb, libtool, autoconf, pkgconfig, git,
-gettext, automake, libxml2 , qmake,
-qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
+gettext, automake, libxml2
+, autoreconfHook
+, qmake4Hook
+, qmake
+, qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
let
libvitamtp = stdenv.mkDerivation rec {
name = "libvitamtp-${version}";
@@ -13,8 +16,8 @@ let
sha256 = "09c9f7gqpyicfpnhrfb4r67s2hci6hh31bzmqlpds4fywv5mzaf8";
};
- buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig ];
- preConfigure = "sh ./autogen.sh";
+ buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig
+ autoreconfHook ];
meta = {
description = "Content Manager Assistant for the PS Vita";
@@ -26,40 +29,29 @@ let
};
in stdenv.mkDerivation rec {
name = "qcma-${version}";
- version = "0.3.13";
+ version = "8e6cafedc0f47733f33323f829624e3fc847a176";
- src = fetchgit {
- url = "git://github.com/codestation/qcma.git";
- rev = "refs/tags/v"+version;
- leaveDotGit = true;
- sha256 = "164abjwlw2nw2i30wlwpsavz1zjkp6a14yprvinma5hflkw4yj6i";
+ src = fetchFromGitHub {
+ owner = "codestation";
+ repo = "qcma";
+ rev = version;
+ sha256 = "1l95kx3x4pf5iwmwigbch5c6n2h27lls5qiy4xh15v59p5442yw5";
};
preConfigure = ''
lrelease common/resources/translations/*.ts
'';
- # TODO: manually adding qtbase and qtmultimedia to the library path is shit,
- # this should be done somewhere before when building the project, idk.
- installPhase = ''
- make INSTALL_ROOT="$(out)" install
- for i in qcma qcma_cli; do
- wrapQtProgram $out/bin/$i --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
- qtbase qtmultimedia ]}
- done
- '';
-
enableParallelBuilding = true;
buildInputs = [ gdk_pixbuf ffmpeg libnotify libvitamtp git qtmultimedia qtbase ];
- nativeBuildInputs = [ qmake qttools pkgconfig ];
+ nativeBuildInputs = [ qttools pkgconfig qmake ];
meta = {
description = "Content Manager Assistant for the PS Vita";
homepage = https://github.com/codestation/qcma;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
- broken = true;
maintainers = with stdenv.lib.maintainers; [ makefu ];
};
}
diff --git a/makefu/5pkgs/dionaea/default.nix b/makefu/5pkgs/dionaea/default.nix
deleted file mode 100644
index fef197c20..000000000
--- a/makefu/5pkgs/dionaea/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub,
- libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre,
- libev,
- ... }:
-let
- liblcfg = stdenv.mkDerivation rec {
- name = "liblcfg-${version}";
- version = "750bc90";
- src = fetchFromGitHub {
- owner = "ThomasAdam";
- repo = "liblcfg";
- rev = version;
- sha256 = "1k3r47p81paw5802jklx9xqbjrxr26pahipxn9nq3177qhxxibkr";
- };
- buildInputs = with pkgs;[ autoconf automake ];
- preConfigure = ''autoreconf -fi'';
- sourceRoot = "${name}-src/code";
- };
-in stdenv.mkDerivation rec {
- name = "liblcfg-${version}";
-
- #version = "1.5c"; #original, does not compile due to libc errors
- #src = fetchurl {
- # url = "http://www.honeyd.org/uploads/honeyd-${version}.tar.gz";
- # sha256 = "0vcih16fk5pir5ssfil8x79nvi62faw0xvk8s5klnysv111db1ii";
- #};
-
- #version = "64d087c"; # honeyd-1.6.7
- # sha256 = "0zhnn13r24y1q494xcfx64vyp84zqk8qmsl41fq2674230bn0p31";
-
- version = "6756787f94c4f1ac53d1e5545d052774a0446c04";
- src = fetchFromGitHub {
- owner = "rep";
- repo = "dionaea";
- rev = version;
- sha256 = "04zjr9b7x0rqwzgb9gfxq6pclb817gz4qaghdl8xa79bqf9vv2p7";
- };
-
- buildInputs = with pkgs;[ libtool automake autoconf ];
- configureFlags = [
- "--with-liblcfg=${liblcfg}"
- "--with-libpcap=${libpcap}"
- ];
-
- meta = {
- homepage = http://www.honeyd.org/;
- description = "virtual Honeypots";
- license = lib.licenses.gpl2;
- };
-}
diff --git a/makefu/5pkgs/farpd/default.nix b/makefu/5pkgs/farpd/default.nix
deleted file mode 100644
index 8dfcee90c..000000000
--- a/makefu/5pkgs/farpd/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub,
- libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre,
- ... }:
-stdenv.mkDerivation rec {
- name = "farpd-${version}";
-
-
- version = "0.2";
- src = fetchurl {
- url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2.orig.tar.gz ;
- sha256 = "1m3pynvynr4vgkwh7z5i0yqlang2y0ph32cys3vbi2hx2apk9abd";
- };
-
- buildInputs = with pkgs;[
- automake
- gnugrep
- libpcap
- libdnet
- pcre
- libevent.out # requires .so and .h
- readline
- autoconf
- libtool
- zlib
- coreutils
- python
- pythonPackages.pysqlite
- ];
- patches = [
- ( fetchurl {
- url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2-11.diff.gz;
- sha256 = "2c246b37de8aab9c73f955fb77101adefd90637d03f582b9f8ffae2903af2f94";
- })
- ];
- # removes user install script from Makefile before automake
- #patches = [ ./autoconf.patch ];
- preConfigure = ''
- autoreconf -fi
-
- substituteInPlace configure \
- --replace "dumbnet" "dnet" \
- --replace "libpcap.a" "libpcap.so" \
- --replace "libevent.a" "libevent.so" \
- --replace "net/bpf.h" "pcap/bpf.h"
- '';
-
- makeFlags = [ "LIBS=-lz" ];
- configureFlags = [
- "--with-libpcap=${libpcap}"
- "--with-libevent=${libevent}"
- "--with-libdnet=${libdnet}"
- ];
- postInstall = ''
- mv $out/sbin/arpd $out/sbin/farpd
- mv $out/share/man/man8/arpd.8 $out/share/man/man8/farpd.8
- '';
-
- meta = {
- homepage = https://launchpad.net/ubuntu/+source/farpd/ ;
- description = "fake arp";
- license = lib.licenses.gpl2;
- };
-}
diff --git a/makefu/5pkgs/mcomix/default.nix b/makefu/5pkgs/mcomix/default.nix
index a12e2e821..7fb9cd375 100644
--- a/makefu/5pkgs/mcomix/default.nix
+++ b/makefu/5pkgs/mcomix/default.nix
@@ -11,6 +11,10 @@ python2Packages.buildPythonPackage rec {
propagatedBuildInputs = with python2Packages;
[ python2Packages.pygtk gtk3 python2Packages.pillow ];
+ # for module in sys.modules.itervalues():
+ # RuntimeError: dictionary changed size during iteration
+ doCheck = false;
+
meta = {
homepage = https://github.com/pyload/pyload;
description = "Free and Open Source download manager written in Python";
diff --git a/makefu/5pkgs/opl-utils/default.nix b/makefu/5pkgs/opl-utils/default.nix
index f4430f333..5799b8e0f 100644
--- a/makefu/5pkgs/opl-utils/default.nix
+++ b/makefu/5pkgs/opl-utils/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://github.com/ifcaro/Open-PS2-Loader;
description = "open-ps2-loader utils (opl2iso,iso2opl,genvmc)";
- license = lib.licenses.afl3;
+ ## not yet in stable
+ # license = lib.licenses.afl3;
};
}
diff --git a/makefu/5pkgs/shackie/default.nix b/makefu/5pkgs/shackie/default.nix
deleted file mode 100644
index b6cf8afe6..000000000
--- a/makefu/5pkgs/shackie/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python3Packages;
-let
- asyncio-irc = buildPythonPackage rec {
- name = "asyncio-irc-${version}";
- version = "2016-09-02";
- src = fetchFromGitHub {
- owner = "watchtower";
- repo = "asyncirc";
- rev = "5384d19";
- sha256 = "0xgzdvp0ig0im7r3vbqd3a9rzac0lkk2mvf7y4fw56p8k61df8nv";
- };
- propagatedBuildInputs = [ blinker ];
- };
-in
-buildPythonPackage rec {
- name = "shackie-${version}";
- version = "2017-04-24";
- propagatedBuildInputs = [
- asyncio-irc
- beautifulsoup4
- lxml
- pytz
- redis
- requests
- ];
- src = fetchFromGitHub {
- owner = "shackspace";
- repo = "shackie";
- rev = "e717ec7";
- sha256 = "1ffbjm3x2xcyxl42hfsjs5xg1pm0xsprdi5if9zxa5ycqydmiw3l";
- };
-}
diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix
index c5f38c1f3..483a4f84b 100644
--- a/nin/1systems/axon/config.nix
+++ b/nin/1systems/axon/config.nix
@@ -11,6 +11,7 @@ with lib;
<stockholm/nin>
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
#../2configs/copyq.nix
+ <stockholm/nin/2configs/ableton.nix>
<stockholm/nin/2configs/games.nix>
<stockholm/nin/2configs/git.nix>
<stockholm/nin/2configs/retiolum.nix>
@@ -98,6 +99,9 @@ with lib;
enable = true;
};
+ services.xserver.displayManager.sessionCommands = ''
+ ${pkgs.xorg.xhost}/bin/xhost + local:
+ '';
services.xserver.desktopManager.xfce = let
xbindConfig = pkgs.writeText "xbindkeysrc" ''
diff --git a/nin/2configs/ableton.nix b/nin/2configs/ableton.nix
new file mode 100644
index 000000000..343a9089d
--- /dev/null
+++ b/nin/2configs/ableton.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }: let
+ mainUser = config.users.extraUsers.nin;
+in {
+ users.users= {
+ ableton = {
+ isNormalUser = true;
+ extraGroups = [
+ "audio"
+ "video"
+ ];
+ packages = [
+ pkgs.wine
+ pkgs.winetricks
+ ];
+ };
+ };
+ security.sudo.extraConfig = ''
+ ${mainUser.name} ALL=(ableton) NOPASSWD: ALL
+ '';
+}
diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix
index 9ebbaabd2..aed4a9f48 100644
--- a/nin/2configs/git.nix
+++ b/nin/2configs/git.nix
@@ -36,17 +36,6 @@ let
make-public-repo = name: { cgit ? {}, ... }: {
inherit cgit name;
public = true;
- hooks = {
- post-receive = pkgs.git-hooks.irc-announce {
- # TODO make nick = config.krebs.build.host.name the default
- nick = config.krebs.build.host.name;
- channel = "#xxx";
- server = "irc.r";
- verbose = config.krebs.build.host.name == "onondaga";
- # TODO define branches in some kind of option per repo
- branches = [ "master" ];
- };
- };
};
make-rules =
diff --git a/nin/2configs/im.nix b/nin/2configs/im.nix
new file mode 100644
index 000000000..b078dbd53
--- /dev/null
+++ b/nin/2configs/im.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+with import <stockholm/lib>;
+{
+ environment.systemPackages = with pkgs; [
+ (pkgs.writeDashBin "im" ''
+ export PATH=${makeSearchPath "bin" (with pkgs; [
+ tmux
+ gnugrep
+ weechat
+ ])}
+ ssh chat@onondaga
+ if tmux list-sessions -F\#S | grep -q '^im''$'; then
+ exec tmux attach -t im
+ else
+ exec tmux new -s im weechat
+ fi
+ '')
+ ];
+}
diff --git a/nin/source.nix b/nin/source.nix
index ccf5e6acc..ce1879357 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -12,8 +12,5 @@ in
nin = "/home/nin/secrets/${name}";
};
stockholm.file = toString <stockholm>;
- nixpkgs.git = {
- url = https://github.com/nixos/nixpkgs;
- ref = "afe9649";
- };
+ nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:09:46 +0000