Skip to content
Merged

sync #10

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 28 additions & 12 deletions nix-darwin/home-modules/languages/jsts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,36 @@
description = "Enables js and ts lsp";
default = false;
};

jsts.vue.enable = lib.mkOption {
type = lib.types.bool;
description = "Enables vue/nuxt framework";
default = false;
};

jsts.svelte.enable = lib.mkOption {
type = lib.types.bool;
description = "Enables svelte framework";
default = false;
};
};

config = lib.mkIf config.jsts.lsp.enable {
home.packages = with pkgs; [
nodejs_18
yarn
corepack
nodePackages.typescript-language-server
nodePackages.typescript
nodePackages.prettier # still have to install globally npm i -g prettier
nodePackages.eslint
emacsPackages.import-js
vue-language-server # npm install -g volar
svelte-language-server # npm install -g svelte-language-server
];
home.packages =
with pkgs;
[
nodejs_18
yarn
corepack
nodePackages.typescript-language-server
nodePackages.typescript
nodePackages.prettier # still have to install globally npm i -g prettier
nodePackages.eslint
emacsPackages.import-js
vue-language-server # npm install -g volar
svelte-language-server # npm install -g svelte-language-server
]
++ (if config.jsts.vue.enable then [ nodePackages_latest.vls ] else [ ])
++ (if config.jsts.svelte.enable then [ svelte-language-server ] else [ ]);
};
}
9 changes: 5 additions & 4 deletions nix-darwin/users/henri.vandersleyen/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
inputs,
...
}:
# https://daiderd.com/nix-darwin/manual/index.html
{
imports = [
# ./modules/services/appleTouchId.nix
Expand Down Expand Up @@ -42,12 +43,8 @@
shell = pkgs.nushell;
};
home-manager.backupFileExtension = "backup";
# fonts.enableFontDir = true;
fonts.packages = with pkgs; [
jetbrains-mono
# nerd-font-patcher
# recursive
# (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
];

environment = {
Expand All @@ -63,12 +60,16 @@
security.sudo.extraConfig = ''
Defaults timestamp_timeout=3600
'';

# Homebrew needs to be installed on its own!
homebrew = {
enable = true;
casks = [
"rectangle"
"iterm2"
"dive"
"postman"
"aws-sam-cli"
# "nikitabobko/tap/aerospace" # not vetted on work laptop
];
brews = [
Expand Down
3 changes: 2 additions & 1 deletion nix-darwin/users/henri.vandersleyen/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
git = {
# userEmail = config.sops.secrets."knak/email".path;
userEmail = "henri.vandersleyen@knak.com";
userName = config.sops.secrets."knak/git/userName".path;
# userName = config.sops.secrets."knak/git/userName".path;
userName = "vancycles-knak";
signingKey = config.sops.secrets."knak/git/keyName".path;
};

Expand Down