revert(glittershark): "Temporarily skip grfn's subtree"
This reverts commit 475d41f698. I'd like
my derivations back, please.
Changes necessary to get this working:
- Don't depend on `nixpkgs` being in the NIX_PATH for my website - it's
not necessary anyway since emacs 27 is mainline now
- .skip-subtrees on things that shouldn't be evaluated anyway
- Get rid of system/pkgs, and move the one thing in there that *wasn't*
already in third_party (alsi) to third_party
- Drop notifymuch for now - it's not working, and I'll probably get it
landed in nixpkgs before I manage to get it working
- Add __readTree = true to my systems so they get built.
- explicitly disable ci for xanthous, which is failing to build and had
been omitted previously
Change-Id: I20f5e81d6eb7ffe040091a08d75d0cb15304f707
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1864
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Griffin Smith
glittershark
parent
fb0528c5da
commit
a7cd92770d
16 changed files with 37 additions and 154 deletions
0
users/glittershark/system/home/.skip-subtree
Normal file
0
users/glittershark/system/home/.skip-subtree
Normal file
|
|
@ -10,7 +10,7 @@ rec {
|
|||
sha256 = "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc";
|
||||
});
|
||||
|
||||
home = confPath: import "${home-manager}/modules" {
|
||||
home = confPath: (import "${home-manager}/modules" {
|
||||
pkgs = nixpkgs;
|
||||
configuration = { config, lib, ... }: {
|
||||
imports = [confPath];
|
||||
|
|
@ -20,7 +20,7 @@ rec {
|
|||
|
||||
lib.depot = depot;
|
||||
};
|
||||
};
|
||||
}) // { __readTree = true; };
|
||||
|
||||
chupacabra = home ./machines/chupacabra.nix;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let alsi = pkgs.callPackage ../../pkgs/alsi {};
|
||||
in
|
||||
{
|
||||
home.packages = [ alsi ];
|
||||
home.packages = [ config.lib.depot.third_party.alsi ];
|
||||
|
||||
xdg.configFile."alsi/alsi.logo" = {
|
||||
source = ./nixos-logo.txt;
|
||||
|
|
|
|||
|
|
@ -36,26 +36,26 @@ in {
|
|||
msmtp
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [(self: super: {
|
||||
notifymuch = self.python3Packages.callPackage ../../pkgs/notifymuch.nix {};
|
||||
})];
|
||||
# nixpkgs.overlays = [(self: super: {
|
||||
# notifymuch = self.python3Packages.callPackage ../../pkgs/notifymuch.nix {};
|
||||
# })];
|
||||
|
||||
systemd.user.services = mapAttrs' (name: account: {
|
||||
name = escapeUnitName "lieer-${name}";
|
||||
value.Service.ExecStart = mkForce "${pkgs.writeShellScript "sync-${name}" ''
|
||||
${pkgs.gmailieer}/bin/gmi sync
|
||||
${pkgs.notifymuch}/bin/notifymuch
|
||||
''}";
|
||||
# ${pkgs.notifymuch}/bin/notifymuch
|
||||
}) accounts;
|
||||
|
||||
xdg.configFile."notifymuch/notifymuch.cfg".text = generators.toINI {} {
|
||||
notifymuch = {
|
||||
query = "is:unread and is:important";
|
||||
mail_client = "";
|
||||
recency_interval_hours = "48";
|
||||
hidden_tags = "inbox unread attachment replied sent encrypted signed";
|
||||
};
|
||||
};
|
||||
# xdg.configFile."notifymuch/notifymuch.cfg".text = generators.toINI {} {
|
||||
# notifymuch = {
|
||||
# query = "is:unread and is:important";
|
||||
# mail_client = "";
|
||||
# recency_interval_hours = "48";
|
||||
# hidden_tags = "inbox unread attachment replied sent encrypted signed";
|
||||
# };
|
||||
# };
|
||||
|
||||
accounts.email.maildirBasePath = "mail";
|
||||
accounts.email.accounts = mapAttrs (_: params@{ passEntry, ... }: {
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
{ perl, stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation {
|
||||
name = "alsi";
|
||||
pname = "alsi";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trizen";
|
||||
repo = "alsi";
|
||||
rev = "fe2a925caad38d4cc7afe10d74ba60c5db09ee66";
|
||||
sha256 = "060xlalfclrda5f1h3svj4v2gr19mdrsc62vrg7hgii0f3lib7j5";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
(perl.withPackages (ps: with ps; [ DataDump ]))
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp alsi $out/bin/alsi
|
||||
'';
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
(import <nixpkgs-unstable> {}).argocd
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
with import <nixpkgs> {};
|
||||
runCommand "clang-tools" {} ''
|
||||
mkdir -p $out/bin
|
||||
for file in ${clang-tools}/bin/*; do
|
||||
if [ $(basename "$file") != "clangd" ]; then
|
||||
ln -s "$file" $out/bin
|
||||
fi
|
||||
done
|
||||
|
||||
sed \
|
||||
-e "18iexport CPLUS_INCLUDE_PATH=${llvmPackages.libcxx}/include/c++/v1\\''${CPATH:+':'}\\''${CPATH}" \
|
||||
-e '/CPLUS_INCLUDE_PATH/d' \
|
||||
< ${clang-tools}/bin/clangd \
|
||||
> $out/bin/clangd
|
||||
''
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{ pkgs }:
|
||||
with pkgs;
|
||||
|
||||
runCommand "clang-tools" {} ''
|
||||
mkdir -p $out/bin
|
||||
export libc_includes="${stdenv.lib.getDev stdenv.cc.libc}/include"
|
||||
export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1"
|
||||
|
||||
export clang=${llvmPackages.clang-unwrapped}
|
||||
|
||||
echo $clang
|
||||
|
||||
substituteAll ${./wrapper} $out/bin/clangd
|
||||
chmod +x $out/bin/clangd
|
||||
for tool in \
|
||||
clang-apply-replacements \
|
||||
clang-check \
|
||||
clang-format \
|
||||
clang-rename \
|
||||
clang-tidy
|
||||
do
|
||||
ln -s $out/bin/clangd $out/bin/$tool
|
||||
done
|
||||
''
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
buildcpath() {
|
||||
local path
|
||||
while (( $# )); do
|
||||
case $1 in
|
||||
-isystem)
|
||||
shift
|
||||
path=$path${path:+':'}$1
|
||||
esac
|
||||
shift
|
||||
done
|
||||
echo $path
|
||||
}
|
||||
|
||||
export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE})
|
||||
export CPATH=${CPATH}${CPATH:+':'}@libc_includes@
|
||||
export CPLUS_INCLUDE_PATH=@libcpp_includes@${CPATH:+':'}${CPATH}
|
||||
|
||||
exec -a "$0" @clang@/bin/$(basename $0) "$@"
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
{ stdenv
|
||||
, buildPythonApplication
|
||||
, isPy3k
|
||||
, fetchFromGitHub
|
||||
, notmuch
|
||||
, pygobject3
|
||||
, gobject-introspection
|
||||
, libnotify
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "notifymuch";
|
||||
version = "0.1";
|
||||
disabled = ! isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kspi";
|
||||
repo = "notifymuch";
|
||||
rev = "9d4aaf54599282ce80643b38195ff501120807f0";
|
||||
sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
notmuch
|
||||
pygobject3
|
||||
libnotify
|
||||
gtk3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
echo "wrapper args"
|
||||
echo "''${makeWrapperArgs[@]}"
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
echo "wrapper args again"
|
||||
echo "''${makeWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Display desktop notifications for unread mail in a notmuch database";
|
||||
homepage = "https://github.com/kspi/notifymuch";
|
||||
maintainers = with maintainers; [ glittershark ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
0
users/glittershark/system/system/.skip-subtree
Normal file
0
users/glittershark/system/system/.skip-subtree
Normal file
|
|
@ -1,8 +1,12 @@
|
|||
{ depot, ... }:
|
||||
{ depot, pkgs, ... }:
|
||||
|
||||
rec {
|
||||
chupacabra = import ./machines/chupacabra.nix;
|
||||
|
||||
chupacabraSystem = (pkgs.nixos {
|
||||
configuration = chupacabra;
|
||||
}).system // { __readTree = true; };
|
||||
|
||||
rebuilder =
|
||||
let
|
||||
depotPath = "/home/grfn/code/depot";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue