Skip to content

Commit 1daf1f8

Browse files
committed
flake: update lockfile
1 parent 43224c6 commit 1daf1f8

File tree

6 files changed

+103
-23
lines changed

6 files changed

+103
-23
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/parts/default.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
...
1818
}:
1919
{
20-
_module.args = rec {
20+
_module.args = {
2121
# nix the package manager configuration
2222
nix = import ./nix-settings.nix {
2323
inherit lib inputs inputs';
@@ -65,9 +65,7 @@
6565
;
6666

6767
home-manager = inputs'.home.packages.home-manager.override { path = "${inputs.home}"; };
68-
6968
man-pages = if pkgs.stdenv.isLinux then pkgs.man-pages else self'.packages.man-pages-xnu;
70-
7169
gnu-coreutils = if pkgs.stdenv.isLinux then pkgs.coreutils else pkgs.coreutils-prefixed;
7270
};
7371
};

modules/shared/home-manager/vcs.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
config,
33
lib,
44
pkgs,
5+
self',
56
...
67
}:
78

@@ -42,6 +43,8 @@
4243

4344
jujutsu = {
4445
enable = config.programs.git.enable;
46+
#package = self'.packages.jujutsu.overrideAttrs { doCheck = false; };
47+
4548
settings = {
4649
core.fsmonitor = "watchman";
4750
format.tree-level-conflicts = true;

packages/flake.lock

Lines changed: 90 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
nixpkgs-f2k.url = "github:moni-dz/nixpkgs-f2k";
99
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
1010
nvim.url = "github:nix-community/neovim-nightly-overlay";
11+
jj.url = "github:jj-vcs/jj";
1112

1213
nixpkgs-f2k.inputs.nixpkgs.follows = "nixpkgs";
1314
nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
1415
nvim.inputs.nixpkgs.follows = "nixpkgs";
16+
jj.inputs.nixpkgs.follows = "nixpkgs";
1517
};
1618
}

packages/module.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ in
3333
_module.args.pkgs = pkgsFrom system;
3434
packages = removeAttrs (self.overlays.default pkgs pkgs) [ "lib" ] // {
3535
inherit (inputs'.nixpkgs-f2k.packages) iosevka-ft-bin iosevka-ft-qp-bin;
36-
36+
inherit (inputs'.jj.packages) jujutsu;
3737
inherit (inputs'.nvim.packages) neovim;
3838
};
3939
};

0 commit comments

Comments
 (0)