Skip to content

Commit 2c870c5

Browse files
committed
1 parent e840275 commit 2c870c5

File tree

2 files changed

+61
-52
lines changed

2 files changed

+61
-52
lines changed

flake.nix

+17-13
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,22 @@
1212
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
1313
};
1414

15-
outputs = inputs@{ darwin, home-manager, nix-vscode-extensions, ... }: {
16-
darwinConfigurations."Olivers-MacBook-Pro" = darwin.lib.darwinSystem {
17-
modules = [
18-
./darwin.nix
19-
home-manager.darwinModules.home-manager
20-
{
21-
home-manager.useGlobalPkgs = true;
22-
home-manager.useUserPackages = true;
23-
home-manager.users.oliver = import ./home.nix;
24-
home-manager.extraSpecialArgs = { inherit nix-vscode-extensions; };
25-
}
26-
];
15+
outputs =
16+
inputs@{ darwin, home-manager, nixpkgs, nix-vscode-extensions, ... }: {
17+
darwinConfigurations."Olivers-MacBook-Pro" = darwin.lib.darwinSystem {
18+
modules = [
19+
./darwin.nix
20+
home-manager.darwinModules.home-manager
21+
{
22+
home-manager.useGlobalPkgs = true;
23+
home-manager.useUserPackages = true;
24+
home-manager.users.oliver = import ./home.nix;
25+
home-manager.extraSpecialArgs = {
26+
inherit nixpkgs;
27+
inherit nix-vscode-extensions;
28+
};
29+
}
30+
];
31+
};
2732
};
28-
};
2933
}

home.nix

+44-39
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
{ pkgs, nix-vscode-extensions, ... }:
2-
3-
{
1+
{ pkgs, nixpkgs, nix-vscode-extensions, ... }:
2+
let
3+
pkgs-ext = import nixpkgs {
4+
inherit (pkgs) system;
5+
config.allowUnfree = true;
6+
overlays = [ nix-vscode-extensions.overlays.default ];
7+
};
8+
vscode-marketplace = pkgs-ext.vscode-marketplace;
9+
in {
410
home.username = "oliver";
511
home.homeDirectory = "/Users/oliver";
612

@@ -322,42 +328,41 @@
322328
};
323329
profiles = {
324330
default = {
325-
extensions =
326-
with nix-vscode-extensions.extensions.aarch64-darwin.vscode-marketplace; [
327-
albert.tabout
328-
# or
329-
# OnlyLys.leaper
330-
ast-grep.ast-grep-vscode
331-
bierner.markdown-mermaid
332-
biomejs.biome
333-
cardinal90.multi-cursor-case-preserve
334-
codespaces-contrib.codeswing
335-
# https://github.com/danvk/any-xray/issues/18
336-
# danvk.any-xray
337-
dbaeumer.vscode-eslint
338-
dbankier.vscode-quick-select
339-
esbenp.prettier-vscode
340-
fastly.vscode-fastly-vcl
341-
github.copilot
342-
github.copilot-chat
343-
github.vscode-pull-request-github
344-
hashicorp.terraform
345-
jnoortheen.nix-ide
346-
jq-syntax-highlighting.jq-syntax-highlighting
347-
matsuyanagi.copy-code-block
348-
mikestead.dotenv
349-
ms-playwright.playwright
350-
ms-vsliveshare.vsliveshare
351-
orta.vscode-jest
352-
orta.vscode-twoslash-queries
353-
stkb.rewrap
354-
streetsidesoftware.code-spell-checker
355-
sysoev.vscode-open-in-github
356-
tamasfe.even-better-toml
357-
timonwong.shellcheck
358-
vsls-contrib.gistfs
359-
wmaurer.change-case
360-
];
331+
extensions = with vscode-marketplace; [
332+
albert.tabout
333+
# or
334+
# OnlyLys.leaper
335+
ast-grep.ast-grep-vscode
336+
bierner.markdown-mermaid
337+
biomejs.biome
338+
cardinal90.multi-cursor-case-preserve
339+
codespaces-contrib.codeswing
340+
# https://github.com/danvk/any-xray/issues/18
341+
# danvk.any-xray
342+
dbaeumer.vscode-eslint
343+
dbankier.vscode-quick-select
344+
esbenp.prettier-vscode
345+
fastly.vscode-fastly-vcl
346+
github.copilot
347+
github.copilot-chat
348+
github.vscode-pull-request-github
349+
hashicorp.terraform
350+
jnoortheen.nix-ide
351+
jq-syntax-highlighting.jq-syntax-highlighting
352+
matsuyanagi.copy-code-block
353+
mikestead.dotenv
354+
ms-playwright.playwright
355+
ms-vsliveshare.vsliveshare
356+
orta.vscode-jest
357+
orta.vscode-twoslash-queries
358+
stkb.rewrap
359+
streetsidesoftware.code-spell-checker
360+
sysoev.vscode-open-in-github
361+
tamasfe.even-better-toml
362+
timonwong.shellcheck
363+
vsls-contrib.gistfs
364+
wmaurer.change-case
365+
];
361366
};
362367
};
363368
};

0 commit comments

Comments
 (0)