More changes
This commit is contained in:
parent
4793a68ed5
commit
c36c483ab3
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
# WARN: this file will get overwritten by $ cachix use <name>
|
# WARN: this file will get overwritten by $ cachix use <name>
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
|
|
||||||
|
@ -6,9 +5,9 @@ let
|
||||||
folder = ./cachix;
|
folder = ./cachix;
|
||||||
toImport = name: value: folder + ("/" + name);
|
toImport = name: value: folder + ("/" + name);
|
||||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
imports = lib.mapAttrsToList toImport
|
||||||
|
(lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||||
in {
|
in {
|
||||||
inherit imports;
|
inherit imports;
|
||||||
nix.binaryCaches = ["https://cache.nixos.org/"];
|
nix.binaryCaches = [ "https://cache.nixos.org/" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
let
|
rec {
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> {};
|
||||||
unstable = import <unstable> {};
|
unstable = import <unstable> {};
|
||||||
sources = import ../nix/sources.nix;
|
sources = import ../nix/sources.nix;
|
||||||
|
@ -6,6 +6,10 @@ let
|
||||||
broken = false;
|
broken = false;
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
});
|
});
|
||||||
|
shh-extras = unstable.haskell.lib.overrideCabal unstable.haskellPackages.shh-extras (drv: {
|
||||||
|
broken = false;
|
||||||
|
doCheck = false;
|
||||||
|
});
|
||||||
haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]'';
|
haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]'';
|
||||||
writeHaskellScript = { name ? "haskell-script", bins ? [pkgs.coreutils], libraries ? [], imports ? []}: code:
|
writeHaskellScript = { name ? "haskell-script", bins ? [pkgs.coreutils], libraries ? [], imports ? []}: code:
|
||||||
unstable.writers.writeHaskellBin name { libraries = libraries ++ [shh unstable.haskellPackages.string-interpolate ]; } ''
|
unstable.writers.writeHaskellBin name { libraries = libraries ++ [shh unstable.haskellPackages.string-interpolate ]; } ''
|
||||||
|
@ -46,9 +50,6 @@ let
|
||||||
nix_build ["-Q", "-E", expr, "--no-out-link"] &> devNull
|
nix_build ["-Q", "-E", expr, "--no-out-link"] &> devNull
|
||||||
nix_instantiate ["--eval", "-E", [i|toString #{expr}|]] |> trimQuotation
|
nix_instantiate ["--eval", "-E", [i|toString #{expr}|]] |> trimQuotation
|
||||||
'';
|
'';
|
||||||
in {
|
|
||||||
inherit writeHaskellScript get-niv-path unstable sources haskellList;
|
|
||||||
niv = (import sources.niv {}).niv;
|
|
||||||
home-manager = pkgs.callPackage <home-manager/home-manager> {};
|
home-manager = pkgs.callPackage <home-manager/home-manager> {};
|
||||||
gcRetentionDays = 5;
|
gcRetentionDays = 5;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
rec {
|
rec {
|
||||||
inherit (import ../common/lib.nix) niv;
|
my-lib = import ../common/lib.nix;
|
||||||
pkgs = import <nixpkgs> {};
|
inherit (my-lib) pkgs unstable sources;
|
||||||
unstable = import <unstable> {};
|
|
||||||
lorriSrc = (import ../nix/sources.nix).lorri;
|
|
||||||
lorri = import lorriSrc { src = lorriSrc; pkgs = unstable; };
|
|
||||||
tasktree = pkgs.callPackage ../packages/tasktree {};
|
tasktree = pkgs.callPackage ../packages/tasktree {};
|
||||||
neovim = pkgs.neovim.override {
|
neovim = pkgs.neovim.override {
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
withPython3 = true;
|
withPython3 = true;
|
||||||
};
|
};
|
||||||
home-neovim = (import ../home-manager/nvim) neovim;
|
home-neovim = (import ../home-manager/nvim) neovim;
|
||||||
|
niv = (import sources.niv {}).niv;
|
||||||
|
|
||||||
# pkgs assumed to be present on a non nixos host
|
# pkgs assumed to be present on a non nixos host
|
||||||
core-system-pkgs = {
|
core-system-pkgs = {
|
||||||
|
@ -35,7 +33,8 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
extra-system-pkgs = {
|
extra-system-pkgs = {
|
||||||
inherit lorri niv;
|
lorri = import sources.lorri { src = sources.lorri; pkgs = unstable; };
|
||||||
|
inherit niv;
|
||||||
inherit (pkgs.gitAndTools) git-annex;
|
inherit (pkgs.gitAndTools) git-annex;
|
||||||
inherit (pkgs.rxvt_unicode) terminfo;
|
inherit (pkgs.rxvt_unicode) terminfo;
|
||||||
inherit (pkgs.pythonPackages) qrcode;
|
inherit (pkgs.pythonPackages) qrcode;
|
||||||
|
@ -81,8 +80,8 @@ rec {
|
||||||
sleep 0.1s;
|
sleep 0.1s;
|
||||||
nmcli r wifi on;
|
nmcli r wifi on;
|
||||||
'';
|
'';
|
||||||
cachix = import (import ../nix/sources.nix).cachix {};
|
cachix = import sources.cachix {};
|
||||||
nixfmt = import (import ../nix/sources.nix).nixfmt {};
|
nixfmt = import sources.nixfmt {};
|
||||||
inherit (pkgs.gnome3) nautilus;
|
inherit (pkgs.gnome3) nautilus;
|
||||||
inherit (unstable.haskellPackages) brittany;
|
inherit (unstable.haskellPackages) brittany;
|
||||||
inherit (pkgs.xorg) xev xbacklight;
|
inherit (pkgs.xorg) xev xbacklight;
|
||||||
|
@ -160,6 +159,7 @@ rec {
|
||||||
};
|
};
|
||||||
home-pkgs = {
|
home-pkgs = {
|
||||||
inherit (pkgs) ncmpcpp;
|
inherit (pkgs) ncmpcpp;
|
||||||
|
inherit (my-lib) shh;
|
||||||
inherit home-neovim;
|
inherit home-neovim;
|
||||||
};
|
};
|
||||||
accounting-pkgs = {
|
accounting-pkgs = {
|
||||||
|
|
Loading…
Reference in a new issue