Skip to content

Commit fe1acf0

Browse files
committedAug 28, 2024
⬆️ from 24.05 to unstable
1 parent b007db6 commit fe1acf0

File tree

6 files changed

+25
-19
lines changed

6 files changed

+25
-19
lines changed
 

‎flake.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+9-8
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#];
1111

1212
# nix communitys cache server
13-
extra-substituters = [
14-
"https://hadolint.cachix.org"
15-
];
16-
extra-trusted-public-keys = [
17-
"hadolint.cachix.org-1:CdmLJ7MXh5ojKBPUQGYklkbetIdIcC8tgOTGRUnxBjo="
18-
];
13+
# extra-substituters = [
14+
# "https://hadolint.cachix.org"
15+
# ];
16+
# extra-trusted-public-keys = [
17+
# "hadolint.cachix.org-1:CdmLJ7MXh5ojKBPUQGYklkbetIdIcC8tgOTGRUnxBjo="
18+
# ];
1919
};
2020

2121
outputs = inputs @ {
@@ -206,7 +206,7 @@
206206
};
207207

208208
inputs = {
209-
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
209+
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
210210
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
211211
# darwin
212212
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
@@ -217,7 +217,8 @@
217217
};
218218

219219
home-manager = {
220-
url = "github:nix-community/home-manager/release-24.05";
220+
#url = "github:nix-community/home-manager/release-24.05";
221+
url = "github:nix-community/home-manager/master";
221222
inputs.nixpkgs.follows = "nixpkgs";
222223
};
223224

‎home/apps/neovim/packages.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ripgrep
1313

1414
#-- python
15-
nodePackages.pyright
15+
pyright
1616
(python311.withPackages (
1717
ps:
1818
with ps; [

‎home/base/core/core.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
# nix tool
1414
# https://github.com/nix-community/nix-melt
15-
nix-melt # A TUI flake.lock viewer
15+
# nix-melt # A TUI flake.lock viewer
1616
# https://github.com/utdemir/nix-tree
1717
nix-tree # A TUI to visualize the dependency graph of a nix derivation
1818
nix-prefetch-git

‎justfile

+5
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ gc duration="7d" *args="":
4949
@nix-collect-garbage --delete-older-than {{ duration }} {{args}}
5050
@sudo nix-collect-garbage --delete-older-than {{ duration }} {{args}}
5151

52+
# 清理所有
53+
gc-all:
54+
@nix-collect-garbage -d
55+
@sudo nix-collect-garbage -d
56+
5257
# 生成镜像
5358
[linux]
5459
gen-image host format:

‎overlays/maven.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ _: let
22
javaVersion = 17;
33
in (_slef: super: {
44
maven = super.maven.override {
5-
jdk = super."jdk${toString javaVersion}";
5+
jdk_headless = super."jdk${toString javaVersion}_headless";
66
};
77
})

0 commit comments

Comments
 (0)
Please sign in to comment.