Merge branch 'master' of prism:stockholm
This commit is contained in:
commit
f20bf1a7ba
|
@ -3,16 +3,17 @@
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
# bln config file
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
<stockholm/jeschli>
|
<stockholm/jeschli>
|
||||||
<stockholm/jeschli/2configs/virtualbox.nix>
|
<stockholm/jeschli/2configs/virtualbox.nix>
|
||||||
|
<stockholm/jeschli/2configs/urxvt.nix>
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
# ./dcso-vpn.nix
|
# ./dcso-vpn.nix
|
||||||
];
|
];
|
||||||
|
jeschliFontSize = 20;
|
||||||
# Use the GRUB 2 boot loader.
|
# Use the GRUB 2 boot loader.
|
||||||
boot.loader.grub.enable = true;
|
boot.loader.grub.enable = true;
|
||||||
boot.loader.grub.version = 2;
|
boot.loader.grub.version = 2;
|
||||||
|
@ -36,7 +37,15 @@
|
||||||
allowDiscards = true;
|
allowDiscards = true;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
environment.shellAliases = {
|
||||||
|
n = "nix-shell";
|
||||||
|
gd = "cd /home/markus/go/src/gitlab.dcso.lolcat";
|
||||||
|
gh = "cd /home/markus/go/src/github.com";
|
||||||
|
stocki = pkgs.writeDash "deploy" ''
|
||||||
|
cd ~/stockholm
|
||||||
|
LOGNAME=jeschli exec nix-shell -I stockholm="$PWD" --run 'deploy --system="bln"'
|
||||||
|
'';
|
||||||
|
};
|
||||||
networking.hostName = lib.mkForce "BLN02NB0154"; # Define your hostname.
|
networking.hostName = lib.mkForce "BLN02NB0154"; # Define your hostname.
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
@ -55,13 +64,9 @@
|
||||||
# List packages installed in system profile. To search by name, run:
|
# List packages installed in system profile. To search by name, run:
|
||||||
# $ nix-env -qaP | grep wget
|
# $ nix-env -qaP | grep wget
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
environment.shellAliases = {
|
|
||||||
n = "nix-shell";
|
|
||||||
gd = "cd /home/markus/go/src/gitlab.dcso.lolcat";
|
|
||||||
gh = "cd /home/markus/go/src/github.com";
|
|
||||||
};
|
|
||||||
environment.variables = { GOROOT= [ "${pkgs.go.out}/share/go" ]; };
|
environment.variables = { GOROOT= [ "${pkgs.go.out}/share/go" ]; };
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
termite
|
||||||
# system helper
|
# system helper
|
||||||
ag
|
ag
|
||||||
copyq
|
copyq
|
||||||
|
@ -86,6 +91,7 @@
|
||||||
chromium
|
chromium
|
||||||
google-chrome
|
google-chrome
|
||||||
# programming languages
|
# programming languages
|
||||||
|
elmPackages.elm
|
||||||
go
|
go
|
||||||
gcc
|
gcc
|
||||||
ghc
|
ghc
|
||||||
|
|
|
@ -40,6 +40,16 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
services.taskserver = {
|
||||||
|
enable = true;
|
||||||
|
fqdn = "enklave.r";
|
||||||
|
listenHost = "::";
|
||||||
|
listenPort = 53589;
|
||||||
|
organisations.lass.users = [ "jeschli" ];
|
||||||
|
};
|
||||||
|
networking.firewall.allowedTCPPorts = [ 53589 ];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.enklave;
|
krebs.build.host = config.krebs.hosts.enklave;
|
||||||
|
|
10
jeschli/1systems/enklave/taskserver.nix
Normal file
10
jeschli/1systems/enklave/taskserver.nix
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
services.taskserver = {
|
||||||
|
enable = true;
|
||||||
|
fqdn = "enklave.r";
|
||||||
|
listenHost = "::";
|
||||||
|
listenPort = 53589;
|
||||||
|
organisations.lass.users = [ "jeschli" ];
|
||||||
|
};
|
||||||
|
networking.firewall.allowedTCPPorts = [ 53589 ];
|
||||||
|
}
|
|
@ -4,6 +4,7 @@ with import <stockholm/lib>;
|
||||||
imports = [
|
imports = [
|
||||||
./vim.nix
|
./vim.nix
|
||||||
./retiolum.nix
|
./retiolum.nix
|
||||||
|
./zsh.nix
|
||||||
<stockholm/lass/2configs/security-workarounds.nix>
|
<stockholm/lass/2configs/security-workarounds.nix>
|
||||||
{
|
{
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
|
|
|
@ -1,34 +1,39 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
{
|
{
|
||||||
services.urxvtd.enable = true;
|
options.jeschliFontSize = mkOption {
|
||||||
krebs.xresources.enable = true;
|
type = types.int;
|
||||||
krebs.xresources.resources.urxvt = ''
|
default = 12;
|
||||||
*foreground: rgb:a8/a8/a8
|
};
|
||||||
*background: rgb:00/00/00
|
config = {
|
||||||
*faceName: DejaVu Sans Mono
|
services.urxvtd.enable = true;
|
||||||
*faceSize: 12
|
krebs.xresources.enable = true;
|
||||||
*color0: rgb:00/00/00
|
krebs.xresources.resources.urxvt = ''
|
||||||
*color1: rgb:a8/00/00
|
*foreground: rgb:a8/a8/a8
|
||||||
*color2: rgb:00/a8/00
|
*background: rgb:00/00/00
|
||||||
*color3: rgb:a8/54/00
|
*faceName: DejaVu Sans Mono
|
||||||
*color4: rgb:00/00/a8
|
*faceSize: ${toString config.jeschliFontSize}
|
||||||
*color5: rgb:a8/00/a8
|
*color0: rgb:00/00/00
|
||||||
*color6: rgb:00/a8/a8
|
*color1: rgb:a8/00/00
|
||||||
*color7: rgb:a8/a8/a8
|
*color2: rgb:00/a8/00
|
||||||
*color8: rgb:54/54/54
|
*color3: rgb:a8/54/00
|
||||||
*color9: rgb:fc/54/54
|
*color4: rgb:26/8b/d2
|
||||||
*color10: rgb:54/fc/54
|
*color5: rgb:a8/00/a8
|
||||||
*color11: rgb:fc/fc/54
|
*color6: rgb:00/a8/a8
|
||||||
*color12: rgb:54/54/fc
|
*color7: rgb:a8/a8/a8
|
||||||
*color13: rgb:fc/54/fc
|
*color8: rgb:54/54/54
|
||||||
*color14: rgb:54/fc/fc
|
*color9: rgb:fc/54/54
|
||||||
*color15: rgb:fc/fc/fc
|
*color10: rgb:54/fc/54
|
||||||
|
*color11: rgb:fc/fc/54
|
||||||
URxvt*scrollBar: false
|
*color12: rgb:54/54/fc
|
||||||
URxvt*urgentOnBell: true
|
*color13: rgb:fc/54/fc
|
||||||
URxvt*font: xft:DejaVu Sans Mono:pixelsize=12
|
*color14: rgb:54/fc/fc
|
||||||
URXvt*faceSize: 12
|
*color15: rgb:fc/fc/fc
|
||||||
'';
|
|
||||||
|
URxvt*scrollBar: false
|
||||||
|
URxvt*urgentOnBell: true
|
||||||
|
URxvt*font: xft:DejaVu Sans Mono:pixelsize=${toString config.jeschliFontSize}
|
||||||
|
URXvt*faceSize: ${toString config.jeschliFontSize}
|
||||||
|
'';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,9 @@ in {
|
||||||
name = "vim";
|
name = "vim";
|
||||||
vimrcConfig.customRC = let
|
vimrcConfig.customRC = let
|
||||||
colorscheme = ''colorscheme molokai'';
|
colorscheme = ''colorscheme molokai'';
|
||||||
|
highlightTrailingWhiteSpaces = ''
|
||||||
|
au Syntax * syn match Garbage containedin=ALL /\s\+$/
|
||||||
|
'';
|
||||||
setStatements = ''
|
setStatements = ''
|
||||||
set autowrite
|
set autowrite
|
||||||
set clipboard=unnamedplus
|
set clipboard=unnamedplus
|
||||||
|
@ -42,6 +45,7 @@ in {
|
||||||
remapStatements = ''
|
remapStatements = ''
|
||||||
imap jk <Esc>
|
imap jk <Esc>
|
||||||
map gr :GoRun<Enter> " Map gr to execute go run
|
map gr :GoRun<Enter> " Map gr to execute go run
|
||||||
|
map tt :GoTest<Enter> " Map tt to execute go test
|
||||||
map nf :NERDTreeToggle<CR>
|
map nf :NERDTreeToggle<CR>
|
||||||
nnoremap <C-TAB> <c-w><c-w>
|
nnoremap <C-TAB> <c-w><c-w>
|
||||||
nnoremap <S-TAB> :bnext<CR>
|
nnoremap <S-TAB> :bnext<CR>
|
||||||
|
@ -74,11 +78,12 @@ in {
|
||||||
'';
|
'';
|
||||||
in ''
|
in ''
|
||||||
${colorscheme}
|
${colorscheme}
|
||||||
|
${highlightTrailingWhiteSpaces}
|
||||||
${remapStatements}
|
${remapStatements}
|
||||||
${setStatements}
|
${setStatements}
|
||||||
${settingsForElm}
|
${settingsForElm}
|
||||||
${settingsForGo}
|
${settingsForGo}
|
||||||
" I dont know what this line is about
|
" dont expand tabs in go files and show it with four whitespaces.
|
||||||
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
|
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
|
||||||
'';
|
'';
|
||||||
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
|
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
|
||||||
|
|
138
jeschli/2configs/zsh.nix
Normal file
138
jeschli/2configs/zsh.nix
Normal file
|
@ -0,0 +1,138 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
environment.systemPackages = [ pkgs.fzf ];
|
||||||
|
programs.zsh = {
|
||||||
|
enable = true;
|
||||||
|
shellInit = ''
|
||||||
|
#disable config wizard
|
||||||
|
zsh-newuser-install() { :; }
|
||||||
|
'';
|
||||||
|
interactiveShellInit = ''
|
||||||
|
setopt autocd extendedglob
|
||||||
|
bindkey -e
|
||||||
|
|
||||||
|
#history magic
|
||||||
|
bindkey "[A" up-line-or-local-history
|
||||||
|
bindkey "[B" down-line-or-local-history
|
||||||
|
|
||||||
|
up-line-or-local-history() {
|
||||||
|
zle set-local-history 1
|
||||||
|
zle up-line-or-history
|
||||||
|
zle set-local-history 0
|
||||||
|
}
|
||||||
|
zle -N up-line-or-local-history
|
||||||
|
down-line-or-local-history() {
|
||||||
|
zle set-local-history 1
|
||||||
|
zle down-line-or-history
|
||||||
|
zle set-local-history 0
|
||||||
|
}
|
||||||
|
zle -N down-line-or-local-history
|
||||||
|
|
||||||
|
setopt share_history
|
||||||
|
setopt hist_ignore_dups
|
||||||
|
# setopt inc_append_history
|
||||||
|
bindkey '^R' history-incremental-search-backward
|
||||||
|
|
||||||
|
#C-x C-e open line in editor
|
||||||
|
autoload -z edit-command-line
|
||||||
|
zle -N edit-command-line
|
||||||
|
bindkey "^X^E" edit-command-line
|
||||||
|
|
||||||
|
#fzf inclusion
|
||||||
|
source ${pkgs.fzf}/share/fzf/completion.zsh
|
||||||
|
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
|
||||||
|
|
||||||
|
#completion magic
|
||||||
|
autoload -Uz compinit
|
||||||
|
compinit
|
||||||
|
zstyle ':completion:*' menu select
|
||||||
|
|
||||||
|
#enable automatic rehashing of $PATH
|
||||||
|
zstyle ':completion:*' rehash true
|
||||||
|
|
||||||
|
eval $(dircolors -b ${pkgs.fetchFromGitHub {
|
||||||
|
owner = "trapd00r";
|
||||||
|
repo = "LS_COLORS";
|
||||||
|
rev = "master";
|
||||||
|
sha256="05lh5w3bgj9h8d8lrbbwbzw8788709cnzzkl8yh7m1dawkpf6nlp";
|
||||||
|
}}/LS_COLORS)
|
||||||
|
|
||||||
|
#beautiful colors
|
||||||
|
alias ls='ls --color'
|
||||||
|
# zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS}
|
||||||
|
|
||||||
|
#emacs bindings
|
||||||
|
bindkey "[7~" beginning-of-line
|
||||||
|
bindkey "[8~" end-of-line
|
||||||
|
bindkey "Oc" emacs-forward-word
|
||||||
|
bindkey "Od" emacs-backward-word
|
||||||
|
|
||||||
|
#aliases
|
||||||
|
alias ll='ls -l'
|
||||||
|
alias la='ls -la'
|
||||||
|
|
||||||
|
#fancy window title magic
|
||||||
|
'';
|
||||||
|
promptInit = ''
|
||||||
|
# TODO: figure out why we need to set this here
|
||||||
|
HISTSIZE=900001
|
||||||
|
HISTFILESIZE=$HISTSIZE
|
||||||
|
SAVEHIST=$HISTSIZE
|
||||||
|
|
||||||
|
autoload -U promptinit
|
||||||
|
promptinit
|
||||||
|
|
||||||
|
p_error='%(?..%F{red}%?%f )'
|
||||||
|
t_error='%(?..%? )'
|
||||||
|
|
||||||
|
case $UID in
|
||||||
|
0)
|
||||||
|
p_username='%F{red}root%f'
|
||||||
|
t_username='root'
|
||||||
|
;;
|
||||||
|
1337)
|
||||||
|
p_username=""
|
||||||
|
t_username=""
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
p_username='%F{blue}%n%f'
|
||||||
|
t_username='%n'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if test -n "$SSH_CLIENT"; then
|
||||||
|
p_hostname='@%F{magenta}%M%f '
|
||||||
|
t_hostname='@%M '
|
||||||
|
else
|
||||||
|
p_hostname=""
|
||||||
|
t_hostname=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
#check if in nix shell
|
||||||
|
if test -n "$buildInputs"; then
|
||||||
|
p_nixshell='%F{green}[s]%f '
|
||||||
|
t_nixshell='[s] '
|
||||||
|
else
|
||||||
|
p_nixshell=""
|
||||||
|
t_nixshell=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
PROMPT="$p_error$p_username$p_hostname$p_nixshell%~ "
|
||||||
|
TITLE="$t_error$t_username$t_hostname$t_nixshell%~"
|
||||||
|
case $TERM in
|
||||||
|
(*xterm* | *rxvt*)
|
||||||
|
function precmd {
|
||||||
|
PROMPT_EVALED="$(print -P $TITLE)"
|
||||||
|
echo -ne "\033]0;$$ $PROMPT_EVALED\007"
|
||||||
|
}
|
||||||
|
# This is seen while the shell waits for a command to complete.
|
||||||
|
function preexec {
|
||||||
|
PROMPT_EVALED="$(print -P $TITLE)"
|
||||||
|
echo -ne "\033]0;$$ $PROMPT_EVALED $1\007"
|
||||||
|
}
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
users.defaultUserShell = "/run/current-system/sw/bin/zsh";
|
||||||
|
}
|
|
@ -8,6 +8,7 @@ with import <stockholm/lib>;
|
||||||
krebs.go = {
|
krebs.go = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
networking.firewall.allowedTCPPorts = [ 80 ];
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts.go = {
|
virtualHosts.go = {
|
||||||
|
|
|
@ -14,7 +14,6 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ];
|
kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ];
|
||||||
extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
|
|
||||||
kernelParams = [ "acpi_backlight=none" ];
|
kernelParams = [ "acpi_backlight=none" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
64
krebs/5pkgs/simple/exim/default.nix
Normal file
64
krebs/5pkgs/simple/exim/default.nix
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "exim-4.90.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
|
||||||
|
sha256 = "09ppq8l7cah6dcqwdvpa6r12i6fdcd9lvxlfp18mggj3438xz62w";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
buildInputs = [ coreutils db openssl pcre perl ];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
sed '
|
||||||
|
s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin:
|
||||||
|
s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf:
|
||||||
|
s:^\(EXIM_USER\)=.*:\1=ref\:nobody:
|
||||||
|
s:^\(SPOOL_DIRECTORY\)=.*:\1=/exim-homeless-shelter:
|
||||||
|
s:^# \(SUPPORT_MAILDIR\)=.*:\1=yes:
|
||||||
|
s:^EXIM_MONITOR=.*$:# &:
|
||||||
|
s:^\(FIXED_NEVER_USERS\)=root$:\1=0:
|
||||||
|
s:^# \(WITH_CONTENT_SCAN\)=.*:\1=yes:
|
||||||
|
s:^# \(AUTH_PLAINTEXT\)=.*:\1=yes:
|
||||||
|
s:^# \(SUPPORT_TLS\)=.*:\1=yes:
|
||||||
|
s:^# \(USE_OPENSSL_PC=openssl\)$:\1:
|
||||||
|
s:^# \(LOG_FILE_PATH=syslog\)$:\1:
|
||||||
|
s:^# \(HAVE_IPV6=yes\)$:\1:
|
||||||
|
s:^# \(CHOWN_COMMAND\)=.*:\1=${coreutils}/bin/chown:
|
||||||
|
s:^# \(CHGRP_COMMAND\)=.*:\1=${coreutils}/bin/chgrp:
|
||||||
|
s:^# \(CHMOD_COMMAND\)=.*:\1=${coreutils}/bin/chmod:
|
||||||
|
s:^# \(MV_COMMAND\)=.*:\1=${coreutils}/bin/mv:
|
||||||
|
s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm:
|
||||||
|
s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch:
|
||||||
|
s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl:
|
||||||
|
#/^\s*#.*/d
|
||||||
|
#/^\s*$/d
|
||||||
|
' < src/EDITME > Local/Makefile
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin $out/share/man/man8
|
||||||
|
cp doc/exim.8 $out/share/man/man8
|
||||||
|
|
||||||
|
( cd build-Linux-*
|
||||||
|
cp exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb \
|
||||||
|
exipick exiqsumm exigrep exim_dbmbuild exim exim_fixdb eximstats \
|
||||||
|
exinext exiqgrep exiwhat \
|
||||||
|
$out/bin )
|
||||||
|
|
||||||
|
( cd $out/bin
|
||||||
|
for i in mailq newaliases rmail rsmtp runq sendmail; do
|
||||||
|
ln -s exim $i
|
||||||
|
done )
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://exim.org/;
|
||||||
|
description = "A mail transfer agent (MTA)";
|
||||||
|
license = stdenv.lib.licenses.gpl3;
|
||||||
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.tv ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, makeDesktopItem
|
{ stdenv, fetchurl
|
||||||
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
|
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
|
||||||
, openjdk
|
, openjdk
|
||||||
, mesa, openal
|
, mesa, openal
|
||||||
|
@ -7,23 +7,12 @@ with stdenv.lib;
|
||||||
|
|
||||||
assert useAlsa -> alsaOss != null;
|
assert useAlsa -> alsaOss != null;
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation {
|
||||||
desktopItem = makeDesktopItem {
|
|
||||||
name = "minecraft";
|
|
||||||
exec = "minecraft";
|
|
||||||
icon = "minecraft";
|
|
||||||
comment = "A sandbox-building game";
|
|
||||||
desktopName = "Minecraft";
|
|
||||||
genericName = "minecraft";
|
|
||||||
categories = "Game;";
|
|
||||||
};
|
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
name = "ftb";
|
name = "ftb";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftb.cursecdn.com/FTB2/launcher/FTB_Launcher.jar";
|
url = "http://ftb.cursecdn.com/FTB2/launcher/FTB_Launcher.jar";
|
||||||
sha256 = "10ga4jgyfsj5dy4rj2rla0fpnfpnxv8r3bmxpqpwn7fsry4il79v";
|
sha256 = "0pyh83hhni97ryvz6yy8lyiagjrlx67cwr780s2bja92rxc1sqpj";
|
||||||
};
|
};
|
||||||
|
|
||||||
phases = "installPhase";
|
phases = "installPhase";
|
||||||
|
@ -36,6 +25,7 @@ in stdenv.mkDerivation {
|
||||||
cat > $out/bin/ftb << EOF
|
cat > $out/bin/ftb << EOF
|
||||||
#!${stdenv.shell}
|
#!${stdenv.shell}
|
||||||
|
|
||||||
|
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]}
|
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]}
|
||||||
${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
|
${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
|
||||||
${jre}/bin/java -jar $out/ftb.jar
|
${jre}/bin/java -jar $out/ftb.jar
|
||||||
|
@ -43,9 +33,6 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
chmod +x $out/bin/ftb
|
chmod +x $out/bin/ftb
|
||||||
|
|
||||||
mkdir -p $out/share/applications
|
|
||||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
|
||||||
|
|
||||||
${openjdk}/bin/jar xf $out/ftb.jar favicon.png
|
${openjdk}/bin/jar xf $out/ftb.jar favicon.png
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 = "b222a0713f4a689519686421b3fbf5ca0c9bd3da"; # nixos-17.09 @ 2018-01-23
|
ref = "2062ac5aa2dc0770322272e3d2b647cf431dd893"; # nixos-17.09 @ 2018-02-09
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
override
|
override
|
||||||
|
|
|
@ -19,7 +19,7 @@ let
|
||||||
# __FRONT_
|
# __FRONT_
|
||||||
# |* d0 |
|
# |* d0 |
|
||||||
# | |
|
# | |
|
||||||
# |* d3 |
|
# |* d1 |
|
||||||
# | |
|
# | |
|
||||||
# |* d3 |
|
# |* d3 |
|
||||||
# | |
|
# | |
|
||||||
|
@ -68,6 +68,7 @@ in {
|
||||||
<stockholm/makefu/2configs/syncthing.nix>
|
<stockholm/makefu/2configs/syncthing.nix>
|
||||||
<stockholm/makefu/2configs/mqtt.nix>
|
<stockholm/makefu/2configs/mqtt.nix>
|
||||||
<stockholm/makefu/2configs/remote-build/slave.nix>
|
<stockholm/makefu/2configs/remote-build/slave.nix>
|
||||||
|
<stockholm/makefu/2configs/deployment/google-muell.nix>
|
||||||
|
|
||||||
|
|
||||||
# security
|
# security
|
||||||
|
|
|
@ -18,7 +18,7 @@ in {
|
||||||
<stockholm/makefu/2configs/virtualisation/libvirt.nix>
|
<stockholm/makefu/2configs/virtualisation/libvirt.nix>
|
||||||
<stockholm/makefu/2configs/tinc/retiolum.nix>
|
<stockholm/makefu/2configs/tinc/retiolum.nix>
|
||||||
<stockholm/makefu/2configs/mqtt.nix>
|
<stockholm/makefu/2configs/mqtt.nix>
|
||||||
# <stockholm/makefu/2configs/gui/wbob-kiosk.nix>
|
<stockholm/makefu/2configs/gui/wbob-kiosk.nix>
|
||||||
|
|
||||||
<stockholm/makefu/2configs/stats/client.nix>
|
<stockholm/makefu/2configs/stats/client.nix>
|
||||||
|
|
||||||
|
@ -31,6 +31,63 @@ in {
|
||||||
# Services
|
# Services
|
||||||
<stockholm/makefu/2configs/remote-build/slave.nix>
|
<stockholm/makefu/2configs/remote-build/slave.nix>
|
||||||
<stockholm/makefu/2configs/share/wbob.nix>
|
<stockholm/makefu/2configs/share/wbob.nix>
|
||||||
|
(let
|
||||||
|
musicDirectory = "/data/music";
|
||||||
|
in {
|
||||||
|
services.mpd = {
|
||||||
|
enable = true;
|
||||||
|
inherit musicDirectory;
|
||||||
|
# dataDir = "/home/anders/.mpd";
|
||||||
|
network.listenAddress = "any";
|
||||||
|
extraConfig = ''
|
||||||
|
audio_output {
|
||||||
|
type "pulse"
|
||||||
|
name "Local MPD"
|
||||||
|
server "127.0.0.1"
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
# open because of truestedInterfaces
|
||||||
|
# networking.firewall.allowedTCPPorts = [ 6600 4713 ];
|
||||||
|
services.samba.shares.music = {
|
||||||
|
path = musicDirectory;
|
||||||
|
"read only" = "no";
|
||||||
|
browseable = "yes";
|
||||||
|
"guest ok" = "yes";
|
||||||
|
};
|
||||||
|
|
||||||
|
sound.enable = true;
|
||||||
|
hardware.pulseaudio = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.pulseaudioFull;
|
||||||
|
# systemWide = true;
|
||||||
|
support32Bit = true;
|
||||||
|
zeroconf.discovery.enable = true;
|
||||||
|
zeroconf.publish.enable = true;
|
||||||
|
tcp = {
|
||||||
|
enable = true;
|
||||||
|
anonymousClients.allowAll = true;
|
||||||
|
anonymousClients.allowedIpRanges = [ "127.0.0.1" "192.168.8.0/24" ];
|
||||||
|
};
|
||||||
|
configFile = pkgs.writeText "default.pa" ''
|
||||||
|
load-module module-udev-detect
|
||||||
|
load-module module-bluetooth-policy
|
||||||
|
load-module module-bluetooth-discover
|
||||||
|
load-module module-native-protocol-unix
|
||||||
|
load-module module-always-sink
|
||||||
|
load-module module-console-kit
|
||||||
|
load-module module-systemd-login
|
||||||
|
load-module module-intended-roles
|
||||||
|
load-module module-position-event-sounds
|
||||||
|
load-module module-filter-heuristics
|
||||||
|
load-module module-filter-apply
|
||||||
|
load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1
|
||||||
|
load-module module-switch-on-connect
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
# connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
})
|
||||||
|
|
||||||
# Sensors
|
# Sensors
|
||||||
<stockholm/makefu/2configs/stats/telegraf>
|
<stockholm/makefu/2configs/stats/telegraf>
|
||||||
|
@ -147,7 +204,10 @@ in {
|
||||||
boot.loader.grub.device = rootdisk;
|
boot.loader.grub.device = rootdisk;
|
||||||
hardware.cpu.intel.updateMicrocode = true;
|
hardware.cpu.intel.updateMicrocode = true;
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
|
boot.kernelModules = [ "kvm-intel"
|
||||||
|
"snd-seq" "snd-rawmidi"
|
||||||
|
];
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
device = rootdisk + "-part1";
|
device = rootdisk + "-part1";
|
||||||
|
@ -174,66 +234,4 @@ in {
|
||||||
serverAddress = "x.r";
|
serverAddress = "x.r";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
security.wrappers.fping = {
|
|
||||||
source = "${pkgs.fping}/bin/fping";
|
|
||||||
setuid = true;
|
|
||||||
};
|
|
||||||
services.smokeping = {
|
|
||||||
enable = true;
|
|
||||||
targetConfig = ''
|
|
||||||
probe = FPing
|
|
||||||
menu = Top
|
|
||||||
title = Network Latency Grapher
|
|
||||||
remark = Welcome to this SmokePing website.
|
|
||||||
|
|
||||||
+ network
|
|
||||||
menu = Net latency
|
|
||||||
title = Network latency (ICMP pings)
|
|
||||||
|
|
||||||
++ google
|
|
||||||
probe = FPing
|
|
||||||
host = google.de
|
|
||||||
++ webde
|
|
||||||
probe = FPing
|
|
||||||
host = web.de
|
|
||||||
|
|
||||||
+ services
|
|
||||||
menu = Service latency
|
|
||||||
title = Service latency (DNS, HTTP)
|
|
||||||
|
|
||||||
++ HTTP
|
|
||||||
menu = HTTP latency
|
|
||||||
title = Service latency (HTTP)
|
|
||||||
|
|
||||||
+++ webdeping
|
|
||||||
probe = EchoPingHttp
|
|
||||||
host = web.de
|
|
||||||
|
|
||||||
+++ googwebping
|
|
||||||
probe = EchoPingHttp
|
|
||||||
host = google.de
|
|
||||||
|
|
||||||
#+++ webwww
|
|
||||||
#probe = Curl
|
|
||||||
#host = web.de
|
|
||||||
|
|
||||||
#+++ googwebwww
|
|
||||||
#probe = Curl
|
|
||||||
#host = google.de
|
|
||||||
'';
|
|
||||||
probeConfig = ''
|
|
||||||
+ FPing
|
|
||||||
binary = /run/wrappers/bin/fping
|
|
||||||
+ EchoPingHttp
|
|
||||||
pings = 5
|
|
||||||
url = /
|
|
||||||
|
|
||||||
#+ Curl
|
|
||||||
## probe-specific variables
|
|
||||||
#binary = ${pkgs.curl}/bin/curl
|
|
||||||
#step = 60
|
|
||||||
## a default for this target-specific variable
|
|
||||||
#urlformat = http://%host%/
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,8 +59,9 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
# Hardware
|
# Hardware
|
||||||
<stockholm/makefu/2configs/hw/tp-x230.nix>
|
<stockholm/makefu/2configs/hw/tp-x230.nix>
|
||||||
|
# <stockholm/makefu/2configs/hw/tpm.nix>
|
||||||
<stockholm/makefu/2configs/hw/rtl8812au.nix>
|
<stockholm/makefu/2configs/hw/rtl8812au.nix>
|
||||||
<stockholm/makefu/2configs/hw/wwan.nix>
|
<stockholm/makefu/2configs/hw/network-manager.nix>
|
||||||
<stockholm/makefu/2configs/hw/stk1160.nix>
|
<stockholm/makefu/2configs/hw/stk1160.nix>
|
||||||
# <stockholm/makefu/2configs/rad1o.nix>
|
# <stockholm/makefu/2configs/rad1o.nix>
|
||||||
|
|
||||||
|
@ -82,13 +83,9 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
makefu.server.primary-itf = "wlp3s0";
|
makefu.server.primary-itf = "wlp3s0";
|
||||||
makefu.full-populate = true;
|
makefu.full-populate = true;
|
||||||
makefu.umts.apn = "web.vodafone.de";
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.passwdqc-utils ];
|
|
||||||
|
|
||||||
|
|
||||||
# configure pulseAudio to provide a HDMI sink as well
|
# configure pulseAudio to provide a HDMI sink as well
|
||||||
networking.firewall.enable = true;
|
networking.firewall.enable = true;
|
||||||
networking.firewall.allowedTCPPorts = [ 80 24800 26061 8000 3000 ];
|
networking.firewall.allowedTCPPorts = [ 80 24800 26061 8000 3000 ];
|
||||||
|
@ -100,8 +97,15 @@ with import <stockholm/lib>;
|
||||||
krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];
|
krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];
|
||||||
|
|
||||||
networking.extraHosts = ''
|
networking.extraHosts = ''
|
||||||
192.168.1.11 omo.local
|
192.168.1.11 omo.local
|
||||||
'';
|
'';
|
||||||
# hard dependency because otherwise the device will not be unlocked
|
# hard dependency because otherwise the device will not be unlocked
|
||||||
boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
|
boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
|
||||||
|
|
||||||
|
nix.package = pkgs.nixUnstable;
|
||||||
|
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ];
|
||||||
|
nixpkgs.overlays = [ (import <python/overlay.nix>) ];
|
||||||
|
|
||||||
|
# environment.variables = { GOROOT = [ "${pkgs.go.out}/share/go" ]; };
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
34
makefu/2configs/deployment/google-muell.nix
Normal file
34
makefu/2configs/deployment/google-muell.nix
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
{ config, lib, pkgs, buildPythonPackage, ... }:
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
let
|
||||||
|
pkg = pkgs.ampel;
|
||||||
|
home = "/var/lib/ampel";
|
||||||
|
sec = "${toString <secrets>}/google-muell.json";
|
||||||
|
ampelsec = "${home}/google-muell.json";
|
||||||
|
esp = "192.168.1.23";
|
||||||
|
sleepval = "1800";
|
||||||
|
in {
|
||||||
|
users.users.ampel = {
|
||||||
|
uid = genid "ampel";
|
||||||
|
createHome = true;
|
||||||
|
isSystemUser = true;
|
||||||
|
inherit home;
|
||||||
|
};
|
||||||
|
systemd.services.google-muell-ampel = {
|
||||||
|
description = "Send led change to rgb cubes";
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
User = "ampel";
|
||||||
|
ExecStartPre = pkgs.writeDash "copy-ampel-secrets" ''
|
||||||
|
cp ${sec} ${ampelsec}
|
||||||
|
chown ampel ${ampelsec}
|
||||||
|
'';
|
||||||
|
ExecStart = "${pkg}/bin/google-muell --esp=${esp} --client-secrets=${ampelsec} --credential-path=${home}/google-muell-creds.json --sleepval=${sleepval}";
|
||||||
|
PermissionsStartOnly = true;
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = 10;
|
||||||
|
PrivateTmp = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,25 +2,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
mq = "192.168.8.11";
|
mq = "192.168.8.11";
|
||||||
|
pkg = pkgs.ampel;
|
||||||
pkg = pkgs.python3Packages.buildPythonPackage {
|
|
||||||
name = "ampel-master";
|
|
||||||
|
|
||||||
src = pkgs.fetchgit {
|
|
||||||
url = "http://cgit.euer.krebsco.de/ampel";
|
|
||||||
rev = "531741b";
|
|
||||||
sha256 = "110yij53jz074zbswylbzcd8jy7z49r9fg6i3j1gk2y3vl91g81c";
|
|
||||||
};
|
|
||||||
propagatedBuildInputs = with pkgs.python3Packages; [
|
|
||||||
docopt
|
|
||||||
paho-mqtt
|
|
||||||
requests
|
|
||||||
pytz
|
|
||||||
influxdb
|
|
||||||
httplib2
|
|
||||||
google_api_python_client
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
systemd.services.led-fader = {
|
systemd.services.led-fader = {
|
||||||
description = "Send led change to message queue";
|
description = "Send led change to message queue";
|
||||||
|
|
|
@ -48,13 +48,14 @@ in
|
||||||
fonts = [ pkgs.terminus_font ];
|
fonts = [ pkgs.terminus_font ];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs;[
|
users.users.${mainUser} = {
|
||||||
pavucontrol
|
extraGroups = [ "audio" ];
|
||||||
xlockmore
|
packages = with pkgs;[
|
||||||
rxvt_unicode-with-plugins
|
pavucontrol
|
||||||
firefox
|
xlockmore
|
||||||
];
|
rxvt_unicode-with-plugins
|
||||||
users.extraUsers.${mainUser}.extraGroups = [ "audio" ];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
hardware.pulseaudio = {
|
hardware.pulseaudio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
{ lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./base.nix
|
./base.nix
|
||||||
];
|
];
|
||||||
|
users.users.makefu.packages = [ pkgs.chromium ];
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
layout = lib.mkForce "de";
|
layout = lib.mkForce "de";
|
||||||
|
xkbVariant = lib.mkForce "";
|
||||||
|
|
||||||
windowManager = lib.mkForce {
|
windowManager = lib.mkForce {
|
||||||
awesome.enable = false;
|
awesome.enable = false;
|
||||||
|
@ -16,7 +18,7 @@
|
||||||
# xrandrHeads = [ "HDMI1" "HDMI2" ];
|
# xrandrHeads = [ "HDMI1" "HDMI2" ];
|
||||||
# prevent screen from turning off, disable dpms
|
# prevent screen from turning off, disable dpms
|
||||||
displayManager.sessionCommands = ''
|
displayManager.sessionCommands = ''
|
||||||
xset s off -dpms
|
xset -display :0 s off -dpms
|
||||||
xrandr --output HDMI2 --right-of HDMI1
|
xrandr --output HDMI2 --right-of HDMI1
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
37
makefu/2configs/hw/network-manager.nix
Normal file
37
makefu/2configs/hw/network-manager.nix
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
users.users.makefu = {
|
||||||
|
extraGroups = [ "networkmanager" ];
|
||||||
|
packages = with pkgs;[
|
||||||
|
networkmanagerapplet
|
||||||
|
gnome3.gnome_keyring gnome3.dconf
|
||||||
|
];
|
||||||
|
};
|
||||||
|
networking.wireless.enable = lib.mkForce false;
|
||||||
|
|
||||||
|
systemd.services.modemmanager = {
|
||||||
|
description = "ModemManager";
|
||||||
|
after = [ "network-manager.service" ];
|
||||||
|
bindsTo = [ "network-manager.service" ];
|
||||||
|
wantedBy = [ "network-manager.service" ];
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${pkgs.modemmanager}/bin/ModemManager";
|
||||||
|
PrivateTmp = true;
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "5";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
|
# TODO: put somewhere else
|
||||||
|
services.xserver.displayManager.sessionCommands = ''
|
||||||
|
${pkgs.clipit}/bin/clipit &
|
||||||
|
${pkgs.networkmanagerapplet}/bin/nm-applet &
|
||||||
|
'';
|
||||||
|
|
||||||
|
# nixOSUnstable
|
||||||
|
# networking.networkmanager.wifi = {
|
||||||
|
# powersave = true;
|
||||||
|
# scanRandMacAddress = true;
|
||||||
|
# };
|
||||||
|
}
|
|
@ -1,8 +0,0 @@
|
||||||
_:
|
|
||||||
|
|
||||||
{
|
|
||||||
makefu.umts = {
|
|
||||||
enable = true;
|
|
||||||
modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -14,8 +14,6 @@ _:
|
||||||
./snapraid.nix
|
./snapraid.nix
|
||||||
./torrent.nix
|
./torrent.nix
|
||||||
./udpt.nix
|
./udpt.nix
|
||||||
./umts.nix
|
|
||||||
./wvdial.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,84 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with import <stockholm/lib>;
|
|
||||||
|
|
||||||
let
|
|
||||||
nixpkgs-1509 = import (pkgs.fetchFromGitHub {
|
|
||||||
owner = "NixOS"; repo = "nixpkgs-channels";
|
|
||||||
rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
|
|
||||||
sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
|
|
||||||
}) {};
|
|
||||||
|
|
||||||
wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113
|
|
||||||
|
|
||||||
# TODO: currently it is only netzclub
|
|
||||||
umts-bin = pkgs.writeScriptBin "umts" ''
|
|
||||||
#!/bin/sh
|
|
||||||
set -euf
|
|
||||||
systemctl start umts
|
|
||||||
trap "systemctl stop umts;trap - INT TERM EXIT;exit" INT TERM EXIT
|
|
||||||
echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf
|
|
||||||
journalctl -xfu umts
|
|
||||||
'';
|
|
||||||
|
|
||||||
wvdial-defaults = ''
|
|
||||||
Phone = *99***1#
|
|
||||||
Dial Command = ATDT
|
|
||||||
Modem = ${cfg.modem-device}
|
|
||||||
Baud = 460800
|
|
||||||
Init1 = AT+CGDCONT=1,"IP","${config.makefu.umts.apn}","",0,0
|
|
||||||
Init2 = ATZ
|
|
||||||
Init3 = ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0
|
|
||||||
ISDN = 0
|
|
||||||
Modem Type = Analog Modem
|
|
||||||
Username = netzclub
|
|
||||||
Password = netzclub
|
|
||||||
Stupid Mode = 1
|
|
||||||
Idle Seconds = 0'';
|
|
||||||
|
|
||||||
cfg = config.makefu.umts;
|
|
||||||
|
|
||||||
out = {
|
|
||||||
options.makefu.umts = api;
|
|
||||||
config = lib.mkIf cfg.enable imp;
|
|
||||||
};
|
|
||||||
|
|
||||||
api = {
|
|
||||||
enable = mkEnableOption "umts";
|
|
||||||
|
|
||||||
modem-device = mkOption {
|
|
||||||
default = "/dev/ttyUSB0";
|
|
||||||
type = types.str;
|
|
||||||
description = ''
|
|
||||||
path to modem device, use <filename>/dev/serial/by-id/...</filename>
|
|
||||||
to avoid race conditions.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
apn = mkOption {
|
|
||||||
default = "pinternet.interkom.de";
|
|
||||||
type = types.str;
|
|
||||||
description = ''
|
|
||||||
apn to use for dailing
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
imp = {
|
|
||||||
environment.shellAliases = {
|
|
||||||
umts = "sudo ${umts-bin}/bin/umts";
|
|
||||||
};
|
|
||||||
environment.systemPackages = [ ];
|
|
||||||
|
|
||||||
environment.wvdial.dialerDefaults = wvdial-defaults;
|
|
||||||
|
|
||||||
systemd.services.umts = {
|
|
||||||
description = "UMTS wvdial Service";
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
ExecStart = "${wvdial}/bin/wvdial -n";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in out
|
|
|
@ -1,71 +0,0 @@
|
||||||
# Global configuration for wvdial.
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
configFile = ''
|
|
||||||
[Dialer Defaults]
|
|
||||||
PPPD PATH = ${pkgs.ppp}/sbin/pppd
|
|
||||||
${config.environment.wvdial.dialerDefaults}
|
|
||||||
'';
|
|
||||||
|
|
||||||
cfg = config.environment.wvdial;
|
|
||||||
|
|
||||||
in
|
|
||||||
{
|
|
||||||
###### interface
|
|
||||||
|
|
||||||
options = {
|
|
||||||
|
|
||||||
environment.wvdial = {
|
|
||||||
|
|
||||||
dialerDefaults = mkOption {
|
|
||||||
default = "";
|
|
||||||
type = types.str;
|
|
||||||
example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
|
|
||||||
description = ''
|
|
||||||
Contents of the "Dialer Defaults" section of
|
|
||||||
<filename>/etc/wvdial.conf</filename>.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
pppDefaults = mkOption {
|
|
||||||
default = ''
|
|
||||||
noipdefault
|
|
||||||
usepeerdns
|
|
||||||
defaultroute
|
|
||||||
persist
|
|
||||||
noauth
|
|
||||||
'';
|
|
||||||
type = types.str;
|
|
||||||
description = "Default ppp settings for wvdial.";
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
###### implementation
|
|
||||||
|
|
||||||
config = mkIf (cfg.dialerDefaults != "") {
|
|
||||||
|
|
||||||
environment = {
|
|
||||||
|
|
||||||
etc =
|
|
||||||
[
|
|
||||||
{ source = pkgs.writeText "wvdial.conf" configFile;
|
|
||||||
target = "wvdial.conf";
|
|
||||||
}
|
|
||||||
{ source = pkgs.writeText "wvdial" cfg.pppDefaults;
|
|
||||||
target = "ppp/peers/wvdial";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
27
makefu/5pkgs/ampel/default.nix
Normal file
27
makefu/5pkgs/ampel/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{ lib, pkgs, fetchFromGitHub, ... }:
|
||||||
|
|
||||||
|
with pkgs.python3Packages;buildPythonPackage rec {
|
||||||
|
name = "ampel-${version}";
|
||||||
|
version = "0.2";
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
docopt
|
||||||
|
paho-mqtt
|
||||||
|
requests
|
||||||
|
pytz
|
||||||
|
influxdb
|
||||||
|
httplib2
|
||||||
|
google_api_python_client
|
||||||
|
];
|
||||||
|
|
||||||
|
src = pkgs.fetchgit {
|
||||||
|
url = "http://cgit.euer.krebsco.de/ampel";
|
||||||
|
rev = "d8a0250";
|
||||||
|
sha256 = "0n36lc17ca5db6pl6dswdqd5w9f881rfqck9yc4w33a5qpsxj85f";
|
||||||
|
};
|
||||||
|
meta = {
|
||||||
|
homepage = http://cgit.euer.krebsco.de/ampel;
|
||||||
|
description = "change colors of rgb cubes";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
};
|
||||||
|
}
|
27
makefu/5pkgs/pfsshell/default.nix
Normal file
27
makefu/5pkgs/pfsshell/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub, upx, wine }:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "pfsshell";
|
||||||
|
version = "64f8c2";
|
||||||
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "makefu";
|
||||||
|
repo = "pfsshell";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "01lbqf8s91p8id58xa16fp555i03vfycqvhv7qzpnrjy6yvp9dm8";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ ];
|
||||||
|
|
||||||
|
makeFlags = [ ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp pfsshell $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = https://github.com/uyjulian/pfsshell ;
|
||||||
|
description = "browse and transfer files to/from PFS filesystems";
|
||||||
|
};
|
||||||
|
}
|
|
@ -13,7 +13,7 @@ let
|
||||||
then "buildbot"
|
then "buildbot"
|
||||||
else "makefu";
|
else "makefu";
|
||||||
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
|
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
|
||||||
ref = "0f19bee"; # nixos-17.09 @ 2018-01-05
|
ref = "cd36b3d"; # nixos-17.09 @ 2018-02-06
|
||||||
# + do_sqlite3 ruby: 55a952be5b5
|
# + do_sqlite3 ruby: 55a952be5b5
|
||||||
# + signal: 0f19beef3
|
# + signal: 0f19beef3
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user