add userspace auto-update
parent
a4915a7956
commit
4d5b5b503b
|
@ -0,0 +1,3 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
sudo nix-channel --update
|
||||||
|
nix-env -iA nixos.hosts.$(hostname -s)
|
|
@ -1,2 +1,3 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env nix-shell
|
||||||
stow nix git x pentadactyl
|
#!nix-shell -i bash -p stow
|
||||||
|
stow -d `dirname $0` nix git x pentadactyl
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
enableAdobeFlash = true;
|
enableAdobeFlash = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
chromium = {
|
# chromium = {
|
||||||
enablePepperFlash = true;
|
# enablePepperFlash = true;
|
||||||
enablePepperPDF = true;
|
# enablePepperPDF = true;
|
||||||
};
|
# };
|
||||||
|
|
||||||
packageOverrides = pkgs: with pkgs;
|
packageOverrides = pkgs: with pkgs;
|
||||||
let
|
let
|
||||||
mkEnv = name: paths: pkgs.buildEnv { inherit name paths; };
|
mkEnv = name: paths: pkgs.buildEnv { inherit name paths; };
|
||||||
py3 = python35Packages; hs = haskellPackages; js = nodePackages; ml = ocamlPackages;
|
py3 = python35Packages; hs = haskellPackages; js = nodePackages; ml = ocamlPackages;
|
||||||
py2 = python27Packages; emc = emacsPackages; emcn = emacsPackagesNg;
|
py2 = python27Packages; emc = emacsPackages; emcn = emacsPackagesNg; elm = elmPackages;
|
||||||
in rec {
|
in rec {
|
||||||
org = pkgs.emacsPackages.org.overrideDerivation (attrs: {
|
org = pkgs.emacsPackages.org.overrideDerivation (attrs: {
|
||||||
nativeBuildInputs = [emacs texinfo tetex]; });
|
nativeBuildInputs = [emacs texinfo tetex]; });
|
||||||
|
@ -25,26 +25,16 @@
|
||||||
|
|
||||||
ftb = pkgs.callPackage ./ftb.nix {};
|
ftb = pkgs.callPackage ./ftb.nix {};
|
||||||
|
|
||||||
spotify = pkgs.spotify.overrideDerivation (attrs: let
|
|
||||||
version = "1.0.28.89.gf959d4ce-37"; in {
|
|
||||||
name = "spotify-${version}";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
|
|
||||||
sha256 = "06v6fmjn0zi1riqhbmwkrq4m1q1vs95p348i8c12hqvsrp0g2qy5";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
envs = recurseIntoAttrs {
|
envs = recurseIntoAttrs {
|
||||||
|
|
||||||
de = mkEnv "y-de-deps" [
|
de = mkEnv "y-de-deps" [
|
||||||
awesome
|
|
||||||
compton-git
|
|
||||||
hs.yeganesh dmenu
|
|
||||||
gtk-engine-murrine
|
gtk-engine-murrine
|
||||||
i3lock
|
hicolor_icon_theme
|
||||||
|
arc-gtk-theme
|
||||||
|
libnotify
|
||||||
scrot byzanz xclip
|
scrot byzanz xclip
|
||||||
rxvt_unicode-with-plugins
|
#rxvt_unicode-with-plugins
|
||||||
arandr
|
arandr
|
||||||
xorg.xrandr
|
xorg.xrandr
|
||||||
feh
|
feh
|
||||||
|
@ -54,26 +44,24 @@
|
||||||
gajim
|
gajim
|
||||||
mutt
|
mutt
|
||||||
torbrowser
|
torbrowser
|
||||||
# chromium
|
chromium
|
||||||
firefox-bin
|
firefox-bin
|
||||||
gimp
|
gimp
|
||||||
hexchat
|
#hexchat
|
||||||
#inkscape
|
#inkscape
|
||||||
keepassx
|
keepassx
|
||||||
# libreoffice
|
# libreoffice
|
||||||
(builtins.storePath /nix/store/g6v35jgh2ik8fq9bjh4yac36aj8bd1h5-skype-4.3.0.37)
|
skype
|
||||||
# skype
|
|
||||||
spotify
|
spotify
|
||||||
kde4.quasselClientWithoutKDE
|
kde4.quasselClientWithoutKDE
|
||||||
sublime3
|
sublime3
|
||||||
leafpad
|
leafpad
|
||||||
calibre
|
calibre
|
||||||
py2.plover
|
#py2.plover
|
||||||
wireshark meld
|
wireshark meld
|
||||||
];
|
];
|
||||||
|
|
||||||
media = mkEnv "y-media" [
|
media = mkEnv "y-media" [
|
||||||
js.peerflix
|
|
||||||
py3.livestreamer
|
py3.livestreamer
|
||||||
py3.youtube-dl
|
py3.youtube-dl
|
||||||
mpv
|
mpv
|
||||||
|
@ -81,7 +69,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
coins = mkEnv "y-coins" [
|
coins = mkEnv "y-coins" [
|
||||||
altcoins.namecoin
|
# altcoins.namecoin
|
||||||
# altcoins.dogecoin
|
# altcoins.dogecoin
|
||||||
electrum
|
electrum
|
||||||
];
|
];
|
||||||
|
@ -94,23 +82,28 @@
|
||||||
valgrind cdecl gdb ltrace cmake # gcc
|
valgrind cdecl gdb ltrace cmake # gcc
|
||||||
];
|
];
|
||||||
misc = mkEnv "y-misc" [
|
misc = mkEnv "y-misc" [
|
||||||
gitAndTools.git-annex
|
#gitAndTools.git-annex # doesn't build
|
||||||
gnupg1 man-pages bup catdoc
|
gnupg1 man-pages bup # catdoc
|
||||||
imagemagick
|
imagemagick
|
||||||
openssl
|
openssl
|
||||||
sshfsFuse
|
sshfsFuse
|
||||||
sshuttle iodine stow
|
sshuttle iodine stow
|
||||||
expect
|
expect duplicity
|
||||||
|
wakelan x2x
|
||||||
];
|
];
|
||||||
|
|
||||||
emacs = mkEnv "y-emacs" [emacs org emcn.smex emc.colorThemeSolarized];
|
emacs = mkEnv "y-emacs" [emacs org emcn.smex emcn.agda2-mode emc.colorThemeSolarized];
|
||||||
|
code_min = mkEnv "y-codemin" [
|
||||||
|
python gitAndTools.hub gnumake cloc
|
||||||
|
];
|
||||||
code = mkEnv "y-code" [
|
code = mkEnv "y-code" [
|
||||||
cloc graphviz sloccount silver-searcher
|
cloc graphviz sloccount silver-searcher
|
||||||
gnumake strace stack # hs?
|
gnumake strace stack # hs?
|
||||||
|
# TODO: patch sublime3 haskell integration for stack (correct hsdev version)
|
||||||
(hiPrio python3) python dos2unix dhex
|
(hiPrio python3) python dos2unix dhex
|
||||||
|
# elm.elm # agda
|
||||||
# vcs
|
# vcs
|
||||||
gitAndTools.hub
|
gitAndTools.hub subversion
|
||||||
|
|
||||||
# db
|
# db
|
||||||
sqliteInteractive
|
sqliteInteractive
|
||||||
|
@ -120,17 +113,19 @@
|
||||||
minicom lrzsz lua
|
minicom lrzsz lua
|
||||||
];
|
];
|
||||||
|
|
||||||
java = mkEnv "y-java" [
|
java = openjdk;
|
||||||
openjdk
|
|
||||||
];
|
# java = mkEnv "y-java" [
|
||||||
|
# openjdk
|
||||||
|
# ];
|
||||||
|
|
||||||
games = mkEnv "y-games" [
|
games = mkEnv "y-games" [
|
||||||
# steam openttd wine winetricks minecraft
|
# steam openttd wine winetricks minecraft
|
||||||
openttd minecraft ftb
|
openttd # steam
|
||||||
];
|
];
|
||||||
|
|
||||||
js = mkEnv "y-jsdev" [
|
js = mkEnv "y-jsdev" [
|
||||||
js.jshint nodejs-5_x electron
|
js.jshint nodejs-6_x electron
|
||||||
];
|
];
|
||||||
|
|
||||||
pdf = mkEnv "y-pdf" [
|
pdf = mkEnv "y-pdf" [
|
||||||
|
@ -141,10 +136,10 @@
|
||||||
wmname xev xlsfonts xwininfo glxinfo
|
wmname xev xlsfonts xwininfo glxinfo
|
||||||
];
|
];
|
||||||
|
|
||||||
ndl = mkEnv "y-ndl" [
|
};
|
||||||
arduino screen
|
hosts = {
|
||||||
];
|
ascanius = with envs; [apps code_min de games envs.js pdf nix media gcc misc];
|
||||||
|
woodhouse = with envs; [de media misc kodi chromium spotify];
|
||||||
};
|
};
|
||||||
pandocdeps = (pkgs.texlive.combine {
|
pandocdeps = (pkgs.texlive.combine {
|
||||||
inherit (pkgs.texlive)
|
inherit (pkgs.texlive)
|
||||||
|
|
Loading…
Reference in New Issue