Merge branch 'main' of github.com:GHOSCHT/nix-config

This commit is contained in:
GHOSCHT 2023-11-28 19:50:33 +01:00
commit bcbc866a42
4 changed files with 47 additions and 17 deletions

View file

@ -11,16 +11,37 @@ in {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions;
catppuccin.catppuccin-vsc [
pkief.material-icon-theme catppuccin.catppuccin-vsc
vscodevim.vim pkief.material-icon-theme
bbenoist.nix vscodevim.vim
ms-python.python bbenoist.nix
ms-toolsai.jupyter ms-python.python
ms-toolsai.jupyter-renderers ms-toolsai.jupyter
ms-toolsai.jupyter-keymap ms-toolsai.jupyter-renderers
]; ms-toolsai.jupyter-keymap
]
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "remote-ssh-edit";
publisher = "ms-vscode-remote";
version = "0.47.2";
sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
}
{
name = "cpptools";
publisher = "ms-vscode";
version = "1.19.1";
sha256 = "sha256-yUZTLnN4nomFp5I0VgRz7rRMkeMU9QzY+dzEdUUASek=";
}
{
name = "camkes-syntax-highlighting";
publisher = "hensoldt-cyber-gmbh";
version = "1.1.3";
sha256 = "sha256-dRhsFGSjR/Vp5aJgMDwCZQtwmmfNXbM85ViTIq5ORwY=";
}
];
userSettings = { userSettings = {
#Theming #Theming
"workbench.colorTheme" = "Catppuccin Mocha"; "workbench.colorTheme" = "Catppuccin Mocha";

View file

@ -21,6 +21,12 @@
slp = "systemctl suspend"; slp = "systemctl suspend";
sdn = "shutdown 0"; sdn = "shutdown 0";
}; };
shellAbbrs = {
hx = "~/Documents/heliox-cli/target/debug/heliox-cli --mode";
build = "bash sdk/scripts/open_trentos_build_env.sh sdk/build-system.sh sdk/demos/demo_hello_world rpi3 build-rpi3-Debug-demo_hello_world -DCMAKE_BUILD_TYPE=Debug";
simbuild = "bash sdk/scripts/open_trentos_build_env.sh sdk/build-system.sh sdk/demos/demo_hello_world zynq7000 build-zynq7000-Debug-demo_hello_world -DCMAKE_BUILD_TYPE=Debug";
sim = "sudo bash ../sdk/scripts/open_trentos_test_env.sh ./simulate";
};
}; };
}; };
} }

View file

@ -17,10 +17,10 @@ lspconfig.rnix.setup({
filetypes = {"nix"}, filetypes = {"nix"},
}) })
lspconfig.clangd.setup { -- lspconfig.clangd.setup {
on_attach = function(client, bufnr) -- on_attach = function(client, bufnr)
client.server_capabilities.signatureHelpProvider = false -- client.server_capabilities.signatureHelpProvider = false
on_attach(client, bufnr) -- on_attach(client, bufnr)
end, -- end,
capabilities = capabilities, -- capabilities = capabilities,
} -- }

View file

@ -181,6 +181,9 @@ local plugins = {
"typescript", "typescript",
"nix", "nix",
"rust", "rust",
"c",
"cmake",
"gitignore",
} }
} }
}, },