maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

More changes

Browse source
This commit is contained in:
Malte Brandy 2019-07-31 22:59:54 +02:00
parent 4793a68ed5
commit c36c483ab3
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cachix.nix
View file

@ -1,4 +1,3 @@
# WARN: this file will get overwritten by $ cachix use <name>
{ pkgs, lib, ... }:
@ -6,9 +5,9 @@ let
folder = ./cachix;
toImport = name: value: folder + ("/" + name);
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 {
inherit imports;
nix.binaryCaches = ["https://cache.nixos.org/"];
nix.binaryCaches = [ "https://cache.nixos.org/" ];
}

9
common/lib.nix
View file

@ -1,4 +1,4 @@
let
rec {
pkgs = import <nixpkgs> {};
unstable = import <unstable> {};
sources = import ../nix/sources.nix;
@ -6,6 +6,10 @@ let
broken = false;
doCheck = false;
});
shh-extras = unstable.haskell.lib.overrideCabal unstable.haskellPackages.shh-extras (drv: {
broken = false;
doCheck = false;
});
haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]'';
writeHaskellScript = { name ? "haskell-script", bins ? [pkgs.coreutils], libraries ? [], imports ? []}: code:
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_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> {};
gcRetentionDays = 5;
}

16
common/pkgs.nix
View file

@ -1,15 +1,13 @@
rec {
inherit (import ../common/lib.nix) niv;
pkgs = import <nixpkgs> {};
unstable = import <unstable> {};
lorriSrc = (import ../nix/sources.nix).lorri;
lorri = import lorriSrc { src = lorriSrc; pkgs = unstable; };
my-lib = import ../common/lib.nix;
inherit (my-lib) pkgs unstable sources;
tasktree = pkgs.callPackage ../packages/tasktree {};
neovim = pkgs.neovim.override {
vimAlias = true;
withPython3 = true;
};
home-neovim = (import ../home-manager/nvim) neovim;
niv = (import sources.niv {}).niv;
# pkgs assumed to be present on a non nixos host
core-system-pkgs = {
@ -35,7 +33,8 @@ rec {
};
extra-system-pkgs = {
inherit lorri niv;
lorri = import sources.lorri { src = sources.lorri; pkgs = unstable; };
inherit niv;
inherit (pkgs.gitAndTools) git-annex;
inherit (pkgs.rxvt_unicode) terminfo;
inherit (pkgs.pythonPackages) qrcode;
@ -81,8 +80,8 @@ rec {
sleep 0.1s;
nmcli r wifi on;
'';
cachix = import (import ../nix/sources.nix).cachix {};
nixfmt = import (import ../nix/sources.nix).nixfmt {};
cachix = import sources.cachix {};
nixfmt = import sources.nixfmt {};
inherit (pkgs.gnome3) nautilus;
inherit (unstable.haskellPackages) brittany;
inherit (pkgs.xorg) xev xbacklight;
@ -160,6 +159,7 @@ rec {
};
home-pkgs = {
inherit (pkgs) ncmpcpp;
inherit (my-lib) shh;
inherit home-neovim;
};
accounting-pkgs = {