From: b3nj5m1n <47924309+b3nj5m1n@users.noreply.github.com>
Date: Fri, 18 Aug 2023 00:45:04 +0000 (+0200)
Subject: Merge pull request #302 from starsep/gore
X-Git-Tag: v0.2.0.2~32
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/xdg-ninja.git/commitdiff_plain/d7a7d108bf748732aa0e0f7e8d5f9695be28a03a?hp=a970da83c4428e34fa6ea1839120be1c1b4f8e0b

Merge pull request #302 from starsep/gore
---

diff --git a/programs/android-studio.json b/programs/android-studio.json
deleted file mode 100644
index ce08850..0000000
--- a/programs/android-studio.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "files": [
-        {
-            "help": "Try exporting the following environment variables:\n\n```bash\nexport ANDROID_HOME=\"$XDG_DATA_HOME\"/android\n```\n\n**adb** will always generate \"$HOME/.android/adbkeys\".\n",
-            "movable": false,
-            "path": "$HOME/.android"
-        }
-    ],
-    "name": "android-studio"
-}
\ No newline at end of file
diff --git a/programs/android.json b/programs/android.json
new file mode 100644
index 0000000..4d3273e
--- /dev/null
+++ b/programs/android.json
@@ -0,0 +1,10 @@
+{
+    "files": [
+        {
+            "help": "Export the following environment variable:\n\n```bash\nexport ANDROID_HOME=\"$XDG_DATA_HOME\"/android\n```\n\nAdditionally, if you use adb, use the following alias:\n\n```bash\nalias adb='HOME=\"$XDG_DATA_HOME\"/android adb'\n```\n\n",
+            "movable": true,
+            "path": "$HOME/.android"
+        }
+    ],
+    "name": "android"
+}
diff --git a/programs/ansible.json b/programs/ansible.json
index 076a76a..dba6da9 100644
--- a/programs/ansible.json
+++ b/programs/ansible.json
@@ -2,8 +2,8 @@
     "files": [
         {
             "path": "$HOME/.ansible",
-            "movable": false,
-            "help": "See [this](https://github.com/ansible/ansible/commit/d7fbde4ea9db6cc44e81c39d699595330f4fa3c6) pull request.\n\nSeems to be implemented now, you should be able to set the _ANSIBLE_HOME_ environment variable.\n\nI couldn't get it to work yet unfortunately, and you might need to wait for a new release.\n"
+            "movable": true,
+            "help": "Export the following environment variables:\n\n```bash\nexport ANSIBLE_HOME=\"$XDG_DATA_HOME\"/ansible\n```\n"
         }
     ],
     "name": "ansible"
diff --git a/programs/vim.json b/programs/vim.json
index f6f20ff..5d9475a 100644
--- a/programs/vim.json
+++ b/programs/vim.json
@@ -1,7 +1,7 @@
 {
     "files": [
         {
-            "help": "Since 7.3.1178 vim will search for ~/.vim/vimrc if ~/.vimrc is not found.\n\n\"$XDG_CONFIG_HOME\"/vim/vimrc\n```vim\nset runtimepath^=$XDG_CONFIG_HOME/vim\nset runtimepath+=$XDG_DATA_HOME/vim\nset runtimepath+=$XDG_CONFIG_HOME/vim/after\n\nset packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim\nset packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after\n\nlet g:netrw_home = $XDG_DATA_HOME.\"/vim\"\ncall mkdir($XDG_DATA_HOME.\"/vim/spell\", 'p')\n\nset backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p')\nset directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')\nset undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')\nset viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')\n\nif !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif\n```\n\n~/.profile\n```\nexport GVIMINIT='let $MYGVIMRC=\"$XDG_CONFIG_HOME/vim/gvimrc\" | source $MYGVIMRC'\nexport VIMINIT='let $MYVIMRC=\"$XDG_CONFIG_HOME/vim/vimrc\" | source $MYVIMRC'\n```\n[G]VIMINIT environment variable will also affect Neovim. If separate configs for Vim and Neovim are desired then the following will be a better choice:\n\n```\nexport GVIMINIT='let $MYGVIMRC = !has(\"nvim\") ? \"$XDG_CONFIG_HOME/vim/gvimrc\" : \"$XDG_CONFIG_HOME/nvim/init.gvim\" | so $MYGVIMRC'\nexport VIMINIT='let $MYVIMRC = !has(\"nvim\") ? \"$XDG_CONFIG_HOME/vim/vimrc\" : \"$XDG_CONFIG_HOME/nvim/init.vim\" | so $MYVIMRC'\n```\n\nAdditional information:\nhttps://blog.joren.ga/vim-xdg\nhttps://tlvince.com/vim-respect-xdg\n",
+            "help": "Since 7.3.1178 vim will search for ~/.vim/vimrc if ~/.vimrc is not found.\n\n\"$XDG_CONFIG_HOME\"/vim/vimrc\n```vim\nset runtimepath^=$XDG_CONFIG_HOME/vim\nset runtimepath+=$XDG_DATA_HOME/vim\nset runtimepath+=$XDG_CONFIG_HOME/vim/after\n\nset packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim\nset packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after\n\nlet g:netrw_home = $XDG_DATA_HOME.\"/vim\"\ncall mkdir($XDG_DATA_HOME.\"/vim/spell\", 'p')\n\nset backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p')\nset directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')\nset undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')\nset viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')\n\nif !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif\n```\n\n~/.profile\n```\nexport GVIMINIT='let $MYGVIMRC=\"$XDG_CONFIG_HOME/vim/gvimrc\" | source $MYGVIMRC'\nexport VIMINIT='let $MYVIMRC=\"$XDG_CONFIG_HOME/vim/vimrc\" | source $MYVIMRC'\n```\n[G]VIMINIT environment variable will also affect Neovim. If separate configs for Vim and Neovim are desired then the following will be a better choice:\n\n```\nexport GVIMINIT='let $MYGVIMRC = !has(\"nvim\") ? \"$XDG_CONFIG_HOME/vim/gvimrc\" : \"$XDG_CONFIG_HOME/nvim/init.gvim\" | so $MYGVIMRC'\nexport VIMINIT='let $MYVIMRC = !has(\"nvim\") ? \"$XDG_CONFIG_HOME/vim/vimrc\" : \"$XDG_CONFIG_HOME/nvim/init.vim\" | so $MYVIMRC'\n```\n\nAdditional information:\nhttps://jorengarenar.github.io/blog/vim-xdg\nhttps://tlvince.com/vim-respect-xdg\n",
             "movable": true,
             "path": "$HOME/.vimrc"
         },
@@ -17,4 +17,4 @@
         }
     ],
     "name": "vim"
-}
\ No newline at end of file
+}
diff --git a/programs/xorg-xrdb.json b/programs/xorg-xrdb.json
index 63c29d2..14dacf9 100644
--- a/programs/xorg-xrdb.json
+++ b/programs/xorg-xrdb.json
@@ -4,6 +4,11 @@
             "path": "$HOME/.Xresources",
             "movable": true,
             "help": "xrdb loads these resources, wherever you call xrdb, add this flag:\n\n```bash\nxrdb -load \"$XDG_CONFIG_HOME/X11/xresources\"\n```\n\n_Note: It will probably be called by your Xsession file._\n"
+        },
+        {
+            "path": "$HOME/.Xdefaults",
+            "movable": true,
+            "help": "Old version of .Xresources. xrdb loads these resources, wherever you call xrdb, add this flag:\n\n```bash\nxrdb -load \"$XDG_CONFIG_HOME/X11/xresources\"\n```\n\n_Note: It will probably be called by your Xsession file._\n"
         }
     ],
     "name": "xorg-xrdb"