about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--third_party/alsi/OWNERS3
-rw-r--r--third_party/alsi/default.nix (renamed from users/glittershark/system/pkgs/alsi/default.nix)5
-rw-r--r--users/glittershark/.skip-subtree6
-rw-r--r--users/glittershark/gws.fyi/orgExportHTML.nix19
-rw-r--r--users/glittershark/system/home/.skip-subtree0
-rw-r--r--users/glittershark/system/home/default.nix4
-rw-r--r--users/glittershark/system/home/modules/alsi.nix4
-rw-r--r--users/glittershark/system/home/modules/email.nix24
-rw-r--r--users/glittershark/system/pkgs/argocd.nix1
-rw-r--r--users/glittershark/system/pkgs/clang-tools.nix15
-rw-r--r--users/glittershark/system/pkgs/clang-tools/default.nix24
-rw-r--r--users/glittershark/system/pkgs/clang-tools/wrapper20
-rw-r--r--users/glittershark/system/pkgs/notifymuch.nix55
-rw-r--r--users/glittershark/system/system/.skip-subtree0
-rw-r--r--users/glittershark/system/system/default.nix6
-rw-r--r--users/glittershark/xanthous/default.nix7
16 files changed, 38 insertions, 155 deletions
diff --git a/third_party/alsi/OWNERS b/third_party/alsi/OWNERS
new file mode 100644
index 000000000000..6f0b5a3ea6d8
--- /dev/null
+++ b/third_party/alsi/OWNERS
@@ -0,0 +1,3 @@
+inherit: true
+owners:
+ - glittershark
diff --git a/users/glittershark/system/pkgs/alsi/default.nix b/third_party/alsi/default.nix
index d4da8ff38ef7..8969374176d9 100644
--- a/users/glittershark/system/pkgs/alsi/default.nix
+++ b/third_party/alsi/default.nix
@@ -1,4 +1,7 @@
-{ perl, stdenv, fetchFromGitHub }:
+{ pkgs, ... }:
+
+with pkgs;
+
 stdenv.mkDerivation {
   name = "alsi";
   pname = "alsi";
diff --git a/users/glittershark/.skip-subtree b/users/glittershark/.skip-subtree
deleted file mode 100644
index 8df5bc3f789f..000000000000
--- a/users/glittershark/.skip-subtree
+++ /dev/null
@@ -1,6 +0,0 @@
-There are a few things in this folder that fail to evaluate under
-readTree.
-
-Some of these are nested deeper than things that evaluate fine, which
-leads to a problem where the CI build scanner fails to step into
-sub-attributes.
diff --git a/users/glittershark/gws.fyi/orgExportHTML.nix b/users/glittershark/gws.fyi/orgExportHTML.nix
index 153036789f6b..ad5a24795826 100644
--- a/users/glittershark/gws.fyi/orgExportHTML.nix
+++ b/users/glittershark/gws.fyi/orgExportHTML.nix
@@ -1,22 +1,15 @@
-{ pkgs ? import <nixpkgs> {}, ... }:
+{ pkgs, ... }:
 
 with pkgs;
 with lib;
 
 let
 
-  emacs-nixpkgs =
-    (import <nixpkgs> {
-      overlays = [(import (builtins.fetchTarball {
-        url = "https://github.com/nix-community/emacs-overlay/archive/54afb061bdd12c61bbfcc13bad98b7a3aab7d8d3.tar.gz";
-        sha256 = "0hrbg65d5h0cb0nky7a46md7vlvhajq1hf0328l2f7ln9hznqz6j";
-      }))];
-    });
-
-  emacs = (emacs-nixpkgs.emacsPackagesFor emacs-nixpkgs.emacsUnstable)
-    .emacsWithPackages (p: with p; [
-      org
-    ]);
+  emacsWithPackages = (pkgs.emacsPackagesGen pkgs.emacs27).emacsWithPackages;
+
+  emacs = emacsWithPackages (p: with p; [
+    org
+  ]);
 
 in
 
diff --git a/users/glittershark/system/home/.skip-subtree b/users/glittershark/system/home/.skip-subtree
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/users/glittershark/system/home/.skip-subtree
diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix
index 949def154207..d896ba340d59 100644
--- a/users/glittershark/system/home/default.nix
+++ b/users/glittershark/system/home/default.nix
@@ -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;
 }
diff --git a/users/glittershark/system/home/modules/alsi.nix b/users/glittershark/system/home/modules/alsi.nix
index 19ec68efd289..cf8b0bebe743 100644
--- a/users/glittershark/system/home/modules/alsi.nix
+++ b/users/glittershark/system/home/modules/alsi.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;
diff --git a/users/glittershark/system/home/modules/email.nix b/users/glittershark/system/home/modules/email.nix
index 62c8be19a24e..48d6b5f3cc04 100644
--- a/users/glittershark/system/home/modules/email.nix
+++ b/users/glittershark/system/home/modules/email.nix
@@ -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, ... }: {
diff --git a/users/glittershark/system/pkgs/argocd.nix b/users/glittershark/system/pkgs/argocd.nix
deleted file mode 100644
index 5ab0e95d4462..000000000000
--- a/users/glittershark/system/pkgs/argocd.nix
+++ /dev/null
@@ -1 +0,0 @@
-(import <nixpkgs-unstable> {}).argocd
diff --git a/users/glittershark/system/pkgs/clang-tools.nix b/users/glittershark/system/pkgs/clang-tools.nix
deleted file mode 100644
index d13fbd44576a..000000000000
--- a/users/glittershark/system/pkgs/clang-tools.nix
+++ /dev/null
@@ -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
-''
diff --git a/users/glittershark/system/pkgs/clang-tools/default.nix b/users/glittershark/system/pkgs/clang-tools/default.nix
deleted file mode 100644
index 7c1009665eb6..000000000000
--- a/users/glittershark/system/pkgs/clang-tools/default.nix
+++ /dev/null
@@ -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
-''
diff --git a/users/glittershark/system/pkgs/clang-tools/wrapper b/users/glittershark/system/pkgs/clang-tools/wrapper
deleted file mode 100644
index 949a4243e009..000000000000
--- a/users/glittershark/system/pkgs/clang-tools/wrapper
+++ /dev/null
@@ -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) "$@"
diff --git a/users/glittershark/system/pkgs/notifymuch.nix b/users/glittershark/system/pkgs/notifymuch.nix
deleted file mode 100644
index 065bcddd07c6..000000000000
--- a/users/glittershark/system/pkgs/notifymuch.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/users/glittershark/system/system/.skip-subtree b/users/glittershark/system/system/.skip-subtree
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/users/glittershark/system/system/.skip-subtree
diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix
index 7c241de86b0a..f6710eff7b1b 100644
--- a/users/glittershark/system/system/default.nix
+++ b/users/glittershark/system/system/default.nix
@@ -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";
diff --git a/users/glittershark/xanthous/default.nix b/users/glittershark/xanthous/default.nix
index 0b89a50afb9e..8dfd0bce4bd0 100644
--- a/users/glittershark/xanthous/default.nix
+++ b/users/glittershark/xanthous/default.nix
@@ -2,6 +2,9 @@
 , lib ? pkgs.lib
 , ...
 }:
-pkgs.haskell.lib.failOnAllWarnings (
+(pkgs.haskell.lib.failOnAllWarnings (
   pkgs.haskellPackages.callPackage (import ./pkg.nix { inherit pkgs; }) {}
-)
+)) // {
+  # TODO(grfn): Get this passing (see https://buildkite.com/tvl/depot/builds/3055)
+  meta.ci = false;
+}
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-11-01T01ยท58+0000