Merge branch 'master' of prism:stockholm
This commit is contained in:
commit
fac9f4d2a0
@ -42,6 +42,13 @@
|
|||||||
|
|
||||||
# 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
|
||||||
|
environment.shellAliases = {
|
||||||
|
n = "nix-shell";
|
||||||
|
stocki = pkgs.writeDash "deploy" ''
|
||||||
|
cd ~/stockholm
|
||||||
|
exec nix-shell -I stockholm="$PWD" --run 'deploy --system="bolide"'
|
||||||
|
'';
|
||||||
|
};
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wget vim
|
wget vim
|
||||||
@ -75,6 +82,7 @@
|
|||||||
golint
|
golint
|
||||||
gotools
|
gotools
|
||||||
# dev tools
|
# dev tools
|
||||||
|
elmPackages.elm
|
||||||
gnumake
|
gnumake
|
||||||
jetbrains.pycharm-professional
|
jetbrains.pycharm-professional
|
||||||
jetbrains.webstorm
|
jetbrains.webstorm
|
||||||
|
@ -20,6 +20,7 @@ let
|
|||||||
sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
|
sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.vim_configurable.customize {
|
(pkgs.vim_configurable.customize {
|
||||||
@ -65,11 +66,17 @@ in {
|
|||||||
let g:molokai_original = 1
|
let g:molokai_original = 1
|
||||||
let g:rehash256 = 1
|
let g:rehash256 = 1
|
||||||
'';
|
'';
|
||||||
|
settingsForElm = ''
|
||||||
|
let g:polyglot_disabled = ['elm']
|
||||||
|
let g:elm_detailed_complete = 1
|
||||||
|
let g:elm_format_autosave = 1
|
||||||
|
let g:elm_syntastic_show_warnings = 1
|
||||||
|
'';
|
||||||
in ''
|
in ''
|
||||||
${colorscheme}
|
${colorscheme}
|
||||||
${remapStatements}
|
${remapStatements}
|
||||||
${setStatements}
|
${setStatements}
|
||||||
|
${settingsForElm}
|
||||||
${settingsForGo}
|
${settingsForGo}
|
||||||
" I dont know what this line is about
|
" I dont know what this line is about
|
||||||
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
|
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
|
||||||
@ -85,6 +92,7 @@ in {
|
|||||||
"surround"
|
"surround"
|
||||||
"Syntastic"
|
"Syntastic"
|
||||||
"undotree"
|
"undotree"
|
||||||
|
"elm-vim"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{ names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
|
{ names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
|
||||||
|
@ -81,6 +81,9 @@ prepare_debian() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
prepare_nixos_iso() {
|
prepare_nixos_iso() {
|
||||||
|
_which() (
|
||||||
|
type -p "$1"
|
||||||
|
)
|
||||||
mountpoint /mnt
|
mountpoint /mnt
|
||||||
|
|
||||||
type git 2>/dev/null || nix-env -iA nixos.git
|
type git 2>/dev/null || nix-env -iA nixos.git
|
||||||
|
51
krebs/5pkgs/simple/ftb/default.nix
Normal file
51
krebs/5pkgs/simple/ftb/default.nix
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
{ stdenv, fetchurl, makeDesktopItem
|
||||||
|
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
|
||||||
|
, openjdk
|
||||||
|
, mesa, openal
|
||||||
|
, useAlsa ? false, alsaOss ? null }:
|
||||||
|
with stdenv.lib;
|
||||||
|
|
||||||
|
assert useAlsa -> alsaOss != null;
|
||||||
|
|
||||||
|
let
|
||||||
|
desktopItem = makeDesktopItem {
|
||||||
|
name = "minecraft";
|
||||||
|
exec = "minecraft";
|
||||||
|
icon = "minecraft";
|
||||||
|
comment = "A sandbox-building game";
|
||||||
|
desktopName = "Minecraft";
|
||||||
|
genericName = "minecraft";
|
||||||
|
categories = "Game;";
|
||||||
|
};
|
||||||
|
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "ftb";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://ftb.cursecdn.com/FTB2/launcher/FTB_Launcher.jar";
|
||||||
|
sha256 = "10ga4jgyfsj5dy4rj2rla0fpnfpnxv8r3bmxpqpwn7fsry4il79v";
|
||||||
|
};
|
||||||
|
|
||||||
|
phases = "installPhase";
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
set -x
|
||||||
|
mkdir -pv $out/bin
|
||||||
|
cp -v $src $out/ftb.jar
|
||||||
|
|
||||||
|
cat > $out/bin/ftb << EOF
|
||||||
|
#!${stdenv.shell}
|
||||||
|
|
||||||
|
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]}
|
||||||
|
${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
|
||||||
|
${jre}/bin/java -jar $out/ftb.jar
|
||||||
|
EOF
|
||||||
|
|
||||||
|
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
|
||||||
|
'';
|
||||||
|
}
|
@ -73,6 +73,10 @@ in {
|
|||||||
extraGroups = [ "audio" "video" "input" "loot" ];
|
extraGroups = [ "audio" "video" "input" "loot" ];
|
||||||
createHome = true;
|
createHome = true;
|
||||||
useDefaultShell = true;
|
useDefaultShell = true;
|
||||||
|
packages = with pkgs; [
|
||||||
|
ftb
|
||||||
|
minecraft
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -136,6 +136,5 @@
|
|||||||
};
|
};
|
||||||
environment.shellAliases.ns = "nix-shell --command zsh";
|
environment.shellAliases.ns = "nix-shell --command zsh";
|
||||||
|
|
||||||
users.users.mainUser.shell = "/run/current-system/sw/bin/zsh";
|
users.defaultUserShell = "/run/current-system/sw/bin/zsh";
|
||||||
users.users.root.shell = "/run/current-system/sw/bin/zsh";
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user