Skip to content

Commit

Permalink
Some more updates
Browse files Browse the repository at this point in the history
  • Loading branch information
lucperkins committed Oct 23, 2024
1 parent 1d6fa08 commit 02dedae
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 112 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ jobs:
permissions:
id-token: write
contents: read

148 changes: 39 additions & 109 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
inputs = {
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
fh = { url = "https://flakehub.com/f/DeterminateSystems/fh/*"; inputs.nixpkgs.follows = "nixpkgs"; };
h = { url = "https://flakehub.com/f/zimbatm/h/*"; inputs.nixpkgs.follows = "nixpkgs"; };
jelly = { url = "github:lucperkins/jelly"; inputs.nixpkgs.follows = "nixpkgs"; };
fenix = { url = "https://flakehub.com/f/nix-community/fenix/0.1.*"; inputs.nixpkgs.follows = "nixpkgs"; };
flake-checker = { url = "https://flakehub.com/f/DeterminateSystems/flake-checker/*"; inputs.nixpkgs.follows = "nixpkgs"; };
Expand All @@ -13,7 +14,6 @@
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2405.*";
nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*";
nuenv = { url = "https://flakehub.com/f/DeterminateSystems/nuenv/0.1.*"; inputs.nixpkgs.follows = "nixpkgs"; };
uuidv7 = { url = "git+ssh://[email protected]/DeterminateSystems/uuidv7.git"; inputs.nixpkgs.follows = "nixpkgs"; };
};

outputs = inputs:
Expand Down Expand Up @@ -74,7 +74,6 @@
fh = inputs.fh.packages.${system}.default;
flake-checker = inputs.flake-checker.packages.${system}.default;
jelly = inputs.jelly.packages.${system}.default;
uuidv7 = inputs.uuidv7.packages.${system}.default;
rustToolchain = with inputs.fenix.packages.${system};
combine (with stable; [
cargo
Expand All @@ -93,6 +92,7 @@
modules = [
{ system.stateVersion = 1; }
inputs.determinate.darwinModules.default
inputs.h.darwinModules.default
inputs.self.darwinModules.base
inputs.self.darwinModules.caching
inputs.home-manager.darwinModules.home-manager
Expand Down
3 changes: 2 additions & 1 deletion home-manager/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ let
]));

jsTools = (with pkgs; [
biome
bun
deno
] ++ (with nodePackages; [
Expand Down Expand Up @@ -89,7 +90,7 @@ let
process-compose
protobuf
reattach-to-user-namespace # for tmux
uuidv7
vector
yt-dlp
];

Expand Down
3 changes: 3 additions & 0 deletions home-manager/vscode.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ in
# Extensions not in Nixpkgs
(ext "andrejunges" "Handlebars" "0.4.1" "sha256-Rwhr9X3sjDm6u/KRYE2ucCJSlZwsgUJbH/fdq2WZ034=")
(ext "astro-build" "astro-vscode" "2.8.5" "sha256-mP+MKHDirgemcexSCof/Be7YN2FTXwOnGQHnmtKLgtM=")
(ext "biomejs" "biome" "2024.10.131712" "sha256-wslaPz0YwavLgP/gLXDIKsk2dvVmFgkSDCI9OfpKwwI=")
(ext "oven" "bun-vscode" "0.0.12" "sha256-8+Fqabbwup6Jzm5m8GlWbxTqumqXtWAw5s3VaDht9Us=")
(ext "b4dM4n" "nixpkgs-fmt" "0.0.1" "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=")
(ext "enkia" "tokyo-night" "1.0.6" "sha256-VWdUAU6SC7/dNDIOJmSGuIeffbwmcfeGhuSDmUE7Dig=")
Expand All @@ -49,11 +50,13 @@ in
(ext "mkhl" "direnv" "0.17.0" "sha256-9sFcfTMeLBGw2ET1snqQ6Uk//D/vcD9AVsZfnUNrWNg=")
(ext "ms-vscode" "vscode-typescript-next" "5.4.20231127" "sha256-UVuYggzeWyQTmQxXdM4sT78FUOtYGKD4SzREntotU5g=")
(ext "nefrob" "vscode-just-syntax" "0.3.0" "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518=")
(ext "nickgo" "cuelang" "0.0.1" "sha256-dAMV1SQUSuq2nze5us6/x1DGYvxzFz3021++ffQoafI=")
(ext "Ph0enixKM" "amber-language" "1.2.6" "sha256-Uxw6v8tc12haqgBFaTogEHEkzCYg+mzoIhCCZ6cyeX0=")
(ext "PKief" "material-icon-theme" "4.32.0" "sha256-6I9/nWv449PgO1tHJbLy/wxzG6BQF6X550l3Qx0IWpw=")
(ext "teabyii" "ayu" "1.0.5" "sha256-+IFqgWliKr+qjBLmQlzF44XNbN7Br5a119v9WAnZOu4=")
(ext "vue" "volar" "2.0.11" "sha256-EyULg2yS/aqf0ipUQKFjW1WJIHECr26/JIQ+UuTPSLk=")
(ext "whizkydee" "material-palenight-theme" "2.0.3" "sha256-qz2pz9JlnO2OV3eJnRqzbcic1lzpl0ViygwhNjZOWpI=")
(ext "svelte" "svelte-vscode" "109.1.0" "sha256-ozD9k/zfklwBJtc1WdC52hgJckxBgVRmcZOwSYboACM=")
];

globalSnippets = { };
Expand Down

0 comments on commit 02dedae

Please sign in to comment.