dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

use newer jj version

Browse source 
fix dependencies of homepage
This commit is contained in:
Tim Schubert 2023-09-18 19:37:49 +02:00
parent 41f3ade99f
commit 703c86352a
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
10 changed files with 78 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

62
flake.lock generated
View file

@ -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,

5
flake.nix
View file

@ -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;

2
home/home/default.nix
View file

@ -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;

0
home/modules/jjconfig.toml → home/home/jjconfig.toml
View file

1
home/home/pkgs.nix
View file

@ -62,6 +62,7 @@ with pkgs; [
jameica
jc # convert output to json
josm
jujutsu
jq
jq
#jupyter

3
home/modules/git.nix
View file

@ -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
];
};

16
nixos/configurations.nix
View file

@ -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

2
nixos/gorgon/configuration.nix
View file

@ -128,8 +128,6 @@ in
environment.systemPackages = with pkgs; [
chromium
ghostscript
config.dadada.pkgs.recipemd
config.dadada.pkgs.map
cachix
];

1
outputs.nix
View file

@ -9,6 +9,7 @@
, recipemd
, agenix
, devshell
, jujutsu
, ...
} @ inputs:
(flake-utils.lib.eachDefaultSystem (system:

4
overlays.nix
View file

@ -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 { };
};
}