Merge pull request #94 from ryan4yin/add-develop-env-for-ruby

feat: add develop environment for ruby
ryan4yin · Mar 13, 2024 · 1c65d16 · 1c65d16
2 parents bcc8d23 + 4d3a375
commit 1c65d16
Show file tree

Hide file tree

Showing 67 changed files with 54 additions and 31 deletions.
diff --git a/home/base/server/btop.nix → home/base/core/btop.nix b/home/base/server/btop.nix → home/base/core/btop.nix
diff --git a/home/base/server/container.nix → home/base/core/container.nix b/home/base/server/container.nix → home/base/core/container.nix
diff --git a/home/base/server/core.nix → home/base/core/core.nix b/home/base/server/core.nix → home/base/core/core.nix
diff --git a/home/base/desktop/default.nix → home/base/core/default.nix b/home/base/desktop/default.nix → home/base/core/default.nix
diff --git a/home/base/server/editors/README.md → home/base/core/editors/README.md b/home/base/server/editors/README.md → home/base/core/editors/README.md
diff --git a/home/base/desktop/editors/default.nix → home/base/core/editors/default.nix b/home/base/desktop/editors/default.nix → home/base/core/editors/default.nix
diff --git a/home/base/server/editors/helix/default.nix → home/base/core/editors/helix/default.nix b/home/base/server/editors/helix/default.nix → home/base/core/editors/helix/default.nix
diff --git a/home/base/server/editors/neovim/default.nix → home/base/core/editors/neovim/default.nix b/home/base/server/editors/neovim/default.nix → home/base/core/editors/neovim/default.nix
diff --git a/home/base/server/git.nix → home/base/core/git.nix b/home/base/server/git.nix → home/base/core/git.nix
diff --git a/home/base/server/pip.nix → home/base/core/pip.nix b/home/base/server/pip.nix → home/base/core/pip.nix
diff --git a/home/base/server/shells/config.nu → home/base/core/shells/config.nu b/home/base/server/shells/config.nu → home/base/core/shells/config.nu
diff --git a/home/base/server/shells/default.nix → home/base/core/shells/default.nix b/home/base/server/shells/default.nix → home/base/core/shells/default.nix
diff --git a/home/base/server/starship.nix → home/base/core/starship.nix b/home/base/server/starship.nix → home/base/core/starship.nix
diff --git a/home/base/server/yazi.nix → home/base/core/yazi.nix b/home/base/server/yazi.nix → home/base/core/yazi.nix
diff --git a/home/base/server/zellij/default.nix → home/base/core/zellij/default.nix b/home/base/server/zellij/default.nix → home/base/core/zellij/default.nix
diff --git a/home/base/desktop/terminal/default.nix → home/base/gui/default.nix b/home/base/desktop/terminal/default.nix → home/base/gui/default.nix
diff --git a/home/base/gui/dev-tools.nix b/home/base/gui/dev-tools.nix
@@ -0,0 +1,14 @@
+{
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs; [
+    # db related
+    dbeaver
+
+    mitmproxy # http/https proxy tool
+    insomnia # REST client
+    wireshark # network analyzer
+    ventoy # create bootable usb
+  ];
+}
diff --git a/home/base/desktop/media.nix → home/base/gui/media.nix b/home/base/desktop/media.nix → home/base/gui/media.nix
diff --git a/home/base/desktop/terminal/README.md → home/base/gui/terminal/README.md b/home/base/desktop/terminal/README.md → home/base/gui/terminal/README.md
diff --git a/home/base/server/default.nix → home/base/gui/terminal/default.nix b/home/base/server/default.nix → home/base/gui/terminal/default.nix
diff --git a/home/base/desktop/terminal/kitty.nix → home/base/gui/terminal/kitty.nix b/home/base/desktop/terminal/kitty.nix → home/base/gui/terminal/kitty.nix
diff --git a/home/base/desktop/terminal/wezterm.nix → home/base/gui/terminal/wezterm.nix b/home/base/desktop/terminal/wezterm.nix → home/base/gui/terminal/wezterm.nix
diff --git a/home/base/core.nix → home/base/home.nix b/home/base/core.nix → home/base/home.nix
diff --git a/home/base/desktop/cloud/default.nix → home/base/tui/cloud/default.nix b/home/base/desktop/cloud/default.nix → home/base/tui/cloud/default.nix
diff --git a/home/base/server/editors/default.nix → home/base/tui/default.nix b/home/base/server/editors/default.nix → home/base/tui/default.nix
diff --git a/home/base/desktop/dev-tools.nix → home/base/tui/dev-tools.nix b/home/base/desktop/dev-tools.nix → home/base/tui/dev-tools.nix
@@ -18,7 +18,6 @@
     colmena # nixos's remote deployment tool
 
     # db related
-    dbeaver
     mycli
     pgcli
     mongosh
@@ -47,11 +46,6 @@
     # need to run `conda-shell` before using command `conda`
     # conda is not available for MacOS
     conda
-
-    mitmproxy # http/https proxy tool
-    insomnia # REST client
-    wireshark # network analyzer
-    ventoy # create bootable usb
   ];
 
   programs = {

diff --git a/home/base/desktop/editors/Glossary.md → home/base/tui/editors/Glossary.md b/home/base/desktop/editors/Glossary.md → home/base/tui/editors/Glossary.md
diff --git a/home/base/desktop/editors/README.md → home/base/tui/editors/README.md b/home/base/desktop/editors/README.md → home/base/tui/editors/README.md
diff --git a/...ase/desktop/editors/Structured-Editing.md → home/base/tui/editors/Structured-Editing.md b/...ase/desktop/editors/Structured-Editing.md → home/base/tui/editors/Structured-Editing.md
diff --git a/home/base/tui/editors/default.nix b/home/base/tui/editors/default.nix
@@ -0,0 +1,3 @@
+{mylib, ...}: {
+  imports = mylib.scanPaths ./.;
+}
diff --git a/home/base/desktop/editors/emacs/README.md → home/base/tui/editors/emacs/README.md b/home/base/desktop/editors/emacs/README.md → home/base/tui/editors/emacs/README.md
diff --git a/home/base/desktop/editors/emacs/default.nix → home/base/tui/editors/emacs/default.nix b/home/base/desktop/editors/emacs/default.nix → home/base/tui/editors/emacs/default.nix
diff --git a/...base/desktop/editors/emacs/doom/config.el → home/base/tui/editors/emacs/doom/config.el b/...base/desktop/editors/emacs/doom/config.el → home/base/tui/editors/emacs/doom/config.el
diff --git a/home/base/desktop/editors/emacs/doom/init.el → home/base/tui/editors/emacs/doom/init.el b/home/base/desktop/editors/emacs/doom/init.el → home/base/tui/editors/emacs/doom/init.el
diff --git a/...se/desktop/editors/emacs/doom/packages.el → home/base/tui/editors/emacs/doom/packages.el b/...se/desktop/editors/emacs/doom/packages.el → home/base/tui/editors/emacs/doom/packages.el
diff --git a/...desktop/editors/emacs/doom/snippets/.keep → ...ase/tui/editors/emacs/doom/snippets/.keep b/...desktop/editors/emacs/doom/snippets/.keep → ...ase/tui/editors/emacs/doom/snippets/.keep
diff --git a/home/base/desktop/editors/helix/README.md → home/base/tui/editors/helix/README.md b/home/base/desktop/editors/helix/README.md → home/base/tui/editors/helix/README.md
diff --git a/home/base/desktop/editors/helix/default.nix → home/base/tui/editors/helix/default.nix b/home/base/desktop/editors/helix/default.nix → home/base/tui/editors/helix/default.nix
diff --git a/home/base/desktop/editors/neovim/README.md → home/base/tui/editors/neovim/README.md b/home/base/desktop/editors/neovim/README.md → home/base/tui/editors/neovim/README.md
diff --git a/.../editors/neovim/astronvim_user/.gitignore → .../editors/neovim/astronvim_user/.gitignore b/.../editors/neovim/astronvim_user/.gitignore → .../editors/neovim/astronvim_user/.gitignore
diff --git a/...p/editors/neovim/astronvim_user/.nfnl.fnl → ...i/editors/neovim/astronvim_user/.nfnl.fnl b/...p/editors/neovim/astronvim_user/.nfnl.fnl → ...i/editors/neovim/astronvim_user/.nfnl.fnl
diff --git a/...ditors/neovim/astronvim_user/.stylua.toml → ...ditors/neovim/astronvim_user/.stylua.toml b/...ditors/neovim/astronvim_user/.stylua.toml → ...ditors/neovim/astronvim_user/.stylua.toml
diff --git a/...op/editors/neovim/astronvim_user/init.lua → ...ui/editors/neovim/astronvim_user/init.lua b/...op/editors/neovim/astronvim_user/init.lua → ...ui/editors/neovim/astronvim_user/init.lua
diff --git a/...ditors/neovim/astronvim_user/mappings.lua → ...ditors/neovim/astronvim_user/mappings.lua b/...ditors/neovim/astronvim_user/mappings.lua → ...ditors/neovim/astronvim_user/mappings.lua
diff --git a/home/base/desktop/editors/neovim/default.nix → home/base/tui/editors/neovim/default.nix b/home/base/desktop/editors/neovim/default.nix → home/base/tui/editors/neovim/default.nix
diff --git a/home/base/desktop/editors/packages.nix → home/base/tui/editors/packages.nix b/home/base/desktop/editors/packages.nix → home/base/tui/editors/packages.nix
diff --git a/home/base/desktop/encryption/README.md → home/base/tui/encryption/README.md b/home/base/desktop/encryption/README.md → home/base/tui/encryption/README.md
diff --git a/home/base/desktop/encryption/default.nix → home/base/tui/encryption/default.nix b/home/base/desktop/encryption/default.nix → home/base/tui/encryption/default.nix
diff --git a/home/base/desktop/gpg/README.md → home/base/tui/gpg/README.md b/home/base/desktop/gpg/README.md → home/base/tui/gpg/README.md
diff --git a/home/base/desktop/gpg/default.nix → home/base/tui/gpg/default.nix b/home/base/desktop/gpg/default.nix → home/base/tui/gpg/default.nix
diff --git a/home/base/desktop/password-store/README.md → home/base/tui/password-store/README.md b/home/base/desktop/password-store/README.md → home/base/tui/password-store/README.md
diff --git a/home/base/desktop/password-store/default.nix → home/base/tui/password-store/default.nix b/home/base/desktop/password-store/default.nix → home/base/tui/password-store/default.nix
diff --git a/home/base/desktop/shell.nix → home/base/tui/shell.nix b/home/base/desktop/shell.nix → home/base/tui/shell.nix
diff --git a/home/base/desktop/ssh.nix → home/base/tui/ssh.nix b/home/base/desktop/ssh.nix → home/base/tui/ssh.nix
diff --git a/home/base/desktop/zellij/README.md → home/base/tui/zellij/README.md b/home/base/desktop/zellij/README.md → home/base/tui/zellij/README.md
diff --git a/home/base/desktop/zellij/config.kdl → home/base/tui/zellij/config.kdl b/home/base/desktop/zellij/config.kdl → home/base/tui/zellij/config.kdl
diff --git a/home/base/desktop/zellij/default.nix → home/base/tui/zellij/default.nix b/home/base/desktop/zellij/default.nix → home/base/tui/zellij/default.nix
diff --git a/home/darwin/default.nix b/home/darwin/default.nix
@@ -2,8 +2,9 @@
   imports =
     (mylib.scanPaths ./.)
     ++ [
-      ../base/server
-      ../base/desktop
-      ../base/core.nix
+      ../base/core
+      ../base/tui
+      ../base/gui
+      ../base/home.nix
     ];
 }
diff --git a/home/linux/core.nix b/home/linux/core.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ../base/core
+    ../base/home.nix
+
+    ./base
+  ];
+}
diff --git a/home/linux/desktop.nix b/home/linux/desktop.nix
diff --git a/home/linux/gui.nix b/home/linux/gui.nix
@@ -0,0 +1,11 @@
+{
+  imports = [
+    ../base/core
+    ../base/tui
+    ../base/gui
+    ../base/home.nix
+
+    ./base
+    ./desktop
+  ];
+}
diff --git a/home/linux/server.nix b/home/linux/server.nix
diff --git a/home/linux/tui.nix b/home/linux/tui.nix
@@ -0,0 +1,10 @@
+{
+  imports = [
+    ../base/core
+    ../base/tui
+    ../base/home.nix
+
+    ./base
+    ./desktop
+  ];
+}
diff --git a/outputs/x86_64-linux/src/12kingdoms-shoukei.nix b/outputs/x86_64-linux/src/12kingdoms-shoukei.nix
@@ -22,7 +22,7 @@
     ];
     home-modules = map mylib.relativeToRoot [
       # common
-      "home/linux/desktop.nix"
+      "home/linux/gui.nix"
       # host specific
       "hosts/12kingdoms-${name}/home.nix"
     ];

diff --git a/outputs/x86_64-linux/src/idols-ai.nix b/outputs/x86_64-linux/src/idols-ai.nix
@@ -22,7 +22,7 @@
     ];
     home-modules = map mylib.relativeToRoot [
       # common
-      "home/linux/desktop.nix"
+      "home/linux/gui.nix"
       # host specific
       "hosts/idols-${name}/home.nix"
     ];

diff --git a/outputs/x86_64-linux/src/idols-ruby.nix b/outputs/x86_64-linux/src/idols-ruby.nix
@@ -29,7 +29,7 @@
         {modules.secrets.server.operation.enable = true;}
       ];
     home-modules = map mylib.relativeToRoot [
-      "home/linux/server.nix"
+      "home/linux/tui.nix"
     ];
   };
 

diff --git a/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix b/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
@@ -28,7 +28,7 @@
         {modules.secrets.server.kubernetes.enable = true;}
       ];
     home-modules = map mylib.relativeToRoot [
-      "home/linux/server.nix"
+      "home/linux/core.nix"
     ];
   };