Commit e76f08b20896

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

@@ -3,18 +3,18 @@ let
   compileEmacsFiles = super.callPackage ./emacs/builder.nix;
 in
 rec {
-  scripts = import ../pkgs/my/scripts {
+  scripts = import ../nix/packages/my/scripts {
     inherit (self) stdenv;
   };
-  vrsync = import ../pkgs/my/vrsync {
+  vrsync = import ../nix/packages/my/vrsync {
     inherit (self) stdenv lib;
   };
-  vde-thinkpad = import ../pkgs/my/vde-thinkpad {
+  vde-thinkpad = import ../nix/packages/my/vde-thinkpad {
     inherit (self) stdenv lib;
   };
   bekind = super.callPackage ../tools/bekind { };
 
-  my = import ../pkgs {
+  my = import ../nix/packages {
     inherit (self) pkgs;
   };
 

@@ -49,6 +49,7 @@ in
     '';
   };
 
+  environment.systemPackages = with pkgs; [ tkn ];
   /*
   profiles = {
     desktop.i3.enable = true;

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkEnableOption mkIf mkDefault mkOverride;
   cfg = config.profiles.base;
 in
 {
@@ -10,7 +10,30 @@ in
     };
   };
   config = mkIf cfg.enable {
+    # Use systemd-boot by default, can be overridden by configurations
+    boot.loader.systemd-boot.enable = mkDefault true;
     # `nix-daemon` will hit the stack limit when using `nixFlakes`.
     systemd.services.nix-daemon.serviceConfig."LimitSTACK" = "infinity";
+    environment = {
+      variables = {
+        EDITOR = mkOverride 0 "vim";
+      };
+    };
+    # Make sure we never remove SSH_AUTH_SOCK when reseting env through sudo
+    security.sudo.extraConfig = ''
+      Defaults env_keep += SSH_AUTH_SOCK
+    '';
+    # Setup a *mailer* in case of failure in systemd
+    systemd.services."status-email-root@" = {
+      description = "status email for %i to vincent";
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = ''
+          ${pkgs.systemd-email}/bin/systemd-email vincent@demeester.fr %i
+        '';
+        User = "root";
+        Environment = "PATH=/run/current-system/sw/bin";
+      };
+    };
   };
 }

@@ -169,21 +169,21 @@
 ;; -GnusSummary
 
 ;; GnusWin
-(use-package gnus-win
-  :config
-  (gnus-add-configuration
-   '(article
-     (horizontal 1.0
-                 (vertical 40 (group 1.0))
-                 (vertical 1.0
-                           (summary 0.16 point)
-                           (article 1.0)))))
-
-  (gnus-add-configuration
-   '(summary
-     (horizontal 1.0
-                 (vertical 40 (group 1.0))
-                 (vertical 1.0 (summary 1.0 point))))))
+;; (use-package gnus-win
+;;   :config
+;;   (gnus-add-configuration
+;;    '(article
+;;      (horizontal 1.0
+;;                  (vertical 40 (group 1.0))
+;;                  (vertical 1.0
+;;                            (summary 0.16 point)
+;;                            (article 1.0)))))
+;;
+;;   (gnus-add-configuration
+;;    '(summary
+;;      (horizontal 1.0
+;;                  (vertical 40 (group 1.0))
+;;                  (vertical 1.0 (summary 1.0 point))))))
 ;; -GnusWin
 
 ;; GnusDired

@@ -185,6 +185,7 @@ in
       keybindings = {
         "Mod4+Return" = "exec alacritty";
         "Mod4+Shift+Return" = "exec emacsclient -c";
+        "Mod4+Control+Return" = "exec emacs";
       };
       gaps = {
         inner = 0;

@@ -33,7 +33,7 @@ let
     in
     concatMap f (attrValues s);
   outputsOf = p: map (o: p.${o}) p.outputs;
-  nurAttrs = p: import ./pkgs/default.nix { pkgs = p; };
+  nurAttrs = p: import ./nix/packages/default.nix { pkgs = p; };
   nurPkgs = p:
     flattenPkgs (
       listToAttrs (

@@ -210,6 +210,7 @@
         overlays = forEachSystem (system: [
           (self.overlay."${system}")
           (_: _: import inputs.gitignore-nix { lib = inputs.nixpkgs.lib; })
+          (import ./nix/overlays/infra.nix)
         ]);
       };
 
@@ -261,22 +262,25 @@
 
       # Expose the packages defined in this flake, built for any supported systems. These are
       # meant to be consumed by other projects that might import this flake.
+      #
+      # Internal packages are handled through overlay definition, in internal.
+      # Note: they are also added to the systems overlay so there is no duplication of definition.
       packages = forEachSystem
         (system:
           let
             pkgs = pkgsBySystem."${system}";
           in
           {
-            apeStable = stablePkgsBySystem."${system}".callPackage ./pkgs/ape { };
-            apeUnstable = unstablePkgsBySystem."${system}".callPackage ./pkgs/ape { };
-            ape = pkgs.callPackage ./pkgs/ape { };
-            nr = pkgs.callPackage ./pkgs/nr { };
-            ram = pkgs.callPackage ./pkgs/ram { };
-            systemd-email = pkgs.callPackage ./pkgs/systemd-email { };
+            apeStable = stablePkgsBySystem."${system}".callPackage ./nix/packages/ape { };
+            apeUnstable = unstablePkgsBySystem."${system}".callPackage ./nix/packages/ape { };
+            ape = pkgs.callPackage ./nix/packages/ape { };
+            nr = pkgs.callPackage ./nix/packages/nr { };
+            ram = pkgs.callPackage ./nix/packages/ram { };
+            systemd-email = pkgs.callPackage ./nix/packages/systemd-email { };
 
-            batzconverter = pkgs.callPackage ./pkgs/batzconverter { };
+            batzconverter = pkgs.callPackage ./nix/packages/batzconverter { };
             # Tekton
-            inherit (pkgs.callPackage ./pkgs/tkn { })
+            inherit (pkgs.callPackage ./nix/packages/tkn { })
               tkn_0_11
               tkn_0_12
               tkn_0_13
@@ -284,13 +288,13 @@
               tkn
               ;
 
-            manifest-tool = pkgs.callPackage ./pkgs/manifest-tool { };
-            ko = pkgs.callPackage ./pkgs/ko { };
-            buildx = pkgs.callPackage ./pkgs/buildx { };
-            buildkit = pkgs.callPackage ./pkgs/buildkit { };
+            manifest-tool = pkgs.callPackage ./nix/packages/manifest-tool { };
+            ko = pkgs.callPackage ./nix/packages/ko { };
+            buildx = pkgs.callPackage ./nix/packages/buildx { };
+            buildkit = pkgs.callPackage ./nix/packages/buildkit { };
           } // optionalAttrs (system == "x86_64-linux") {
             # OpenShift
-            inherit (pkgs.callPackage ./pkgs/oc { })
+            inherit (pkgs.callPackage ./nix/packages/oc { })
               oc_4_1
               oc_4_2
               oc_4_3
@@ -299,7 +303,7 @@
               oc_4_6
               oc
               ;
-            inherit (pkgs.callPackage ./pkgs/openshift-install { })
+            inherit (pkgs.callPackage ./nix/packages/openshift-install { })
               openshift-install_4_3
               openshift-install_4_4
               openshift-install_4_5