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

This commit is contained in:
Vivian 2024-11-22 11:12:19 +01:00
commit cdf9881428
3 changed files with 25 additions and 9 deletions

View file

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

View file

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

View file

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