diff --git a/workstation/dotfiles/gallery-dl/config.json b/dotfiles/gallery-dl/config.json similarity index 57% rename from workstation/dotfiles/gallery-dl/config.json rename to dotfiles/gallery-dl/config.json index 06fbfcb..b45af94 100755 --- a/workstation/dotfiles/gallery-dl/config.json +++ b/dotfiles/gallery-dl/config.json @@ -1,11 +1,7 @@ { "extractor": { "skip": "abort:5", - "cookies": [ - "firefox", - "yw8fhvh4.default-release", - "gnomekeyring" - ], + "cookies": ["firefox", "yw8fhvh4.default-release", "gnomekeyring"], "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36", "retries": 10, "sleep-request": 0, @@ -15,80 +11,52 @@ }, "twitter": { "skip": "abort:1", - "directory": [ - "{user[name]}" - ], + "directory": ["{user[name]}"], "retweets": false, "videos": true, "logout": true }, "flickr": { - "directory": [ - "{category}", - "{owner[username]}" - ], + "directory": ["{category}", "{owner[username]}"], "size-max": "Original", "access-token": "72157720849409732-e83af94a8ca145aa", "access-token-secret": "0c7e86529694756a" }, "pinterest": { - "directory": [ - "{board[owner][username]}", - "{board[name]}" - ] + "directory": ["{board[owner][username]}", "{board[name]}"] }, "wikifeet": { "page-reverse": true, - "directory": [ - "{category}", - "{celebrity}" - ] + "directory": ["{category}", "{celebrity}"] }, "instagram": { "sleep-request": "15-45", "sleep": "2-10", - "directory": [ - "{username}" - ], + "directory": ["{username}"], "parent-directory": true, "highlights": { "reverse": "true", - "directory": [ - "{username}" - ] + "directory": ["{username}"] }, "stories": { "reverse": "true", - "directory": [ - "{username}" - ] + "directory": ["{username}"] }, "tagged": { - "directory": [ - "{tagged_username}", - "tagged" - ] + "directory": ["{tagged_username}", "tagged"] } }, "kemonoparty": { - "directory": [ - "{category}", - "{user}" - ], + "directory": ["{category}", "{user}"], "retries": 10, "timeout": 5, "filename": "{id}_{filename}.{extension}" }, "exhentai": { - "directory": [ - "{category}", - "{title}" - ] + "directory": ["{category}", "{title}"] }, "tumblr": { - "directory": [ - "{blog_name}" - ], + "directory": ["{blog_name}"], "access-token": "WTt2nJdHLJAOQMpTbnMBGYqeJwoBeY2HDRztDPjf4HnqJ65rnT", "access-token-secret": "0mI7ZWmD9CJPrQ1jjXvMGLjvJa44kOtgcKHtwz8LsAVDcODMPi", "external": true, @@ -103,9 +71,7 @@ "client-id": "20016", "client-secret": "52e1f9b0cb26e673da36f69e2ddd0e9a", "refresh-token": "cc862526cb515d82e750c099aa7f32a29087c961", - "directory": [ - "{username}" - ], + "directory": ["{username}"], "include": "gallery,scraps", "flat": true, "original": true, @@ -114,14 +80,8 @@ "auto-unwatch": true }, "furaffinity": { - "directory": [ - "{user}", - "{subcategory}" - ], - "include": [ - "scraps", - "gallery" - ] + "directory": ["{user}", "{subcategory}"], + "include": ["scraps", "gallery"] }, "patreon": { "directory": [ @@ -140,9 +100,7 @@ "filename": "{filename} - {num}.{extension}" }, "artstation": { - "directory": [ - "{userinfo[username]}" - ], + "directory": ["{userinfo[username]}"], "external": true }, "gfycat": { @@ -152,48 +110,31 @@ "user-agent": "Python:gallery-dl:v1.0 (by /u/captainjawz)", "client-id": "T7nZ6WZ3_onJWBhLP8r08g", "refresh-token": "184157546842-bkMXgGYWzkwGSgXTeC8mMmaDZouhUQ", - "directory": [ - "{author}" - ], + "directory": ["{author}"], "parent-directory": true }, "redgifs": { "reverse": "true", - "directory": [ - "{userName}" - ] + "directory": ["{userName}"] }, "imgur": { "mp4": true }, "paheal": { - "directory": [ - "Husbands", - "{search_tags}" - ] + "directory": ["Husbands", "{search_tags}"] }, "rule34": { - "directory": [ - "Husbands", - "{search_tags}" - ] + "directory": ["Husbands", "{search_tags}"] }, "e621": { - "directory": [ - "Husbands", - "{search_tags}" - ] + "directory": ["Husbands", "{search_tags}"] }, "baraag": { - "directory": [ - "{account[username]}" - ] + "directory": ["{account[username]}"] }, "pixiv": { "refresh-token": "O4kc9tTzGItuuacDcfmevW6NELjm5CJdWiAbZdUv3Kk", - "directory": [ - "{user[account]} - {user[id]}" - ], + "directory": ["{user[account]} - {user[id]}"], "ugoira": true, "favorite": { "directory": [ @@ -206,102 +147,54 @@ "name": "ugoira", "extension": "webm", "keep-files": false, - "whitelist": [ - "pixiv" - ], + "whitelist": ["pixiv"], "ffmpeg-twopass": true, - "ffmpeg-args": [ - "-c:v", - "libvpx", - "-crf", - "4", - "-b:v", - "5000k", - "-an" - ] + "ffmpeg-args": ["-c:v", "libvpx", "-crf", "4", "-b:v", "5000k", "-an"] } ] }, + "fanbox": { + "directory": ["{category}", "{creatorId}"], + "embeds": true + }, "readcomiconline": { "chapter-reverse": true, - "directory": [ - "Comics", - "{comic}", - "{comic} #{issue}" - ], + "directory": ["Comics", "{comic}", "{comic} #{issue}"], "quality": "hq", "captcha": "wait", - "postprocessors": [ - "cbz" - ] + "postprocessors": ["cbz"] }, "kissmanga": { "chapter-reverse": true, - "directory": [ - "Manga", - "{manga}", - "{manga} Ch.{chapter}{chapter_minor}" - ], + "directory": ["Manga", "{manga}", "{manga} Ch.{chapter}{chapter_minor}"], "captcha": "wait", - "postprocessors": [ - "cbz" - ] + "postprocessors": ["cbz"] }, "mangahere": { "chapter-reverse": true, - "directory": [ - "Manga", - "{manga}", - "{manga} Ch.{chapter}{chapter_minor}" - ], - "postprocessors": [ - "cbz" - ] + "directory": ["Manga", "{manga}", "{manga} Ch.{chapter}{chapter_minor}"], + "postprocessors": ["cbz"] }, "mangadex": { "chapter-reverse": true, "chapter-filter": "lang == 'en'", - "directory": [ - "Manga", - "{manga}", - "{manga} Ch.{chapter}{chapter_minor}" - ], - "postprocessors": [ - "cbz" - ] + "directory": ["Manga", "{manga}", "{manga} Ch.{chapter}{chapter_minor}"], + "postprocessors": ["cbz"] }, "mangareader": { "chapter-reverse": true, - "directory": [ - "Manga", - "{manga}", - "{manga} Ch.{chapter}{chapter_minor}" - ], - "postprocessors": [ - "cbz" - ] + "directory": ["Manga", "{manga}", "{manga} Ch.{chapter}{chapter_minor}"], + "postprocessors": ["cbz"] }, "mangapanda": { "chapter-reverse": true, - "directory": [ - "Manga", - "{manga}", - "{manga} Ch.{chapter}{chapter_minor}" - ], - "postprocessors": [ - "cbz" - ] + "directory": ["Manga", "{manga}", "{manga} Ch.{chapter}{chapter_minor}"], + "postprocessors": ["cbz"] }, "webtoons": { "chapter-reverse": true, - "directory": [ - "Webtoons", - "{comic}", - "{comic} #{episode}" - ], - "postprocessors": [ - "cbz" - ] + "directory": ["Webtoons", "{comic}", "{comic} #{episode}"], + "postprocessors": ["cbz"] } }, "output": { diff --git a/workstation/dotfiles/gopass/config.yml b/dotfiles/gopass/config.yml similarity index 100% rename from workstation/dotfiles/gopass/config.yml rename to dotfiles/gopass/config.yml diff --git a/workstation/dotfiles/htop/htoprc b/dotfiles/htop/htoprc similarity index 100% rename from workstation/dotfiles/htop/htoprc rename to dotfiles/htop/htoprc diff --git a/workstation/dotfiles/npm/npmrc b/dotfiles/npm/npmrc similarity index 100% rename from workstation/dotfiles/npm/npmrc rename to dotfiles/npm/npmrc diff --git a/workstation/dotfiles/npm/update-notifier-npm-check.json b/dotfiles/npm/update-notifier-npm-check.json similarity index 100% rename from workstation/dotfiles/npm/update-notifier-npm-check.json rename to dotfiles/npm/update-notifier-npm-check.json diff --git a/workstation/dotfiles/wget/wgetrc b/dotfiles/wget/wgetrc similarity index 100% rename from workstation/dotfiles/wget/wgetrc rename to dotfiles/wget/wgetrc diff --git a/workstation/configuration.org b/workstation/configuration.org index d58345f..2ab734c 100755 --- a/workstation/configuration.org +++ b/workstation/configuration.org @@ -520,11 +520,11 @@ xdg = { videos = "${config.home.homeDirectory}/Videos"; }; configFile = { - "wgetrc".source = ./dotfiles/wget/wgetrc; - "configstore/update-notifier-npm-check.json".source = ./dotfiles/npm/update-notifier-npm-check.json; - "npm/npmrc".source = ./dotfiles/npm/npmrc; - "gallery-dl/config.json".source = ./dotfiles/gallery-dl/config.json; - "htop/htoprc".source = ./dotfiles/htop/htoprc; + "wgetrc".source = ../dotfiles/wget/wgetrc; + "configstore/update-notifier-npm-check.json".source = ../dotfiles/npm/update-notifier-npm-check.json; + "npm/npmrc".source = ../dotfiles/npm/npmrc; + "gallery-dl/config.json".source = ../dotfiles/gallery-dl/config.json; + "htop/htoprc".source = ../dotfiles/htop/htoprc; }; }; #+end_src