From ac3622102be1bb0891c20f23c22938cc264aaf6f Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 26 Nov 2023 16:38:38 +0100 Subject: [PATCH 1/3] Add TrentOS VSCode extensions --- modules/coding/vscode.nix | 41 +++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/modules/coding/vscode.nix b/modules/coding/vscode.nix index ab4033a..8a33c9d 100644 --- a/modules/coding/vscode.nix +++ b/modules/coding/vscode.nix @@ -11,16 +11,37 @@ in { enable = true; package = pkgs.vscodium; enableUpdateCheck = false; - extensions = with pkgs.vscode-extensions; [ - catppuccin.catppuccin-vsc - pkief.material-icon-theme - vscodevim.vim - bbenoist.nix - ms-python.python - ms-toolsai.jupyter - ms-toolsai.jupyter-renderers - ms-toolsai.jupyter-keymap - ]; + extensions = with pkgs.vscode-extensions; + [ + catppuccin.catppuccin-vsc + pkief.material-icon-theme + vscodevim.vim + bbenoist.nix + ms-python.python + ms-toolsai.jupyter + 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 = { #Theming "workbench.colorTheme" = "Catppuccin Mocha"; From 6189904d9bf3e04a5c86423226fc28bea19fc949 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 26 Nov 2023 16:38:50 +0100 Subject: [PATCH 2/3] Adapt Neovim for TrentOS --- rsc/config/nvim/configs/lspconfig.lua | 14 +++++++------- rsc/config/nvim/plugins.lua | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rsc/config/nvim/configs/lspconfig.lua b/rsc/config/nvim/configs/lspconfig.lua index 02b61c1..e9515a4 100644 --- a/rsc/config/nvim/configs/lspconfig.lua +++ b/rsc/config/nvim/configs/lspconfig.lua @@ -17,10 +17,10 @@ lspconfig.rnix.setup({ filetypes = {"nix"}, }) -lspconfig.clangd.setup { - on_attach = function(client, bufnr) - client.server_capabilities.signatureHelpProvider = false - on_attach(client, bufnr) - end, - capabilities = capabilities, -} +-- lspconfig.clangd.setup { +-- on_attach = function(client, bufnr) +-- client.server_capabilities.signatureHelpProvider = false +-- on_attach(client, bufnr) +-- end, +-- capabilities = capabilities, +-- } diff --git a/rsc/config/nvim/plugins.lua b/rsc/config/nvim/plugins.lua index 219c1a0..b9f4083 100644 --- a/rsc/config/nvim/plugins.lua +++ b/rsc/config/nvim/plugins.lua @@ -181,6 +181,9 @@ local plugins = { "typescript", "nix", "rust", + "c", + "cmake", + "gitignore", } } }, From 3e69c9ce8fe56a70ac32a8c09fe752f266307f0c Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sun, 26 Nov 2023 16:39:11 +0100 Subject: [PATCH 3/3] Add TrentOS shell abbreviations --- modules/shell/fish.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/shell/fish.nix b/modules/shell/fish.nix index 15e12db..9f86155 100644 --- a/modules/shell/fish.nix +++ b/modules/shell/fish.nix @@ -21,6 +21,12 @@ slp = "systemctl suspend"; 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"; + }; }; }; }