From 8ed1633716c8e8e584a73f999707611dd2406dca Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Thu, 7 Sep 2023 17:00:28 -0400
Subject: [PATCH] global/programming -> profiles/programming

---
 modules/global/home-manager.nix                            | 2 +-
 modules/global/programming/lua.nix                         | 5 -----
 modules/global/programming/nim.nix                         | 6 ------
 modules/global/programming/racket.nix                      | 5 -----
 modules/global/programming/zig.nix                         | 6 ------
 {modules/global => users/profiles}/programming/haskell.nix | 2 +-
 {modules/global => users/profiles}/programming/java.nix    | 2 +-
 {modules/global => users/profiles}/programming/kotlin.nix  | 2 +-
 users/profiles/programming/lua.nix                         | 5 +++++
 users/profiles/programming/nim.nix                         | 6 ++++++
 {modules/global => users/profiles}/programming/python.nix  | 2 +-
 users/profiles/programming/racket.nix                      | 5 +++++
 {modules/global => users/profiles}/programming/rust.nix    | 2 +-
 users/profiles/programming/zig.nix                         | 6 ++++++
 14 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 modules/global/programming/lua.nix
 delete mode 100644 modules/global/programming/nim.nix
 delete mode 100644 modules/global/programming/racket.nix
 delete mode 100644 modules/global/programming/zig.nix
 rename {modules/global => users/profiles}/programming/haskell.nix (74%)
 rename {modules/global => users/profiles}/programming/java.nix (59%)
 rename {modules/global => users/profiles}/programming/kotlin.nix (51%)
 create mode 100644 users/profiles/programming/lua.nix
 create mode 100644 users/profiles/programming/nim.nix
 rename {modules/global => users/profiles}/programming/python.nix (77%)
 create mode 100644 users/profiles/programming/racket.nix
 rename {modules/global => users/profiles}/programming/rust.nix (81%)
 create mode 100644 users/profiles/programming/zig.nix

diff --git a/modules/global/home-manager.nix b/modules/global/home-manager.nix
index e36fc6d..59c7de2 100644
--- a/modules/global/home-manager.nix
+++ b/modules/global/home-manager.nix
@@ -25,7 +25,7 @@
           shells.all
           starship
           tmux
-        ];
+        ] ++ builtins.attrValues profiles.programming;
 
         home = {
           stateVersion = config.system.stateVersion;
diff --git a/modules/global/programming/lua.nix b/modules/global/programming/lua.nix
deleted file mode 100644
index 94eadf0..0000000
--- a/modules/global/programming/lua.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, lib, ... }: {
-  environment.systemPackages = with pkgs; lib.lists.flatten [
-    lua-language-server
-  ];
-}
diff --git a/modules/global/programming/nim.nix b/modules/global/programming/nim.nix
deleted file mode 100644
index 6579ab2..0000000
--- a/modules/global/programming/nim.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    nim
-    nimlsp
-  ];
-}
diff --git a/modules/global/programming/racket.nix b/modules/global/programming/racket.nix
deleted file mode 100644
index 3552c39..0000000
--- a/modules/global/programming/racket.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    racket
-  ];
-}
diff --git a/modules/global/programming/zig.nix b/modules/global/programming/zig.nix
deleted file mode 100644
index c553902..0000000
--- a/modules/global/programming/zig.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    zig
-    zls
-  ];
-}
diff --git a/modules/global/programming/haskell.nix b/users/profiles/programming/haskell.nix
similarity index 74%
rename from modules/global/programming/haskell.nix
rename to users/profiles/programming/haskell.nix
index 1bbeeb5..3922b34 100644
--- a/modules/global/programming/haskell.nix
+++ b/users/profiles/programming/haskell.nix
@@ -1,5 +1,5 @@
 { pkgs, lib, ... }: {
-  environment.systemPackages = with pkgs; lib.lists.flatten [
+  home.packages = with pkgs; lib.lists.flatten [
     haskell-language-server
     ghc
     cabal-install
diff --git a/modules/global/programming/java.nix b/users/profiles/programming/java.nix
similarity index 59%
rename from modules/global/programming/java.nix
rename to users/profiles/programming/java.nix
index 9544bcd..67a4a00 100644
--- a/modules/global/programming/java.nix
+++ b/users/profiles/programming/java.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
+  home.packages = with pkgs; [
     openjdk19
     clang-tools
     gradle
diff --git a/modules/global/programming/kotlin.nix b/users/profiles/programming/kotlin.nix
similarity index 51%
rename from modules/global/programming/kotlin.nix
rename to users/profiles/programming/kotlin.nix
index a497a8c..d3c1f43 100644
--- a/modules/global/programming/kotlin.nix
+++ b/users/profiles/programming/kotlin.nix
@@ -1,5 +1,5 @@
 { pkgs, lib, ... }: {
-  environment.systemPackages = with pkgs; lib.lists.flatten [
+  home.packages = with pkgs; lib.lists.flatten [
     kotlin
     kotlin-language-server
   ];
diff --git a/users/profiles/programming/lua.nix b/users/profiles/programming/lua.nix
new file mode 100644
index 0000000..59d19a5
--- /dev/null
+++ b/users/profiles/programming/lua.nix
@@ -0,0 +1,5 @@
+{ pkgs, lib, ... }: {
+  home.packages = with pkgs; lib.lists.flatten [
+    lua-language-server
+  ];
+}
diff --git a/users/profiles/programming/nim.nix b/users/profiles/programming/nim.nix
new file mode 100644
index 0000000..811c0f0
--- /dev/null
+++ b/users/profiles/programming/nim.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nim
+    nimlsp
+  ];
+}
diff --git a/modules/global/programming/python.nix b/users/profiles/programming/python.nix
similarity index 77%
rename from modules/global/programming/python.nix
rename to users/profiles/programming/python.nix
index 51cff31..92974c4 100644
--- a/modules/global/programming/python.nix
+++ b/users/profiles/programming/python.nix
@@ -1,5 +1,5 @@
 { pkgs, lib, ... }: {
-  environment.systemPackages = with pkgs; lib.lists.flatten [
+  home.packages = with pkgs; lib.lists.flatten [
     python310
     (with python310Packages; [
       black
diff --git a/users/profiles/programming/racket.nix b/users/profiles/programming/racket.nix
new file mode 100644
index 0000000..04a5594
--- /dev/null
+++ b/users/profiles/programming/racket.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    racket
+  ];
+}
diff --git a/modules/global/programming/rust.nix b/users/profiles/programming/rust.nix
similarity index 81%
rename from modules/global/programming/rust.nix
rename to users/profiles/programming/rust.nix
index 837c91e..889ebdc 100644
--- a/modules/global/programming/rust.nix
+++ b/users/profiles/programming/rust.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
+  home.packages = with pkgs; [
     (rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
       extensions = [
         "rust-src"
diff --git a/users/profiles/programming/zig.nix b/users/profiles/programming/zig.nix
new file mode 100644
index 0000000..821e4ab
--- /dev/null
+++ b/users/profiles/programming/zig.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    zig
+    zls
+  ];
+}