Merge branch 'new' of ssh://git.0x76.dev:42/v/infrastructure into new

common/hm-modules/nvim/default.nix

@@ -200,6 +200,9 @@ with lib;
       };
 
       plugins = {
+        dap = {
+          enable = true;
+        };
         image = {
           enable = true;
         };
@@ -276,6 +279,7 @@ with lib;
         treesitter = {
           enable = true;
           nixGrammars = true;
+          settings.highlight.enable = true;
         };
         # surround.enable = true;
         fugitive.enable = true;
@@ -330,9 +334,9 @@ with lib;
           };
           servers = {
             cssls.enable = true;
-            nil-ls.enable = true; #NixOS
+            nil_ls.enable = true; #NixOS
             dockerls.enable = true;
-            rust-analyzer = {
+            rust_analyzer = {
               enable = true;
               installCargo = false;
               installRustc = false;
@@ -353,7 +357,7 @@ with lib;
             elixirls.enable = true;
             clangd.enable = true;
             yamlls.enable = true;
-            lua-ls.enable = true;
+            lua_ls.enable = true;
           };
         };
         trouble.enable = true;

hosts/thalassa/aoife/home/default.nix

@@ -17,13 +17,12 @@
   home.packages = with pkgs; [
     libreoffice-fresh
     jetbrains.rust-rover
-    jetbrains.idea-ultimate
+    jetbrains.clion
+    # jetbrains.idea-ultimate
     eduvpn-client
     localsend
     typst
-    prismlauncher
-    libraw
-    libopenraw
+    zed-editor
   ];
 
 

hosts/thalassa/aoife/uni.nix

@@ -2,15 +2,24 @@
 # * Wireless IoT and Local Area Networks
 # * Network Security
 # * Smart Phone Sensing
+# * PDP
+# * RTS
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [ ];
 
+  hardware.saleae-logic = {
+    enable = true;
+    package = pkgs.saleae-logic-2;
+  };
+
   programs.wireshark = {
     enable = true;
     package = pkgs.wireshark;
   };
 
+  programs.mininet.enable = true;
+
   virtualisation = {
     podman.enable = true;
     # virtualbox.host = {
@@ -22,13 +31,15 @@
     };
   };
 
-
+  users.extraGroups.plugdev = { };
 
   users.extraUsers.vivian.extraGroups = [
     # "wireshark"
     # "docker"
     # "lxd"
-    "vboxusers"
+    # "vboxusers"
+    "plugdev"
+    "dialout"
   ];
 
   programs.nix-ld = {
@@ -41,6 +52,8 @@
 
   # Vivado udev
   services.udev.packages = [
+    pkgs.platformio-core
+    pkgs.openocd
     (pkgs.writeTextFile {
       name = "xilinx-dilligent-usb-udev";
       destination = "/etc/udev/rules.d/52-xilinx-digilent-usb.rules";