Better organized development configurations

baldur/hm.nix

@@ -12,14 +12,13 @@
   imports = [
     ../hm_modules/__basic.nix
 
-    # ../hm_modules/cpp.nix
+    # ../hm_modules/development/cpp.nix
-    # ../hm_modules/data_analysis.nix
+    # ../hm_modules/development/data.nix
-    # ../hm_modules/go.nix
+    # ../hm_modules/development/go.nix
-    # ../hm_modules/java.nix
+    # ../hm_modules/development/javascript.nix
-    # ../hm_modules/javascript.nix
+    # ../hm_modules/development/latex.nix
-    # ../hm_modules/latex.nix
+    # ../hm_modules/development/python.nix
-    # ../hm_modules/python.nix
+    # ../hm_modules/development/rust.nix
-    # ../hm_modules/rust.nix
 
     # ../hm_modules/fonts.nix
     ../hm_modules/helix.nix

hm_modules/__basic.nix

@@ -9,7 +9,6 @@
       mmv-go
       neofetch
       nixos-option
-      nix-tree
       pv
       ripgrep
       unrar

hm_modules/cpp.nix

@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ clang-tools ]; }

hm_modules/data_analysis.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    nodePackages.vscode-langservers-extracted
-    yaml-language-server
-  ];
-}

hm_modules/development/cpp.nix

@@ -0,0 +1 @@
+{ pkgs, config, lib, ... }: { home.packages = with pkgs; lib.optionals config.programs.helix.enable [ clang-tools cmake-language-server ]; }

hm_modules/development/data.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, lib, ... }: {
+  home.packages = with pkgs; lib.optionals config.programs.helix.enable [
+    nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
+    yaml-language-server # YAML
+    taplo-cli # TOML
+  ];
+}

hm_modules/development/docker.nix

@@ -0,0 +1,9 @@
+{ pkgs, config, lib, ... }: {
+  home.packages = with pkgs; [
+    docker-compose
+    docker-machine
+  ] ++ lib.optionals config.programs.helix.enable [
+    nodePackages.dockerfile-language-server-nodejs
+  ];
+}
+

hm_modules/development/javascript.nix

@@ -0,0 +1,2 @@
+{ pkgs, lib, config, ... }: { home.packages = with pkgs; lib.optionals config.programs.helix.enable [ nodePackages.typescript-language-server ]; }
+

hm_modules/development/nix.nix

@@ -0,0 +1,10 @@
+{ pkgs, config, lib, ... }: {
+  home.packages = with pkgs; [
+    nixpkgs-fmt
+    nix-prefetch-scripts
+    nix-review
+    nix-tree
+  ] ++ lib.optionals config.programs.helix.enable [
+    nil
+  ];
+}      

hm_modules/development/rust.nix

@@ -0,0 +1,3 @@
+{ pkgs, lib, config, ... }: {
+  home.packages = with pkgs; [ bacon cargo clippy rustfmt ] ++ (lib.optionals config.programs.helix.enable [ rust-analyzer ]);
+}

hm_modules/javascript.nix

@@ -1,2 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ flow ]; }
-

hm_modules/rust.nix

@@ -1,3 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ bacon cargo clippy rust-analyzer rustfmt ];
-}

loki/configuration.nix

@@ -420,6 +420,9 @@ with lib; {
       }];
       esphome = { };
       frontend = { };
+      google_assistant = {
+        project_id = "light-cathode-372118";
+      };
       history = { };
       logbook = { };
       # logger.default = "debug";

loki/hm.nix

@@ -28,7 +28,6 @@
       file
       htop
       neofetch
-      nix-prefetch-scripts
       ripgrep
       wget
       xclip
@@ -38,14 +37,14 @@
   imports = [
     ../hm_modules/__basic.nix
 
-    # ../hm_modules/cpp.nix
+    # ../hm_modules/development/cpp.nix
-    ../hm_modules/data_analysis.nix
+    ../hm_modules/development/data.nix
-    # ../hm_modules/go.nix
+    # ../hm_modules/development/go.nix
-    # ../hm_modules/java.nix
+    # ../hm_modules/development/javascript.nix
-    # ../hm_modules/javascript.nix
+    # ../hm_modules/development/latex.nix
-    # ../hm_modules/latex.nix
+    # ../hm_modules/development/nix.nix
-    # ../hm_modules/python.nix
+    # ../hm_modules/development/python.nix
-    # ../hm_modules/rust.nix
+    # ../hm_modules/development/rust.nix
 
     ../hm_modules/fonts.nix
     ../hm_modules/bash.nix
@@ -71,6 +70,7 @@
     ../hm_modules/tmux.nix
     ../hm_modules/zoxide.nix
     ../hm_modules/zsh.nix
+
     ../hm_modules/shell_aliases.nix
   ];
 

odin/hm.nix

@@ -12,8 +12,6 @@
       cava
       discord
       dmenu
-      docker-compose
-      docker-machine
       droidcam
       easyeffects
       # element-desktop # matrix client
@@ -44,7 +42,6 @@
       mendeley
       # minecraft
       # mycrypto
-      nix-prefetch-scripts
       obsidian
       openvpn
       p7zip
@@ -91,14 +88,16 @@
   imports = [
     ../hm_modules/__basic.nix
 
-    ../hm_modules/cpp.nix
+    ../hm_modules/development/cpp.nix
-    ../hm_modules/data_analysis.nix
+    ../hm_modules/development/data.nix
-    # ../hm_modules/go.nix
+    ../hm_modules/development/docker.nix
-    # ../hm_modules/java.nix
+    # ../hm_modules/development/go.nix
-    ../hm_modules/javascript.nix
+    ../hm_modules/development/javascript.nix
-    ../hm_modules/latex.nix
+    ../hm_modules/development/kubernetes.nix
-    ../hm_modules/python.nix
+    ../hm_modules/development/latex.nix
-    ../hm_modules/rust.nix
+    ../hm_modules/development/nix.nix
+    ../hm_modules/development/python.nix
+    ../hm_modules/development/rust.nix
 
     ../hm_modules/alacritty.nix
     ../hm_modules/autorandr.nix
@@ -118,7 +117,6 @@
     # ../hm_modules/keepassxc.nix
     ../hm_modules/kdeconnect.nix
     ../hm_modules/kitty.nix
-    ../hm_modules/kubernetes-admin.nix
     ../hm_modules/lf.nix
     ../hm_modules/libinput-gestures.nix
     ../hm_modules/lsd.nix

thor/hm.nix

@@ -45,7 +45,6 @@
       mendeley
       # minecraft
       # mycrypto
-      nix-prefetch-scripts
       obsidian
       openvpn
       p7zip
@@ -82,14 +81,15 @@
   imports = [
     ../hm_modules/__basic.nix
 
-    ../hm_modules/cpp.nix
+    ../hm_modules/development/cpp.nix
-    ../hm_modules/data_analysis.nix
+    ../hm_modules/development/data.nix
-    # ../hm_modules/go.nix
+    # ../hm_modules/development/go.nix
-    # ../hm_modules/java.nix
+    ../hm_modules/development/javascript.nix
-    ../hm_modules/javascript.nix
+    ../hm_modules/development/kubernetes.nix
-    ../hm_modules/latex.nix
+    ../hm_modules/development/latex.nix
-    ../hm_modules/python.nix
+    ../hm_modules/development/nix.nix
-    ../hm_modules/rust.nix
+    ../hm_modules/development/python.nix
+    ../hm_modules/development/rust.nix
 
     ../hm_modules/alacritty.nix
     ../hm_modules/autorandr.nix
@@ -109,7 +109,6 @@
     ../hm_modules/kdeconnect.nix
     # ../hm_modules/keepassxc.nix
     ../hm_modules/kitty.nix
-    ../hm_modules/kubernetes-admin.nix
     ../hm_modules/lf.nix
     ../hm_modules/lsd.nix
     ../hm_modules/mangohud.nix