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

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";

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";
+      };
     };
   };
 }

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,
+-- }

rsc/config/nvim/plugins.lua

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