gebner
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.gebner.org/gebner/nixos-config

This commit is contained in:
Gabriel Ebner 2015-07-21 21:16:07 +02:00
parent 180a97e152 f6bd4a659e
commit ca81200dce
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common.nix
View File

@ -85,15 +85,19 @@
cabal2nix cabal2nix
cabal-install cabal-install
# ghc-mod # ghc-mod
];
# emacs
emacs
ghostscript # for auctex
aspell
] ++ (with aspellDicts; [ en de fr nl ]);
nixpkgs.config.packageOverrides = pkgs: rec { nixpkgs.config.packageOverrides = pkgs: rec {
# libreoffice = pkgs.libreoffice.override { jdk = pkgs.jdk; }; # reuse package cache
jre = pkgs.openjdk8;
jdk = pkgs.openjdk8;
i3 = pkgs.stdenv.lib.overrideDerivation pkgs.i3 (oldAttrs: { doCheck = false; }); i3 = pkgs.stdenv.lib.overrideDerivation pkgs.i3 (oldAttrs: { doCheck = false; });
}; };
nixpkgs.config.allowTexliveBuilds = true;
environment.variables.EDITOR = "${pkgs.vim}/bin/vim"; environment.variables.EDITOR = "${pkgs.vim}/bin/vim";
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.

1
i3.nix
View File

@ -50,6 +50,7 @@
name = "i3wm"; name = "i3wm";
start = '' start = ''
export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
export XDG_CURRENT_DESKTOP=GNOME
${pkgs.gnome3.gnome_settings_daemon}/libexec/gnome-settings-daemon-localeexec & ${pkgs.gnome3.gnome_settings_daemon}/libexec/gnome-settings-daemon-localeexec &
${pkgs.i3}/bin/i3 & ${pkgs.i3}/bin/i3 &
waitPID=$! waitPID=$!

9
pkgs/yourkit.nix
View File

@ -1,19 +1,20 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yjp-${version}"; name = "yjp-${version}";
version = "2015-build-15056"; version = "2015-build-15062";
src = fetchzip { src = fetchzip {
url = https://www.yourkit.com/download/yjp-2015-build-15056.zip; url = "https://www.yourkit.com/download/${name}.zip";
sha256 = "0y3d3fs91w0qbdvbm4nr02rmkbqmndl7j4rhxwzibs815ci659jn"; sha256 = "0dwfha6vid4nq21zm74v248yr83wpjfs1dd7ga8gykbs4insp66q";
}; };
buildInputs = [ unzip makeWrapper ]; nativeBuildInputs = [ unzip makeWrapper patchelf ];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp -ra ./ $out/yjp cp -ra ./ $out/yjp
chmod +x $out/yjp/bin/*/yjp_dc chmod +x $out/yjp/bin/*/yjp_dc
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/yjp/bin/linux-x86-64/yjp_dc
makeWrapper $out/yjp/bin/yjp.sh $out/bin/yjp \ makeWrapper $out/yjp/bin/yjp.sh $out/bin/yjp \
--prefix PATH : ${jdk} --prefix PATH : ${jdk}
''; '';

2
theba.nix
View File

@ -37,6 +37,6 @@
networking.hostName = "theba"; # Define your hostname. networking.hostName = "theba"; # Define your hostname.
networking.hostId = "b29b900f"; networking.hostId = "b29b900f";
services.colord.enable = true; # services.colord.enable = true;
} }