feat: add lua/luau tooling option, reorganize tooling into new folder

uncenter · Jan 19, 2025 · fcc9b66 · fcc9b66
1 parent 66c5c8c
commit fcc9b66
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 9 deletions.
diff --git a/modules/shared/options.nix b/modules/shared/options.nix
@@ -53,21 +53,25 @@ in
         default = cfg.tooling.enable;
       };
 
-      nix.enable = mkEnableOption "Enable Nix tooling" // {
+      gleam.enable = mkEnableOption "Enable Gleam tooling" // {
         default = cfg.tooling.enable;
       };
 
-      rust.enable = mkEnableOption "Enable Rust tooling" // {
+      lua.enable = mkEnableOption "Enable Lua/Luau tooling" // {
         default = cfg.tooling.enable;
       };
 
-      gleam.enable = mkEnableOption "Enable Gleam tooling" // {
+      nix.enable = mkEnableOption "Enable Nix tooling" // {
         default = cfg.tooling.enable;
       };
 
       python.enable = mkEnableOption "Enable Python tooling" // {
         default = cfg.tooling.enable;
       };
+
+      rust.enable = mkEnableOption "Enable Rust tooling" // {
+        default = cfg.tooling.enable;
+      };
     };
   };
 }
diff --git a/users/uncenter/default.nix b/users/uncenter/default.nix
@@ -10,6 +10,7 @@
 
     ./apps
     ./programs
+    ./tooling
   ];
 
   xdg.enable = true;

diff --git a/users/uncenter/packages.nix b/users/uncenter/packages.nix
@@ -45,8 +45,6 @@ in
         go
         jdk17
         maven
-        lua
-        luajitPackages.luarocks
         (taplo.override { withLsp = true; })
         (tree-sitter.override {
           webUISupport = true;

diff --git a/users/uncenter/programs/default.nix b/users/uncenter/programs/default.nix
@@ -10,13 +10,9 @@
     ./fzf.nix
     ./git.nix
     ./glamour.nix
-    ./gleam.nix
     ./helix.nix
     ./izrss.nix
     ./neovim.nix
-    ./nix.nix
-    ./python.nix
-    ./rust.nix
     ./spicetify.nix
     ./starship.nix
     ./taskwarrior.nix

diff --git a/users/uncenter/tooling/default.nix b/users/uncenter/tooling/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./gleam.nix
+    ./lua.nix
+    ./nix.nix
+    ./python.nix
+    ./rust.nix
+  ];
+}
diff --git a/users/uncenter/programs/gleam.nix → users/uncenter/tooling/gleam.nix b/users/uncenter/programs/gleam.nix → users/uncenter/tooling/gleam.nix
diff --git a/users/uncenter/tooling/lua.nix b/users/uncenter/tooling/lua.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}:
+{
+  config = lib.mkIf osConfig.glade.tooling.lua.enable {
+    home.packages = with pkgs; [
+      lua
+      luajitPackages.luarocks
+
+      # Luau
+      luau
+      lune
+      selene
+    ];
+  };
+}
diff --git a/users/uncenter/programs/nix.nix → users/uncenter/tooling/nix.nix b/users/uncenter/programs/nix.nix → users/uncenter/tooling/nix.nix
diff --git a/users/uncenter/programs/python.nix → users/uncenter/tooling/python.nix b/users/uncenter/programs/python.nix → users/uncenter/tooling/python.nix
diff --git a/users/uncenter/programs/rust.nix → users/uncenter/tooling/rust.nix b/users/uncenter/programs/rust.nix → users/uncenter/tooling/rust.nix
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
         ./apps
         ./programs
+        ./tooling
       ];
       xdg.enable = true;
@@ Expand Down @@