Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli
This commit is contained in:
commit
e7ac3fc703
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/.graveyard
|
/.graveyard
|
||||||
/TODO
|
/TODO
|
||||||
|
result
|
||||||
|
@ -18,7 +18,7 @@ in
|
|||||||
stockholm.file = toString <stockholm>;
|
stockholm.file = toString <stockholm>;
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
ref = "d09e425aea3e09b6cec5c7b05cc0603f6853748b"; # nixos-17.09 @ 2018-02-22
|
ref = "c5bc83b503dfb29eb27c1deb0268f15c1858e7ce"; # nixos-17.09 @ 2018-02-27
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
override
|
override
|
||||||
|
@ -29,15 +29,7 @@ let
|
|||||||
nixpkgs.config.packageOverrides = pkgs: rec {
|
nixpkgs.config.packageOverrides = pkgs: rec {
|
||||||
awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
|
awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
|
||||||
postFixup = let
|
postFixup = let
|
||||||
rclua = pkgs.substituteAll {
|
rclua = cfg.baseConfig.override { inherit (cfg) modkey; };
|
||||||
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";
|
|
||||||
|
|
||||||
};
|
|
||||||
in "cp ${rclua} $out/etc/xdg/awesome/rc.lua";
|
in "cp ${rclua} $out/etc/xdg/awesome/rc.lua";
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,24 @@
|
|||||||
_:
|
{ pkgs
|
||||||
|
, lib
|
||||||
|
, alsaUtils
|
||||||
|
, xlockmore
|
||||||
|
, xbacklight
|
||||||
|
, modkey?"Mod4"
|
||||||
|
, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# replace: @amixer@ @xlock@ @xbacklight@
|
# replace: @alsaUtils@ @xlockmore@ @xbacklight@ @modkey@
|
||||||
full = ./full.cfg;
|
full = lib.makeOverridable pkgs.substituteAll {
|
||||||
kiosk = ./kiosk.lua;
|
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;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -365,22 +365,22 @@ globalkeys = awful.util.table.join(
|
|||||||
{description = "restore minimized", group = "client"}),
|
{description = "restore minimized", group = "client"}),
|
||||||
|
|
||||||
awful.key({ }, "XF86MonBrightnessUp", function ()
|
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.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.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.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.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
|
-- Prompt
|
||||||
awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
|
awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
|
||||||
{description = "run prompt", group = "launcher"}),
|
{description = "run prompt", group = "launcher"}),
|
||||||
awful.key({ modkey,"Control" }, "BackSpace", 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("@xlock@ -mode blank") end),
|
awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("@xlockmore@/bin/xlock -mode blank") end),
|
||||||
|
|
||||||
awful.key({ modkey }, "x",
|
awful.key({ modkey }, "x",
|
||||||
function ()
|
function ()
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
{}:
|
|
||||||
{
|
|
||||||
}
|
|
@ -1,6 +1,9 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, fetchgit, libusb, libtool, autoconf, pkgconfig, git,
|
{ lib, stdenv, fetchFromGitHub, fetchgit, libusb, libtool, autoconf, pkgconfig, git,
|
||||||
gettext, automake, libxml2 , qmake,
|
gettext, automake, libxml2
|
||||||
qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
|
, autoreconfHook
|
||||||
|
, qmake4Hook
|
||||||
|
, qmake
|
||||||
|
, qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
|
||||||
let
|
let
|
||||||
libvitamtp = stdenv.mkDerivation rec {
|
libvitamtp = stdenv.mkDerivation rec {
|
||||||
name = "libvitamtp-${version}";
|
name = "libvitamtp-${version}";
|
||||||
@ -13,8 +16,8 @@ let
|
|||||||
sha256 = "09c9f7gqpyicfpnhrfb4r67s2hci6hh31bzmqlpds4fywv5mzaf8";
|
sha256 = "09c9f7gqpyicfpnhrfb4r67s2hci6hh31bzmqlpds4fywv5mzaf8";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig ];
|
buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig
|
||||||
preConfigure = "sh ./autogen.sh";
|
autoreconfHook ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Content Manager Assistant for the PS Vita";
|
description = "Content Manager Assistant for the PS Vita";
|
||||||
@ -26,40 +29,29 @@ let
|
|||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "qcma-${version}";
|
name = "qcma-${version}";
|
||||||
version = "0.3.13";
|
version = "8e6cafedc0f47733f33323f829624e3fc847a176";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchFromGitHub {
|
||||||
url = "git://github.com/codestation/qcma.git";
|
owner = "codestation";
|
||||||
rev = "refs/tags/v"+version;
|
repo = "qcma";
|
||||||
leaveDotGit = true;
|
rev = version;
|
||||||
sha256 = "164abjwlw2nw2i30wlwpsavz1zjkp6a14yprvinma5hflkw4yj6i";
|
sha256 = "1l95kx3x4pf5iwmwigbch5c6n2h27lls5qiy4xh15v59p5442yw5";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
lrelease common/resources/translations/*.ts
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs = [ gdk_pixbuf ffmpeg libnotify libvitamtp git qtmultimedia qtbase ];
|
buildInputs = [ gdk_pixbuf ffmpeg libnotify libvitamtp git qtmultimedia qtbase ];
|
||||||
nativeBuildInputs = [ qmake qttools pkgconfig ];
|
nativeBuildInputs = [ qttools pkgconfig qmake ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Content Manager Assistant for the PS Vita";
|
description = "Content Manager Assistant for the PS Vita";
|
||||||
homepage = https://github.com/codestation/qcma;
|
homepage = https://github.com/codestation/qcma;
|
||||||
license = stdenv.lib.licenses.gpl2;
|
license = stdenv.lib.licenses.gpl2;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
broken = true;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ makefu ];
|
maintainers = with stdenv.lib.maintainers; [ makefu ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
@ -11,6 +11,10 @@ python2Packages.buildPythonPackage rec {
|
|||||||
propagatedBuildInputs = with python2Packages;
|
propagatedBuildInputs = with python2Packages;
|
||||||
[ python2Packages.pygtk gtk3 python2Packages.pillow ];
|
[ python2Packages.pygtk gtk3 python2Packages.pillow ];
|
||||||
|
|
||||||
|
# for module in sys.modules.itervalues():
|
||||||
|
# RuntimeError: dictionary changed size during iteration
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = https://github.com/pyload/pyload;
|
homepage = https://github.com/pyload/pyload;
|
||||||
description = "Free and Open Source download manager written in Python";
|
description = "Free and Open Source download manager written in Python";
|
||||||
|
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
|||||||
meta = {
|
meta = {
|
||||||
homepage = https://github.com/ifcaro/Open-PS2-Loader;
|
homepage = https://github.com/ifcaro/Open-PS2-Loader;
|
||||||
description = "open-ps2-loader utils (opl2iso,iso2opl,genvmc)";
|
description = "open-ps2-loader utils (opl2iso,iso2opl,genvmc)";
|
||||||
license = lib.licenses.afl3;
|
## not yet in stable
|
||||||
|
# license = lib.licenses.afl3;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -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";
|
|
||||||
};
|
|
||||||
}
|
|
@ -11,6 +11,7 @@ with lib;
|
|||||||
<stockholm/nin>
|
<stockholm/nin>
|
||||||
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||||
#../2configs/copyq.nix
|
#../2configs/copyq.nix
|
||||||
|
<stockholm/nin/2configs/ableton.nix>
|
||||||
<stockholm/nin/2configs/games.nix>
|
<stockholm/nin/2configs/games.nix>
|
||||||
<stockholm/nin/2configs/git.nix>
|
<stockholm/nin/2configs/git.nix>
|
||||||
<stockholm/nin/2configs/retiolum.nix>
|
<stockholm/nin/2configs/retiolum.nix>
|
||||||
@ -98,6 +99,9 @@ with lib;
|
|||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.xserver.displayManager.sessionCommands = ''
|
||||||
|
${pkgs.xorg.xhost}/bin/xhost + local:
|
||||||
|
'';
|
||||||
|
|
||||||
services.xserver.desktopManager.xfce = let
|
services.xserver.desktopManager.xfce = let
|
||||||
xbindConfig = pkgs.writeText "xbindkeysrc" ''
|
xbindConfig = pkgs.writeText "xbindkeysrc" ''
|
||||||
|
20
nin/2configs/ableton.nix
Normal file
20
nin/2configs/ableton.nix
Normal file
@ -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
|
||||||
|
'';
|
||||||
|
}
|
@ -36,17 +36,6 @@ let
|
|||||||
make-public-repo = name: { cgit ? {}, ... }: {
|
make-public-repo = name: { cgit ? {}, ... }: {
|
||||||
inherit cgit name;
|
inherit cgit name;
|
||||||
public = true;
|
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 =
|
make-rules =
|
||||||
|
19
nin/2configs/im.nix
Normal file
19
nin/2configs/im.nix
Normal file
@ -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
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
}
|
@ -12,8 +12,5 @@ in
|
|||||||
nin = "/home/nin/secrets/${name}";
|
nin = "/home/nin/secrets/${name}";
|
||||||
};
|
};
|
||||||
stockholm.file = toString <stockholm>;
|
stockholm.file = toString <stockholm>;
|
||||||
nixpkgs.git = {
|
nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
|
||||||
url = https://github.com/nixos/nixpkgs;
|
|
||||||
ref = "afe9649";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user