From 703c86352a4298b64275abe8eedafcfca81488b3 Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 18 Sep 2023 19:37:49 +0200 Subject: [PATCH] use newer jj version fix dependencies of homepage --- flake.lock | 62 +++++++++++++++++++++++++--- flake.nix | 5 +++ home/home/default.nix | 2 + home/{modules => home}/jjconfig.toml | 0 home/home/pkgs.nix | 1 + home/modules/git.nix | 3 -- nixos/configurations.nix | 16 +++---- nixos/gorgon/configuration.nix | 2 - outputs.nix | 1 + overlays.nix | 4 ++ 10 files changed, 78 insertions(+), 18 deletions(-) rename home/{modules => home}/jjconfig.toml (100%) diff --git a/flake.lock b/flake.lock index 0ac8fc2..34f28ec 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1655227494, - "narHash": "sha256-GLglKS4pPWOuiFH7e+2c112npURXvehFIT9oB8AOoXc=", + "lastModified": 1695058498, + "narHash": "sha256-YgKWk75O7hIEmNgbTS5WXG+oBas+068grW1hcE37ykc=", "owner": "dadada", "repo": "dadada.li", - "rev": "fa49858d6bc479ab14b5aecdf88c34d3004756fd", + "rev": "30c1ee54d94622da2d582e3767c0baf5abe2cf3f", "type": "github" }, "original": { @@ -121,11 +121,11 @@ "hugo-theme-anubis": { "flake": false, "locked": { - "lastModified": 1626675855, - "narHash": "sha256-Vj77NcXxPOcatDbLvW+d90hsUpYH+2eyhpyXv82ZTts=", + "lastModified": 1693734155, + "narHash": "sha256-/saWnt2ryheBvW9aHqpjAE4aNBhEhkrD62Ch8CI2GvM=", "owner": "mitrichius", "repo": "hugo-theme-anubis", - "rev": "5dab60e04a37896c09a32137aefe821c63b3af04", + "rev": "e4e2c0bc4145ee152a32fdd940ed398ab0b77e6c", "type": "github" }, "original": { @@ -134,6 +134,30 @@ "type": "github" } }, + "jujutsu": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1695053459, + "narHash": "sha256-gQ1ydO1DKhJbXXU7/nbG6HD0zficKu2UHIchNgjNtPw=", + "owner": "martinvonz", + "repo": "jj", + "rev": "39c0f0d2d568adb0149fbe5532b0cf10c52e0a17", + "type": "github" + }, + "original": { + "owner": "martinvonz", + "repo": "jj", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1693701915, @@ -234,12 +258,38 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "homePage": "homePage", + "jujutsu": "jujutsu", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "recipemd": "recipemd" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "jujutsu", + "flake-utils" + ], + "nixpkgs": [ + "jujutsu", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1691719735, + "narHash": "sha256-GhPn5EIhGt7aFwgC6RELZJC7mUIol9O0k7Dsf2Hu0AM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ac9d8b2e9acc153145e6fa3c78f9ba458ae517bf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index e92996e..070c654 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,11 @@ url = "github:NixOS/flake-registry"; flake = false; }; + jujutsu = { + url = "github:martinvonz/jj"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; }; outputs = { ... } @ args: import ./outputs.nix args; diff --git a/home/home/default.nix b/home/home/default.nix index 026afd8..0cf8aa6 100644 --- a/home/home/default.nix +++ b/home/home/default.nix @@ -100,6 +100,8 @@ in sslcacertfile = /etc/ssl/certs/ca-certificates.crt ''; + home.file.".jjconfig.toml".source = ./jjconfig.toml; + # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/home/modules/jjconfig.toml b/home/home/jjconfig.toml similarity index 100% rename from home/modules/jjconfig.toml rename to home/home/jjconfig.toml diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index fefba2f..c04f127 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -62,6 +62,7 @@ with pkgs; [ jameica jc # convert output to json josm + jujutsu jq jq #jupyter diff --git a/home/modules/git.nix b/home/modules/git.nix index a9fbf6c..e7ec38e 100644 --- a/home/modules/git.nix +++ b/home/modules/git.nix @@ -56,8 +56,6 @@ in }; }; - home.file.".jjconfig.toml".source = ./jjconfig.toml; - home.packages = with pkgs; [ delta git-branchless @@ -65,7 +63,6 @@ in gitAndTools.hub gitAndTools.lab gitAndTools.git-absorb - jujutsu meld ]; }; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 6c8f9da..d88868c 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -4,12 +4,16 @@ , home-manager , homePage , nixos-hardware -, recipemd , nixos-generators , ... }@inputs: let - getDefaultPkgs = system: flakes: nixpkgs.lib.mapAttrs (_: value: nixpkgs.lib.getAttr system value.defaultPackage) flakes; + more-packages = system: { + more-packages = final: prev: { + recipemd = inputs.recipemd.packages.${system}.recipemd; + jujutsu = inputs.jujutsu.packages.${system}.jujutsu; + }; + }; nixosSystem = { system ? "x86_64-linux", extraModules ? [ ] }: nixpkgs.lib.nixosSystem { inherit system; @@ -17,7 +21,7 @@ let modules = [{ # Add flakes to registry and nix path. dadada.inputs = inputs // { dadada = self; }; - nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays; + nixpkgs.overlays = nixpkgs.lib.attrValues (self.overlays // (more-packages system)); }] ++ (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules; }; in @@ -28,9 +32,7 @@ in extraModules = [ { nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays; - dadada.pkgs = (getDefaultPkgs system { - inherit recipemd; - }) // self.packages.${system}; + dadada.pkgs = self.packages.${system}; } nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1 @@ -62,7 +64,7 @@ in system = "x86_64-linux"; extraModules = [ { - dadada.homePage.package = homePage.defaultPackage.${system}; + dadada.homePage.package = homePage.packages.${system}.homePage; } ./modules/profiles/server.nix ./surgat/configuration.nix diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 55018e5..420dfc8 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -128,8 +128,6 @@ in environment.systemPackages = with pkgs; [ chromium ghostscript - config.dadada.pkgs.recipemd - config.dadada.pkgs.map cachix ]; diff --git a/outputs.nix b/outputs.nix index ca14c83..94979f0 100644 --- a/outputs.nix +++ b/outputs.nix @@ -9,6 +9,7 @@ , recipemd , agenix , devshell +, jujutsu , ... } @ inputs: (flake-utils.lib.eachDefaultSystem (system: diff --git a/overlays.nix b/overlays.nix index 97be0e4..636893e 100644 --- a/overlays.nix +++ b/overlays.nix @@ -42,4 +42,8 @@ soft-serve = final: prev: { soft-serve = prev.callPackage ./pkgs/soft-serve.nix { }; }; + + map = final: prev: { + map = prev.callPackage ./pkgs/map.nix { }; + }; }