Commit 257afbcd54f3

@@ -1,1 +0,0 @@
-_: { }

@@ -1,8 +0,0 @@
-self: super:
-with super.lib;
-let
-  # Load the system config and get the `nixpkgs.overlays` option
-  inherit ((import <nixpkgs/nixos> { }).config.nixpkgs) overlays;
-in
-# Apply all overlays to the input of the current "main" overlay
-foldl' (flip extends) (_: super) overlays self

@@ -1,5 +0,0 @@
-_self: super:
-
-{
-  systemd-email = super.callPackage ../packages/systemd-email { };
-}

@@ -1,12 +0,0 @@
-self: _super:
-with builtins;
-with self.lib;
-{
-  mkSecret =
-    path:
-    let
-      name = baseNameOf (toString path);
-      stub = toFile name "This is a stub!\n";
-    in
-    if pathExists path then path else self.lib.warn "Using stub for secrets/${name}" stub;
-}

@@ -1,42 +0,0 @@
-self: super:
-let
-  compileEmacsFiles = super.callPackage ./emacs/builder.nix;
-in
-rec {
-  scripts = import ../packages/my/scripts {
-    inherit (self) stdenv;
-  };
-  vrsync = import ../packages/my/vrsync {
-    inherit (self) stdenv;
-  };
-  vde-thinkpad = import ../packages/my/vde-thinkpad {
-    inherit (self) stdenv;
-  };
-  bekind = super.callPackage ../../tools/bekind { };
-  battery-monitor = super.callPackage ../../tools/battery-monitor { };
-  go-org-readwise = super.callPackage ../../tools/go-org-readwise { };
-
-  my = import ../packages {
-    inherit (self) pkgs;
-  };
-
-  bookmark-plus = compileEmacsFiles {
-    name = "bookmark-plus";
-    src = super.fetchFromGitHub {
-      owner = "emacsmirror";
-      repo = "bookmark-plus";
-      rev = "73b8e1c2195860a8c24b5e2961914780c19cf5e3";
-      sha256 = "09aprlawi3m7qrdas3zlk52niap2sr741qzfpjwc2c22hrlyv8ng";
-    };
-  };
-  dired-plus = compileEmacsFiles {
-    name = "dired-plus";
-    src = super.fetchFromGitHub {
-      owner = "emacsmirror";
-      repo = "dired-plus";
-      rev = "db4d82a6b1995a3aa31bd7f2dcaf9b83335d5576";
-      sha256 = "10rfjf6gn5cx1kxq97xq7p24rnkw0hnzj32x4hny7bc6s3635d3x";
-    };
-  };
-
-}

@@ -1,26 +0,0 @@
-_final: prev: rec {
-
-  inherit (prev.callPackage ../packages/tkn { })
-    tkn_0_17
-    tkn_0_18
-    tkn_0_19
-    tkn_0_20
-    tkn_0_21
-    tkn_0_22
-    tkn_0_23
-    tkn
-    ;
-  inherit (prev.callPackage ../packages/tkn/tkn-pac.nix { })
-    tkn-pac_0_5
-    tkn-pac_0_6
-    tkn-pac_0_7
-    tkn-pac_0_8
-    tkn-pac
-    ;
-  inherit (prev.callPackage ../packages/tkn/tkn-local.nix { })
-    tkn-local_0_4
-    tkn-local_0_3
-    tkn-local_0_2
-    tkn-local
-    ;
-}

@@ -1,2 +0,0 @@
-_: _: {
-}

@@ -1,33 +0,0 @@
-{ pkgs, fetchFromGitHub }:
-
-pkgs.stdenv.mkDerivation rec {
-  pname = "adi1090x-plymouth";
-  version = "0.0.1";
-
-  src = fetchFromGitHub {
-    owner = "adi1090x";
-    repo = "plymouth-themes";
-    rev = "bf2f570bee8e84c5c20caac353cbe1d811a4745f";
-    sha256 = "sha256-VNGvA8ujwjpC2rTVZKrXni2GjfiZk7AgAn4ZB4Baj2k=";
-  };
-
-  buildInputs = [
-    pkgs.git
-  ];
-
-  configurePhase = ''
-    mkdir -p $out/share/plymouth/themes/
-  '';
-
-  buildPhase = '''';
-
-  installPhase = ''
-    cp -r pack_1/cuts $out/share/plymouth/themes
-    cp -r pack_2/{hexagon,green_loader,deus_ex} $out/share/plymouth/themes
-    cp -r pack_4/{spinner_alt,sphere} $out/share/plymouth/themes
-    for p in $out/share/plymouth/themes/*; do
-      theme=$(basename $p)
-      sed -i "s@\/usr\/@$out\/@" $out/share/plymouth/themes/$theme/$theme.plymouth
-    done
-  '';
-}

@@ -1,27 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  name = "athens-${version}";
-  version = "0.11.0";
-  rev = "v${version}";
-
-  subPackages = [ "cmd/proxy" ];
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "gomods";
-    repo = "athens";
-    sha256 = "sha256-hkewZ21ElkoDsbPPiCZNmWu4MBlKTlnrK72/xCX06Sk=";
-  };
-  vendorHash = "Hash-9iwT+PE54zy+DCJLb9R2YOXVYPqy3UGs+ro/2JoAFDU=";
-
-  meta = {
-    description = "a Go module datastore and proxy";
-    homepage = "https://github.com/godmods/athens";
-    license = lib.licenses.mit;
-  };
-}

@@ -1,15 +0,0 @@
-{ buildFHSUserEnv }:
-
-buildFHSUserEnv {
-  name = "fhs-std";
-  targetPkgs =
-    pkgs: with pkgs; [
-      envsubst
-      # exa # TODO: switch to eza in 2024
-      git
-      gnumake
-      coreutils
-      zsh
-    ];
-  runScript = "/bin/zsh";
-}

@@ -1,33 +0,0 @@
-{ buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  name = "gogo-protobuf-${version}";
-  version = "1.3.1";
-  rev = "v${version}";
-
-  subPackages = [
-    "proto"
-    "gogoproto"
-    "gogoreplace"
-    "jsonpb"
-    "protoc-gen-combo"
-    "protoc-gen-gofast"
-    "protoc-gen-gogo"
-    "protoc-gen-gogofast"
-    "protoc-gen-gogofaster"
-    "protoc-gen-gogoslick"
-    "protoc-gen-gogotypes"
-    "protoc-gen-gostring"
-    "protoc-min-version"
-  ];
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "gogo";
-    repo = "protobuf";
-    sha256 = "0x77x64sxjgfhmbijqfzmj8h4ar25l2w97h01q3cqs1wk7zfnkhp";
-  };
-  vendorHash = "0vkpqdd4x97cl3dm79mh1vic1ir4i20wv9q52sn13vr0b3kja0qy";
-  modHash = "${vendorHash}";
-
-}

@@ -1,29 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  rustPlatform,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "kubernix";
-  version = "unstable-2020-05-07";
-  preferLocalBuild = true;
-
-  src = fetchFromGitHub {
-    owner = "saschagrunert";
-    repo = pname;
-    rev = "01ea39f468dd8abf6816a87fcac886a25ec05b0d";
-    sha256 = "1zqqdcxidn10a4p1b64r1w79nwlifk1si0lf9jfkb7099rfrhalf";
-  };
-
-  cargoSha256 = "0xaf056x46c5561hypd85ni7bkijvz26kpwy5iiw19ijnlj1adw9";
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Single dependency Kubernetes clusters for local testing, experimenting and development";
-    homepage = "https://github.com/saschagrunert/kubernix";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ saschagrunert ];
-    platforms = platforms.linux;
-  };
-}

@@ -1,25 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  name = "operator-tool-${version}";
-  version = "0.0.3";
-  rev = "v${version}";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "openshift-pipelines";
-    repo = "operator-tooling";
-    sha256 = "sha256-S2EKdv/Y3ha+wMMK90jr5RPq3+2IJyX63c/xEEvrxrE=";
-  };
-  vendorHash = null;
-
-  meta = {
-    description = "Tooling for managing operator remote payload";
-    homepage = "https://github.com/openshift-pipelines/operator-tooling";
-    license = lib.licenses.asl20;
-  };
-}

@@ -1,16 +0,0 @@
-Dump temacs in an empty environment to prevent -dev paths from ending
-up in the dumped image.
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index fd05a45df5..13f529c253 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -570,7 +570,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
-                 lisp.mk $(etc)/DOC $(lisp) \
-                 $(lispsource)/international/charprop.el ${charsets}
- ifeq ($(DUMPING),unexec)
--	LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
-+	env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
-   ifneq ($(PAXCTL_dumped),)
- 	      $(PAXCTL_dumped) emacs$(EXEEXT)
-   endif

@@ -1,14 +0,0 @@
-diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
-index 3ce7bbbd4a..e31059da3f 100644
---- a/lisp/net/tramp-gvfs.el
-+++ b/lisp/net/tramp-gvfs.el
-@@ -125,7 +125,8 @@
- 	 (autoload 'zeroconf-init "zeroconf")
- 	 (tramp-compat-funcall 'dbus-get-unique-name :system)
- 	 (tramp-compat-funcall 'dbus-get-unique-name :session)
--	 (or (tramp-process-running-p "gvfs-fuse-daemon")
-+	 (or (tramp-process-running-p ".gvfsd-fuse-wrapped")
-+             (tramp-process-running-p "gvfs-fuse-daemon")
- 	     (tramp-process-running-p "gvfsd-fuse"))))
-   "Non-nil when GVFS is available.")
- 

@@ -1,34 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  name = "prm-${version}";
-  version = "3.4.5";
-  rev = "v${version}";
-
-  ldflags =
-    let
-      t = "github.com/ldez/prm/v3/meta";
-    in
-    [
-      "-X ${t}.Version=${version}"
-      "-X ${t}.BuildDate=unknown"
-    ];
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "ldez";
-    repo = "prm";
-    sha256 = "sha256-ZrzZ4aJ9uB7iFHLCDsTJp8POqOG2HhrIC2cYg31tYdg=";
-  };
-  vendorHash = "1k1n2ylxrbkdwli0nh56fv7q8c7yl0661ayvpgirlp19704za509";
-
-  meta = {
-    description = "Pull Request Manager for Maintainers";
-    homepage = "https://github.com/ldez/prm";
-    license = lib.licenses.asl20;
-  };
-}

@@ -1,26 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  name = "protobuild-unstable-${version}";
-  version = "2020-04-14";
-  rev = "324b1750ca060b814b18f4142b544b292d42968e";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "stevvooe";
-    repo = "protobuild";
-    sha256 = "0v3biryf56hscg7s8mm9ds8zypajb976z6x4xlhx1852wz6vqfxh";
-  };
-  vendorHash = "19wazsl2k8563k96w75lcfdvvz4k5l5kg8inbm1hkh1h0knnzh8r";
-  modHash = "${vendorHash}";
-
-  meta = {
-    description = "Build protobufs in Go, easily";
-    homepage = "https://github.com/stevvooe/protobuild";
-    license = lib.licenses.asl20;
-  };
-}

@@ -1,25 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  name = "rmapi-${version}";
-  version = "0.0.19";
-  rev = "v${version}";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "juruen";
-    repo = "rmapi";
-    sha256 = "sha256-HXWE6688jhRQQEiZuPfuJStSQeueqoWwwa+PfneHprw=";
-  };
-  vendorHash = "Hash-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU=";
-
-  meta = {
-    description = "Go app that allows you to access your reMarkable tablet files through the Cloud API";
-    homepage = "https://github.com/juruen/rmapi";
-    license = lib.licenses.gpl3;
-  };
-}

@@ -1,26 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  name = "sec-${version}";
-  version = "0.2.0";
-  rev = "v${version}";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "vdemeester";
-    repo = "sec";
-    sha256 = "01xmvycdbyvcjsd1pvbd2qjn4ij99pyyw9sasyffhw0bxfnpcvyq";
-  };
-  vendorHash = "1b8zis0hv32sh51s01n3z3nd20ayfcj4vv3m943r8d0gqd7hj7zw";
-  modHash = "${vendorHash}";
-
-  meta = {
-    description = "Sec § — a golang opiniated dependency updater";
-    homepage = "https://github.com/vdemeester/sec";
-    license = lib.licenses.asl20;
-  };
-}

@@ -1,36 +0,0 @@
-{
-  pkgs ? import <nixpkgs> { },
-}:
-
-rec {
-  # pre nur-packages import
-  scripts = pkgs.callPackage ./my/scripts { };
-  vrsync = pkgs.callPackage ./my/vrsync { };
-  vde-thinkpad = pkgs.callPackage ./my/vde-thinkpad { };
-  bekind = pkgs.callPackage ../../tools/bekind { };
-  battery-monitor = pkgs.callPackage ../../tools/battery-monitor { };
-  go-org-readwise = pkgs.callPackage ../../tools/go-org-readwise { };
-
-  chmouzies.kubernetes = pkgs.callPackage ./chmouzies/kubernetes.nix { };
-
-  # Mine
-  ape = pkgs.callPackage ./ape { };
-  fhs-std = pkgs.callPackage ./fhs/std.nix { };
-  ram = pkgs.callPackage ./ram { };
-  systemd-email = pkgs.callPackage ./systemd-email { };
-
-  # Maybe upstream
-  athens = pkgs.callPackage ./athens { };
-  #gogo-protobuf = pkgs.callPackage ./gogo-protobuf {};
-  govanityurl = pkgs.callPackage ./govanityurl { };
-  batzconverter = pkgs.callPackage ./batzconverter { };
-  prm = pkgs.callPackage ./prm { };
-  #protobuild = pkgs.callPackage ./protobuild { };
-  rmapi = pkgs.callPackage ./rmapi { };
-
-  operator-tool = pkgs.callPackage ./operator-tooling { };
-
-  manifest-tool = pkgs.callPackage ./manifest-tool { };
-
-  adi1090x-plymouth = pkgs.callPackage ./adi1090x-plymouth { };
-}

@@ -1,3 +0,0 @@
-#+TITLE: Packages
-
-My personal /maintained/ packages, that can be used as NUR repository.

@@ -1,36 +0,0 @@
-let
-  mapAttrs =
-    f: set:
-    builtins.listToAttrs (
-      map (attr: {
-        name = attr;
-        value = f set.${attr};
-      }) (builtins.attrNames set)
-    );
-  channels = {
-    aardvark = "13.10";
-    baboon = "14.04";
-    caterpillar = "14.12";
-    dingo = "15.09";
-    emu = "16.03";
-    flounder = "16.09";
-    gorilla = "17.03";
-    v17_03 = "17.03";
-    hummingbird = "17.09";
-    v17_09 = "17.09";
-    impala = "18.03";
-    v18_03 = "18.03";
-    jellyfish = "18.09";
-    v18_09 = "18.09";
-    koi = "19.03";
-    v19_03 = "19.03";
-    loris = "19.09";
-    v19_09 = "19.09";
-    markhor = "20_03";
-    v20_03 = "20.03";
-    unstable = "unstable";
-  };
-in
-mapAttrs (
-  v: import (builtins.fetchTarball "https://nixos.org/channels/nixos-${v}/nixexprs.tar.xz") { }
-) channels

@@ -1,4 +0,0 @@
-{
-  allowUnfree = true;
-  allowBroken = true;
-}

@@ -1,28 +0,0 @@
-{
-  nixpkgs,
-  home-manager,
-  system,
-  specialArgs,
-  nixos-modules,
-}:
-nixpkgs.lib.nixosSystem {
-  inherit system specialArgs;
-  modules = nixos-modules // [
-    {
-      # make `nix run nixpkgs#nixpkgs` use the same nixpkgs as the one used by this flake.
-      nix.registry.nixpkgs.flake = nixpkgs;
-
-      # make `nix repl '<nixpkgs>'` use the same nixpkgs as the one used by this flake.
-      environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";
-      nix.nixPath = [ "/etc/nix/inputs" ];
-    }
-
-    home-manager.nixosModules.home-manager
-    {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-
-      home-manager.extraSpecialArgs = specialArgs;
-    }
-  ];
-}

@@ -1,7 +1,7 @@
 { inputs, ... }:
 {
   # FIXME: migrate to pkgs and overlays on root
-  additions = final: _prev: import ../../pkgs { pkgs = final; };
+  additions = final: _prev: import ../pkgs { pkgs = final; };
   modifications = _final: _prev: {
     # example = prev.example.overrideAttrs (oldAttrs: rec {
     # ...
@@ -35,30 +35,5 @@
       ];
     };
   };
-  # tekton = final: prev: {
-  #
-  #   inherit (prev.callPackage ../packages/tkn { })
-  #     tkn_0_17
-  #     tkn_0_18
-  #     tkn_0_19
-  #     tkn_0_20
-  #     tkn_0_21
-  #     tkn_0_22
-  #     tkn_0_23
-  #     tkn
-  #     ;
-  #   inherit (prev.callPackage ../packages/tkn/tkn-pac.nix { })
-  #     tkn-pac_0_5
-  #     tkn-pac_0_6
-  #     tkn-pac_0_7
-  #     tkn-pac_0_8
-  #     tkn-pac
-  #     ;
-  #   inherit (prev.callPackage ../packages/tkn/tkn-local.nix { })
-  #     tkn-local_0_4
-  #     tkn-local_0_3
-  #     tkn-local_0_2
-  #     tkn-local
-  #     ;
-  # };
+
 }

@@ -4,7 +4,44 @@
 {
   pkgs ? (import ../nixpkgs.nix) { },
 }:
+let
+  compileEmacsFiles = pkgs.callPackage ./emacs/builder.nix;
+in
 {
   # TODO: migrate things from nix/packages
   nixfmt-plus = pkgs.callPackage ./nixfmt-plus.nix { };
+  scripts = pkgs.callPackage ./my/scripts { };
+  vrsync = pkgs.callPackage ./my/vrsync { };
+  vde-thinkpad = pkgs.callPackage ./my/vde-thinkpad { };
+  bekind = pkgs.callPackage ../tools/bekind { };
+  battery-monitory = pkgs.callPackage ../tools/battery-monitor { };
+  go-org-readwise = pkgs.callPackage ../tools/go-org-readwise { };
+  ape = pkgs.callPackage ./ape { };
+  ram = pkgs.callPackage ./ram { };
+  govanityurl = pkgs.callPackage ./govanityurl { };
+  batzconverter = pkgs.callPackage ./batzconverter { };
+  manifest-tool = pkgs.callPackage ./manifest-tool { };
+
+  chmouzies.kubernetes = pkgs.callPackage ./chmouzies/kubernetes.nix { };
+
+  systemd-email = pkgs.callPackage ./systemd-email { };
+
+  bookmark-plus = compileEmacsFiles {
+    name = "bookmark-plus";
+    src = pkgs.fetchFromGitHub {
+      owner = "emacsmirror";
+      repo = "bookmark-plus";
+      rev = "73b8e1c2195860a8c24b5e2961914780c19cf5e3";
+      sha256 = "09aprlawi3m7qrdas3zlk52niap2sr741qzfpjwc2c22hrlyv8ng";
+    };
+  };
+  dired-plus = compileEmacsFiles {
+    name = "dired-plus";
+    src = pkgs.fetchFromGitHub {
+      owner = "emacsmirror";
+      repo = "dired-plus";
+      rev = "db4d82a6b1995a3aa31bd7f2dcaf9b83335d5576";
+      sha256 = "10rfjf6gn5cx1kxq97xq7p24rnkw0hnzj32x4hny7bc6s3635d3x";
+    };
+  };
 }

@@ -128,11 +128,29 @@
             ];
           }).config.system.build.sdImage;
       };
-      # TODO: expose some packages ?
-      # This is probably not gonna happen, instead I should move any internal package here outside, in their
-      # own repository and flake. If they are useful upstream.
 
-      overlays = import ./nix/overlays { inherit inputs; };
+      overlays = import ./overlays { inherit inputs; };
+
+      packages = forAllSystems (
+        system:
+        let
+          pkgs = import inputs.nixpkgs {
+            inherit system;
+            config.allowAliases = false;
+            overlays = [
+              self.overlays.additions
+            ];
+          };
+          skipDarwinPackages =
+            system: n:
+            if lib.strings.hasSuffix "darwin" system then !(lib.strings.hasPrefix "koff" n) else true;
+          inherit (inputs.nixpkgs) lib;
+          drvAttrs = builtins.filter (n: lib.isDerivation pkgs.${n} && skipDarwinPackages system n) (
+            builtins.attrNames (self.overlays.additions pkgs pkgs)
+          );
+        in
+        lib.listToAttrs (map (n: lib.nameValuePair n pkgs.${n}) drvAttrs)
+      );
 
       checks = forAllSystems (system: {
         pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {