home

commit 56935253a7dd07b1f1883a46657baeba1fb96f74
parent 1a0d0a259d06fc2c2efa0d1a3c7d2f5ed7143b65
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 22 Dec 2020 14:29:04 +0100

flake: update tkn derivation, …

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
flake.nix
 | 
47
+++++++++++++++++++++++++----------------------
M
nix/packages/tkn/default.nix
 | 
3
+--
M
systems/hosts/foo.flake.nix
 | 
2
+-

3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -78,9 +78,12 @@
   outputs = { self, ... } @ inputs:
     with inputs.nixpkgs.lib;
     let
+      # List systems that we support.
+      # So far it is only amd64 and aarch64
       forEachSystem = genAttrs [ "x86_64-linux" "aarch64-linux" ];
 
-      # Packages
+      # mkPkgs makes pkgs for a system, given a pkgs attrset.
+      # The pkgs attrset can be taken from inputs nixos, nixos-unstable, nixpkgs.
       mkPkgs = pkgs: system: import pkgs {
         inherit system;
         config = import ./nix/config.nix;
@@ -90,7 +93,6 @@
       stablePkgsBySystem = forEachSystem (mkPkgs inputs.nixos);
       pkgsBySystem = forEachSystem (mkPkgs inputs.nixpkgs);
 
-      # NixOS configurations
       /* Creates a NixOS configuration from a `name` and an attribute set.
          The attribute set is composed of:
          - pkgs: the package set to use. To be taken from the inputs (inputs.nixos, …)
@@ -235,6 +237,8 @@
         overlays = forEachSystem (system: [
           (self.overlay."${system}")
           (_: _: import inputs.gitignore-nix { lib = inputs.nixpkgs.lib; })
+          inputs.nyxt.overlay
+          inputs.emacs.overlay
           (import ./nix/overlays/infra.nix)
           (import ./nix/overlays/mkSecret.nix)
         ]);
@@ -244,14 +248,14 @@
       # `nixos-rebuild` on those hosts.
       nixosConfigurations = mapAttrs' mkNixOsConfiguration {
         # FIXME remove .flake "suffix" once they all got migrated
-        #naruhodo = { pkgs = inputs.nixos-unstable; system = "x86_64-linux"; };
-        #wakasu = { pkgs = inputs.nixos-unstable; system = "x86_64-linux"; };
-        #okinawa = { pkgs = inputs.nixos; system = "x86_64-linux"; };
-        #sakhalin = { pkgs = inputs.nixos; system = "x86_64-linux"; };
-        #kerkouane = { pkgs = inputs.nixos; system = "x86_64-linux"; };
+        naruhodo = { pkgs = inputs.nixos-unstable; system = "x86_64-linux"; };
+        wakasu = { pkgs = inputs.nixos-unstable; system = "x86_64-linux"; };
+        okinawa = { pkgs = inputs.nixos; system = "x86_64-linux"; };
+        sakhalin = { pkgs = inputs.nixos; system = "x86_64-linux"; };
+        kerkouane = { pkgs = inputs.nixos; system = "x86_64-linux"; };
         # TODO raspberry pi 8G x 3 (name them too)
-        #monastir = { pkgs = inputs.nixo; system = "aarch64-linux"; };
-        #kairouan = { pkgs = inputs.nixos; system = "aarch64-linux"; };
+        monastir = { pkgs = inputs.nixo; system = "aarch64-linux"; };
+        kairouan = { pkgs = inputs.nixos; system = "aarch64-linux"; };
         nabeul = { pkgs = inputs.nixos; system = "aarch64-linux"; };
         # TODO VMs
         foo = { pkgs = inputs.nixos-unstable; users = [ "vincent" "houbeb" "root" ]; };
@@ -265,20 +269,19 @@
       };
 
       # Expose a dev shell which contains tools for working on this repository.
-      devShell = forEachSystem
-        (system:
-          with pkgsBySystem."${system}";
+      devShell = forEachSystem (system:
+        with pkgsBySystem."${system}";
 
-          mkShell {
-            name = "home";
-            buildInputs = [
-              cachix
-              git-crypt
-              nixpkgs-fmt
-              gnumake
-            ];
-          }
-        );
+        mkShell {
+          name = "home";
+          buildInputs = [
+            cachix
+            git-crypt
+            nixpkgs-fmt
+            gnumake
+          ];
+        }
+      );
 
       # Expose an overlay which provides the packages defined by this repository.
       #
diff --git a/nix/packages/tkn/default.nix b/nix/packages/tkn/default.nix
@@ -7,11 +7,10 @@ rec {
       pname = "tkn";
       name = "${pname}-${version}";
 
-      goPackagePath = "github.com/tektoncd/cli";
       subPackages = [ "cmd/tkn" ];
       buildFlagsArray =
         let
-          t = "${goPackagePath}/pkg/cmd/version";
+          t = "github.com/tektoncd/cli/pkg/cmd/version";
         in
         ''
           -ldflags=
diff --git a/systems/hosts/foo.flake.nix b/systems/hosts/foo.flake.nix
@@ -16,7 +16,7 @@ in
   profiles.desktop.i3.enable = true;
   profiles.home.enable = true;
 
-  environment.systemPackages = with pkgs; [ tkn ];
+  environment.systemPackages = with pkgs; [ tkn nyxt ];
   /*
   profiles = {
     desktop.i3.enable = true;