2023-11-25

5 files changed, 31 insertions, 27 deletions

diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 3db4393..6c81ce2 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -105,6 +105,9 @@ in {
                     nodePackages.js-beautify # :lang web
                     nodePackages.prettier # :editor format
                     nodePackages.stylelint # :lang web
+                    nodePackages.vscode-css-languageserver-bin # lang (web +lsp)
+                    nodePackages.vscode-html-languageserver-bin # lang (web +lsp)
+                    nodePackages.vscode-json-languageserver-bin # lang (json +lsp)
                     nodejs # :tools debugger
                     pandoc # :lang org markdown latex
                     perl # :term vterm
@@ -127,6 +130,7 @@ in {
                     shellcheck # :lang sh
                     shfmt # :lang sh :editor format
                     sqlite # :lang (org +roam2) :tools lookup
+                    terraform-ls # :tools (terraform +lsp)
                     texlab # lang (tex +lsp)
                     texlive.combined.scheme-full # :lang org tex
                     unzip # :tools debugger
@@ -240,6 +244,8 @@ in {
         };
 
         bash.initExtra = mkAfter ''
+          export PATH="$PATH:$XDG_CONFIG_HOME/emacs/bin"
+
           # https://github.com/akermu/emacs-libvterm
           if [[ "$INSIDE_EMACS" = vterm ]] && [[ -n "$EMACS_VTERM_PATH" ]] && [[ -f "$EMACS_VTERM_PATH/etc/emacs-vterm-bash.sh" ]]; then
               source "$EMACS_VTERM_PATH/etc/emacs-vterm-bash.sh"
diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index 3796fac..f03971f 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -67,7 +67,7 @@
        make
        (pass +auth)
        pdf
-       terraform
+       (terraform +lsp)
        tree-sitter
        upload
 
diff --git a/modules/common/nmap.nix b/modules/common/nmap.nix
index 6c6192c..85beb21 100644
--- a/modules/common/nmap.nix
+++ b/modules/common/nmap.nix
@@ -33,31 +33,27 @@ in {
       systemd.user = {
         services.update-nmap-vulscan-lists = {
           Service = {
-            ExecStart = let
-              pkg = with pkgs;
-                writeShellApplication {
-                  name = "update-nmap-vulscan-lists";
-                  runtimeInputs = [curl];
-                  text = ''
-                    declare -a vulscandbs=(
-                      "cve"
-                      "exploitdb"
-                      "openvas"
-                      "osvdb"
-                      "scipvuldb"
-                      "securityfocus"
-                      "securitytracker"
-                      "xforce"
-                    )
-                    for i in "''${vulscandbs[@]}"; do
-                      ${getExe curl} \
-                        -o "${config.my.home}/.nmap/scripts/vulscan/$i.csv" \
-                        "https://www.computec.ch/projekte/vulscan/download/$i.csv"
-                    done
-                  '';
-                };
-            in
-              getExe pkg;
+            ExecStart = getExe (pkgs.writeShellApplication {
+              name = "update-nmap-vulscan-lists";
+              runtimeInputs = [pkgs.curl];
+              text = ''
+                declare -a vulscandbs=(
+                  "cve"
+                  "exploitdb"
+                  "openvas"
+                  "osvdb"
+                  "scipvuldb"
+                  "securityfocus"
+                  "securitytracker"
+                  "xforce"
+                )
+                for i in "''${vulscandbs[@]}"; do
+                  curl \
+                    -o "${config.my.home}/.nmap/scripts/vulscan/$i.csv" \
+                    "https://www.computec.ch/projekte/vulscan/download/$i.csv"
+                done
+              '';
+            });
           };
         };
 
diff --git a/modules/common/profiles/dev/containers.nix b/modules/common/profiles/dev/containers.nix
index 027c685..d9b67d0 100644
--- a/modules/common/profiles/dev/containers.nix
+++ b/modules/common/profiles/dev/containers.nix
@@ -15,7 +15,6 @@ in {
 
   config = mkIf cfg.enable {
     nixfiles.modules.common.shell.aliases = {
-      b = "buildah";
       h = "helm";
       k = "kubectl";
       kns = "kubens";
diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix
index 2d0c0f6..822778f 100644
--- a/modules/common/profiles/dev/default.nix
+++ b/modules/common/profiles/dev/default.nix
@@ -17,6 +17,7 @@ in {
 
   config = mkIf cfg.enable {
     nixfiles.modules = {
+      common.nix.allowedUnfreePackages = ["terraform"];
       bat.enable = true;
       curl.enable = true;
       direnv.enable = true;
@@ -89,6 +90,8 @@ in {
         sops
         httpie
         logcli
+        terraform
+        opentofu
       ];
     };
   };