reorganize packages

manifest.json

@@ -1,23 +1,22 @@
 {
   "template": {
-    "htop": {
-      "link": {
-        "from": "shared/htop",
-        "to": "~/.config/htop"
-      }
-    },
     "bin": {
       "link": {
         "from": "shared/bin",
         "to": "~/bin"
       }
     },
-    "nvim": {
+    "htop": {
       "link": {
-        "from": "shared/nvim",
-        "to": "~/.config/nvim/init.lua"
-      },
-      "post-link": "(grep -q 'alias vim=nvim' ~/.zshrc || echo 'alias vim=nvim' >> ~/.zshrc) || true"
+        "from": "shared/htop",
+        "to": "~/.config/htop"
+      }
+    },
+    "git": {
+      "link": {
+        "from": "shared/git",
+        "to": "~/.gitconfig"
+      }
     },
     "zsh": {
       "link": {
@@ -31,51 +30,25 @@
         "to": "~/.tmux.conf"
       }
     },
-    "git": {
+    "nvim": {
       "link": {
-        "from": "shared/git",
-        "to": "~/.gitconfig"
-      }
-    },
-    "wezterm": {
-      "link": {
-        "from": "shared/wezterm",
-        "to": "~/.wezterm.lua"
-      }
-    },
-    "alacritty": {
-      "link": {
-        "from": "shared/alacritty",
-        "to": "~/.alacritty.toml"
-      }
-    },
-    "ghostty": {
-      "link": {
-        "from": "shared/ghostty",
-        "to": "~/.config/ghostty"
+        "from": "shared/nvim",
+        "to": "~/.config/nvim"
       }
     }
   },
   "environments": {
     "macos": [
+      "git",
       "zsh",
+      "tmux",
+      "nvim",
+      "bin",
       {
         "package": "bin",
         "link": {
           "from": "macos/bin",
-          "to": "~/bin"
-        }
-      },
-      "tmux",
-      "nvim",
-      "git",
-      "ghostty",
-      "alacritty",
-      {
-        "package": "karabiner",
-        "link": {
-          "from": "macos/karabiner",
-          "to": "~/.config/karabiner"
+          "to": "~/.local/bin"
         }
       },
       {
@@ -88,9 +61,46 @@
       {
         "package": "rectangle",
         "link-comment": "Needs manual import from config/macos/linearmouse"
+      },
+      {
+        "package": "wezterm",
+        "link": {
+          "from": "macos/wezterm",
+          "to": "~/.config/wezterm"
+        }
+      },
+      {
+        "package": "alacritty",
+        "link": {
+          "from": "macos/alacritty",
+          "to": "~/.config/alacritty"
+        }
+      },
+      {
+        "package": "ghostty",
+        "link": {
+          "from": "macos/ghostty",
+          "to": "~/.config/ghostty"
+        }
       }
     ],
     "linux-vm": [
+      "bin",
+      {
+        "package": "bin",
+        "link": {
+          "from": "linux-vm/bin",
+          "to": "~/.local/bin"
+        }
+      },
+      {
+        "package": "htop",
+        "install": "sudo apt install -y htop"
+      },
+      {
+        "package": "git",
+        "install": "sudo apt install -y git"
+      },
       {
         "package": "zsh",
         "install": "sudo apt install -y zsh",
@@ -98,48 +108,42 @@
       },
       {
         "package": "tmux",
-        "link": {
-          "from": "linux-vm/tmux",
-          "to": "~/.tmux.conf"
-        },
         "install": "sudo apt install -y tmux"
       },
       {
         "package": "nvim",
-        "install": "bash -c 'wget -O nvim.deb https://gitea.tomastm.com/tomas.mirchev/neovim/releases/download/v0.10.0/nvim-linux-$(dpkg --print-architecture).deb && sudo dpkg -i nvim.deb && rm nvim.deb'"
-      },
+        "post-install": "echo 'Neovim needs setup'"
+      }
+    ],
+    "container": [
+      "bin",
       {
-        "package": "git",
-        "install": "sudo apt install -y git"
+        "package": "bin",
+        "link": {
+          "from": "container/bin",
+          "to": "~/.local/bin"
+        }
       },
       {
         "package": "htop",
         "install": "sudo apt install -y htop"
       },
-      "bin"
-    ],
-    "linux-dev": [
+      {
+        "package": "git",
+        "install": "sudo apt install -y git"
+      },
       {
         "package": "zsh",
         "install": "sudo apt install -y zsh",
         "post-link": "./scripts/linux-setup_zsh.sh"
       },
+      {
+        "package": "tmux",
+        "install": "sudo apt install -y tmux"
+      },
       {
         "package": "nvim",
-        "ignore-template": true,
-        "link": {
-          "from": "linux-dev/nvim",
-          "to": "~/.config/nvim"
-        },
-        "post-link": "nvim --headless '+Lazy! restore' +qa"
-      },
-      {
-        "package": "git",
-        "install": "sudo apt install -y git"
-      },
-      {
-        "package": "htop",
-        "install": "sudo apt install -y htop"
+        "post-install": "echo 'Neovim needs setup'"
       }
     ]
   }