From deb8ef3d3d48f4ef030bbffb87c6da25d5b4b500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=98=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2?= <pv@calculate.ru>
Date: Fri, 29 Sep 2023 15:46:24 +0300
Subject: [PATCH] =?UTF-8?q?TG-353=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=20=D0=B2=20?=
 =?UTF-8?q?chromium:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Добавлен плагин "floccus bookmarks synс";
* Добавлен шаблон настройки плагина;
* Удалены плагины Passman и FreedomMarks;
---
 .../Default/01-install-bitwarden.sh           |  73 +++++
 .../Default/01-install-freedommarks.sh        |  16 -
 .../chromium-80/Default/02-install-floccus.sh |  33 ++
 .../chromium-80/Default/02-install-passman.sh |  50 ---
 .../Default/03-install-bitwarden.sh           |  72 ----
 .../Default/Preferences.extensions            | 308 ++++--------------
 www-plugins/chrome-floccus/files/configure.py |   2 -
 7 files changed, 177 insertions(+), 377 deletions(-)
 create mode 100644 profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
 delete mode 100644 profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-freedommarks.sh
 create mode 100644 profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh
 delete mode 100644 profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-passman.sh
 delete mode 100644 profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/03-install-bitwarden.sh

diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
new file mode 100644
index 000000000..61edf5fe5
--- /dev/null
+++ b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
@@ -0,0 +1,73 @@
+# Calculate pkg(www-plugins/chrome-bitwarden)!= run=/bin/bash
+
+plugin_id="nngceckbapebfimnlniiiahkandclblb"
+mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
+mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
+cp -r /usr/share/chrome-bitwarden/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
+
+/usr/share/chrome-bitwarden/configure.py #-ur_home_path-#/.config/chromium $plugin_id "#-ini(user_credentials.bitwarden_login)-#" "#-ini(user_credentials.bitwarden_pw)-#" &>/dev/null <<EOF
+{
+    "userId": {
+	"data": {
+	    "ciphers": {
+		"encrypted": {}
+	    },
+	    "collections": {
+		"encrypted": {}
+	    },
+	    "folders": {
+		"encrypted": {}
+	    }
+	},
+	"keys": {
+	    "cryptoSymmetricKey": {
+		"encrypted": {}
+	    },
+	    "organizationKeys": {
+		"encrypted": {}
+	    },
+	    "privateKey": {
+		"encrypted": {}
+	    },
+	    "providerKeys": {
+		"encrypted": {}
+	    }
+	},
+	"profile": {
+	    "userId": {}
+	},
+	"settings": {
+	    "avatarColor": null,
+	    "defaultUriMatch": 1,
+	    "enableAutoFillOnPageLoad": true,
+	    "environmentUrls": {
+		"api": null,
+		"base": {},
+		"events": null,
+		"icons": null,
+		"identity": null,
+		"keyConnector": null,
+		"notifications": null,
+		"webVault": null
+	    },
+	    "vaultTimeout": null,
+	    "vaultTimeoutAction": "lock"
+	},
+	"tokens": {
+	    "accessToken": {},
+	    "refreshToken": {}
+	}
+    },
+    "userId_masterkey_auto": {},
+    "activeUserId": {},
+    "authenticatedAccounts": {},
+    "global": {
+	"stateVersion":7,
+	"theme":"system"
+    }
+}
+EOF
+
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
+chown #-ur_login-#:#-ur_group-# -R "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings"
+exit 0
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-freedommarks.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-freedommarks.sh
deleted file mode 100644
index cbdd9aa96..000000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-freedommarks.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate pkg(www-plugins/chrome-freedommarks)!=&&ini(user_credentials.nextcloud_url)!=&&ini(user_credentials.nextcloud_login)!=&&ini(user_credentials.nextcloud_pw)!= run=/bin/bash
-
-plugin_id="gmmpjoepfelkmeedfkfkadgkhholibko"
-mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
-mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
-cp -r /usr/share/chrome-freedommarks/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
-
-/usr/share/chrome-freedommarks/configure.py #-ur_home_path-#/.config/chromium $plugin_id &>/dev/null <<EOF
-{
-    "freedommarks_settings": "{\"bookmark_main_tab\":false,\"password\":\"#-ini(user_credentials.nextcloud_pw)-#\",\"search_main_tab\":true,\"server_url\":\"#-ini(user_credentials.nextcloud_url)-#\",\"username\":\"#-ini(user_credentials.nextcloud_login)-#\"}"
-}
-EOF
-
-chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
-chown #-ur_login-#:#-ur_group-# -R "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings"
-exit 0
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh
new file mode 100644
index 000000000..28098b812
--- /dev/null
+++ b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh
@@ -0,0 +1,33 @@
+# Calculate pkg(www-plugins/chrome-floccus)!= run=/bin/bash
+
+plugin_id="fnaicdffflnofjppbagibeoednhnbjhg"
+mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
+mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
+cp -r /usr/share/chrome-floccus/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
+
+/usr/share/chrome-floccus/configure.py #-ur_home_path-#/.config/chromium $plugin_id &>/dev/null <<EOF
+{
+    "accounts": {
+	"accountId": {
+	    "type": "nextcloud-bookmarks",
+	    "url": "#-ini(user_credentials.nextcloud_url)-#",
+	    "username": "#-ini(user_credentials.nextcloud_login)-#",
+	    "password": "#-ini(user_credentials.nextcloud_pw)-#",
+	    "serverRoot": "/apps/bookmarks",
+	    "includeCredentials": false,
+	    "allowRedirects": false,
+	    "allowNetwork": false,
+	    "enabled": true,
+	    "localRoot": "1",
+	    "syncInterval": 15,
+	    "strategy": "default",
+	    "nestedSync": true
+	}
+    },
+    "currentVersion": "#-pkg(www-plugins/chrome-floccus)-#"
+}
+EOF
+
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
+chown #-ur_login-#:#-ur_group-# -R "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings"
+exit 0
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-passman.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-passman.sh
deleted file mode 100644
index 410d73943..000000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-passman.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-# Calculate pkg(www-plugins/chrome-passman)!=&&ini(user_credentials.nextcloud_url)!=&&ini(user_credentials.nextcloud_login)!=&&ini(user_credentials.nextcloud_pw)!=&&ini(user_credentials.passman_id)!=&&ini(user_credentials.passman_guid)!=&&ini(user_credentials.passman_name)!=&&ini(user_credentials.passman_pw)!= run=/bin/bash
-plugin_id="hlpjhlifkgmoibhollggngbbhbejecph"
-mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
-mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
-cp -r /usr/share/chrome-passman/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
-
-#?ini(user_credentials.passman_master_pw)!=#
-MASTER_PW="#-ini(user_credentials.passman_master_pw)-#"
-#!ini#
-MASTER_PW="calculate"
-#ini#
-
-/usr/share/chrome-passman/configure.py #-ur_home_path-#/.config/chromium $plugin_id $MASTER_PW &>/dev/null <<EOF
-{
-#?ini(user_credentials.passman_pw_remember)==on#
-    "master_password": "\"$MASTER_PW\"",
-#ini#
-    "settings": {
-    "accounts":[
-        {
-		"nextcloud_host": "#-ini(user_credentials.nextcloud_url)-#",
-		"nextcloud_username": "#-ini(user_credentials.nextcloud_login)-#",
-		"nextcloud_password": "#-ini(user_credentials.nextcloud_pw)-#",
-		"vault": {
-			    "vault_id": #-ini(user_credentials.passman_id)-#,
-			    "guid": "#-ini(user_credentials.passman_guid)-#",
-            		    "name": "#-ini(user_credentials.passman_name)-#"
-		},
-        	"vault_password": "#-ini(user_credentials.passman_pw)-#"}],
-        "debug": false,
-        "enableAutoFill": true,
-        "enableAutoSubmit": false,
-        "enablePasswordPickerr": true,
-        "generatedPasswordLength": 12,
-        "ignorePath": true,
-        "ignoreProtocol": true,
-        "ignoreSubdomain": false,
-        "ignored_sites": [],
-#?ini(user_credentials.passman_pw_remember)==on#
-        "remember_password": true,
-#ini#
-        "refreshTime": 60
-    },
-    "activeTab": "\"search\""
-}
-EOF
-
-chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
-chown #-ur_login-#:#-ur_group-# -R "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings"
-exit 0
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/03-install-bitwarden.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/03-install-bitwarden.sh
deleted file mode 100644
index d46339a52..000000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/03-install-bitwarden.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-# Calculate pkg(www-plugins/chrome-bitwarden)!= run=/bin/bash
-plugin_id="nngceckbapebfimnlniiiahkandclblb"
-mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
-mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
-cp -r /usr/share/chrome-bitwarden/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
-
-/usr/share/chrome-bitwarden/configure.py #-ur_home_path-#/.config/chromium $plugin_id "#-ini(user_credentials.bitwarden_login)-#" "#-ini(user_credentials.bitwarden_pw)-#" <<EOF
-{
-    "userId": {
-        "data": {
-            "ciphers": {
-                "encrypted": {}
-            },
-            "collections": {
-                "encrypted": {}
-            },
-            "folders": {
-                "encrypted": {}
-            }
-        },
-        "keys": {
-            "cryptoSymmetricKey": {
-                "encrypted": {}
-            },
-            "organizationKeys": {
-                "encrypted": {}
-            },
-            "privateKey": {
-                "encrypted": {}
-            },
-            "providerKeys": {
-                "encrypted": {}
-            }
-        },
-        "profile": {
-            "userId": {}
-        },
-        "settings": {
-            "avatarColor": null,
-            "defaultUriMatch": 1,
-            "enableAutoFillOnPageLoad": true,
-            "environmentUrls": {
-                "api": null,
-                "base": {},
-                "events": null,
-                "icons": null,
-                "identity": null,
-                "keyConnector": null,
-                "notifications": null,
-                "webVault": null
-            },
-            "vaultTimeout": null,
-            "vaultTimeoutAction": "lock"
-        },
-        "tokens": {
-            "accessToken": {},
-            "refreshToken": {}
-        }
-    },
-    "userId_masterkey_auto": {},
-    "activeUserId": {},
-    "authenticatedAccounts": {},
-    "global": {
-        "stateVersion":7,
-        "theme":"system"
-    }
-}
-EOF
-
-chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
-chown #-ur_login-#:#-ur_group-# -R "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings"
-exit 0
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
index 907690035..3a6ddf289 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
+++ b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
@@ -1,18 +1,8 @@
 # Calculate format=json name=Preferences
 {
     "extensions": {
-        "commands": {
-#?exists(~/.config/chromium/Default/Extensions/hlpjhlifkgmoibhollggngbbhbejecph)!=#
-            "linux:Alt+Down": {
-                "command_name": "_execute_browser_action",
-                "extension": "hlpjhlifkgmoibhollggngbbhbejecph",
-                "global": false
-            }
-#exists#
-#?exists(~/.config/chromium/Default/Extensions/hlpjhlifkgmoibhollggngbbhbejecph)!=&&exists(~/.config/chromium/Default/Extensions/nngceckbapebfimnlniiiahkandclblb)!=#
-	    ,
-#exists#
 #?exists(~/.config/chromium/Default/Extensions/nngceckbapebfimnlniiiahkandclblb)!=#
+        "commands": {
             "linux:Ctrl+Shift+9": {
                 "command_name": "generate_password",
                 "extension": "nngceckbapebfimnlniiiahkandclblb",
@@ -28,8 +18,16 @@
                 "extension": "nngceckbapebfimnlniiiahkandclblb",
                 "global": false
             }
-#exists#
         },
+#exists#
+        "pinned_extensions": [
+#?exists(~/.config/chromium/Default/Extensions/nngceckbapebfimnlniiiahkandclblb)!=#
+            "nngceckbapebfimnlniiiahkandclblb",
+#exists#
+#?exists(~/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm)!=#
+            "cjpalhdlnbpafiamejdnhcphjbkeiagm"
+#exists#
+        ],
         "settings": {
 #?exists(~/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm)!=#
             "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
@@ -171,91 +169,107 @@
                 "withholding_permissions": false
             }
 #exists#
-#?exists(~/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm)!=&&exists(~/.config/chromium/Default/Extensions/gmmpjoepfelkmeedfkfkadgkhholibko)!=||exists(~/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm)!=&&exists(~/.config/chromium/Default/Extensions/hlpjhlifkgmoibhollggngbbhbejecph)!=#
+#?exists(~/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm)!=&&exists(~/.config/chromium/Default/Extensions/fnaicdffflnofjppbagibeoednhnbjhg)!=||exists(~/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm)!=&&exists(~/.config/chromium/Default/Extensions/nngceckbapebfimnlniiiahkandclblb)!=#
 	    ,
 #exists#
-#?exists(~/.config/chromium/Default/Extensions/gmmpjoepfelkmeedfkfkadgkhholibko)!=#
-            "gmmpjoepfelkmeedfkfkadgkhholibko": {
+#?exists(~/.config/chromium/Default/Extensions/fnaicdffflnofjppbagibeoednhnbjhg)!=#
+            "fnaicdffflnofjppbagibeoednhnbjhg": {
+                "active_bit": false,
                 "active_permissions": {
                     "api": [
-                        "activeTab",
+                        "alarms",
+                        "bookmarks",
+                        "identity",
                         "storage",
-                        "tabs"
+                        "tabs",
+                        "unlimitedStorage"
                     ],
                     "explicit_host": [
+                        "http://*/*",
                         "https://*/*"
                     ],
-                    "manifest_permissions": []
+                    "manifest_permissions": [],
+                    "scriptable_host": []
                 },
+                "allowlist": 1,
                 "commands": {},
                 "content_settings": [],
                 "creation_flags": 9,
                 "events": [],
-                "from_bookmark": false,
+                "first_install_time": "13339844149010023",
                 "from_webstore": true,
                 "granted_permissions": {
                     "api": [
-                        "activeTab",
+                        "alarms",
+                        "bookmarks",
+                        "identity",
                         "storage",
-                        "tabs"
+                        "tabs",
+                        "unlimitedStorage"
                     ],
                     "explicit_host": [
+                        "http://*/*",
                         "https://*/*"
                     ],
-                    "manifest_permissions": []
+                    "manifest_permissions": [],
+                    "scriptable_host": []
                 },
                 "incognito_content_settings": [],
                 "incognito_preferences": {},
+                "last_update_time": "13339844149010023",
                 "location": 1,
                 "manifest": {
                     "applications": {
                         "gecko": {
-                            "id": "freedommarks.extension@venturin.net",
-                            "strict_min_version": "48.0"
+                            "id": "floccus@handmadeideas.org",
+                            "strict_min_version": "57.0"
                         }
                     },
                     "background": {
-                        "scripts": [
-                            "js/background.js"
-                        ]
+                        "page": "dist/html/background.html"
                     },
                     "browser_action": {
-                        "browser_style": true,
-                        "default_icon": "icons/FreedomMarks_dark_32x32.png",
-                        "default_popup": "FreedomMarks.html",
-                        "default_title": "FreedomMarks",
-                        "theme_icons": [
-                            {
-                                "dark": "icons/FreedomMarks_dark_32x32.png",
-                                "light": "icons/FreedomMarks_light_32x32.png",
-                                "size": 32
-                            },
-                            {
-                                "dark": "icons/FreedomMarks_dark_48x48.png",
-                                "light": "icons/FreedomMarks_light_48x48.png",
-                                "size": 48
-                            }
-                        ]
+                        "browser_style": false,
+                        "chrome_style": false,
+                        "default_icon": {
+                            "48": "icons/logo.png"
+                        },
+                        "default_popup": "dist/html/options.html",
+                        "default_title": "Open Floccus options"
+                    },
+                    "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self';",
+                    "current_locale": "ru",
+                    "default_locale": "en",
+                    "description": "Sync your bookmarks privately across browsers and devices",
+                    "icons": {
+                        "128": "icons/logo_128.png",
+                        "48": "icons/logo.png",
+                        "64": "icons/logo_64.png"
                     },
-                    "homepage_url": "https://github.com/damko/freedommarks-browser-webextension",
-                    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2YORuM1OGySufoF4W0JZfF9IMHrEscT7TjEDSh+92HlbcG5JIDmY9F8I7rQ3DC900IiwT2hsIaTSbP8+teTFhmgXe2hPSXTBKjcBXkTinPlsk1Lf24UYjMQtxWr/15WlZQ1YUBCQg6bydP3H/4wRxx9WlxTgcvJMgPeQIZ+/VkTi7cyQcwYHIn+Z+tye9Fo6SPrfhdVusEwJY1cSZE/OpkS7fSNg2Lp6MSxrgu0fq/6VEFtW6/Sq2WY8XlI3PqJy2oywdSu+MjGj+HNTG0w6W69+jsKJZmHFmy1mGpm6P9Hys70WLXkF76AjnVqLYn7KC0k6NeRKOC7TLSOQtwVnJQIDAQAB",
+                    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhV577hk+UYurcLgRCzh9QNTs9bfmvUoRdHzneepg2kakWS/jY1evKhYFoL+WucmmMwGsxbms+tHz+h49TlqQfHj8SmpERkpQxkLR7j6uIX5239ry1s3t+wdkqHh0V7ZLDajd7beHkRyAFG8bapeiu8tZC0DyeEx9Quoeicipf0G97DK5CAyyK+F9RdJw6h1u/NP9/NSD79NqTRQ3pEMhTghBx/Ck2Ix1GadT9fN5K5WMkEDlFqk9BhIO135aKHK6Z17cT0wdPbp5Mb7eUKQTDHoWxYR4A26n59sFGtqz8nJWiTYOtKg4osMFPkLv0oNsVdKal6n2gXzCtaPMX+ttJQIDAQAB",
                     "manifest_version": 2,
-                    "name": "FreedomMarks",
+                    "name": "floccus bookmarks sync",
                     "options_ui": {
-                        "page": "FreedomMarks_options.html"
+                        "browser_style": false,
+                        "chrome_style": false,
+                        "page": "dist/html/options.html"
                     },
                     "permissions": [
-                        "tabs",
-                        "activeTab",
+                        "https://*/",
+                        "http://*/",
+                        "alarms",
+                        "bookmarks",
                         "storage",
-                        "https://*/*"
+                        "unlimitedStorage",
+                        "tabs",
+                        "identity"
                     ],
+                    "short_name": "floccus",
                     "update_url": "https://clients2.google.com/service/update2/crx",
-                    "version": "0.1.2"
+                    "version": "#-pkg(www-plugins/chrome-floccus)-#"
                 },
                 "needs_sync": true,
-                "never_activated_since_loaded": true,
-                "path": "gmmpjoepfelkmeedfkfkadgkhholibko/0.1.2_0",
+                "path": "fnaicdffflnofjppbagibeoednhnbjhg/#-pkg(www-plugins/chrome-floccus)-#_0",
                 "preferences": {},
                 "regular_only_preferences": {},
                 "state": 1,
@@ -264,184 +278,7 @@
                 "withholding_permissions": false
             }
 #exists#
-#?exists(~/.config/chromium/Default/Extensions/gmmpjoepfelkmeedfkfkadgkhholibko)!=&&exists(~/.config/chromium/Default/Extensions/hlpjhlifkgmoibhollggngbbhbejecph)!=#
-	    ,
-#exists#
-#?exists(~/.config/chromium/Default/Extensions/hlpjhlifkgmoibhollggngbbhbejecph)!=#
-            "hlpjhlifkgmoibhollggngbbhbejecph": {
-                "active_permissions": {
-                    "api": [
-                        "clipboardWrite",
-                        "contextMenus",
-                        "notifications",
-                        "storage",
-                        "tabs",
-                        "webRequest",
-                        "webRequestBlocking"
-                    ],
-                    "explicit_host": [
-                        "*://*/*"
-                    ],
-                    "manifest_permissions": [],
-                    "scriptable_host": [
-                        "http://*/*",
-                        "https://*/*"
-                    ]
-                },
-                "commands": {
-                    "_execute_browser_action": {
-                        "suggested_key": "Alt+Down",
-                        "was_assigned": true
-                    }
-                },
-                "content_settings": [],
-                "creation_flags": 9,
-                "events": [],
-                "from_bookmark": false,
-                "from_webstore": true,
-                "granted_permissions": {
-                    "api": [
-                        "clipboardWrite",
-                        "contextMenus",
-                        "notifications",
-                        "storage",
-                        "tabs",
-                        "webRequest",
-                        "webRequestBlocking"
-                    ],
-                    "explicit_host": [
-                        "*://*/*"
-                    ],
-                    "manifest_permissions": [],
-                    "scriptable_host": [
-                        "http://*/*",
-                        "https://*/*"
-                    ]
-                },
-                "incognito_content_settings": [],
-                "incognito_preferences": {},
-                "location": 1,
-                "manifest": {
-                    "author": "Sander Brand",
-                    "background": {
-                        "scripts": [
-                            "/js/vendor/jquery/jquery.js",
-                            "/js/lib/data/tlds.js",
-                            "/js/lib/parseTLD.js",
-                            "/js/lib/parseUrl.js",
-                            "/js/vendor/sjcl/sjcl.js",
-                            "/js/lib/promise.js",
-                            "/js/lib/API/base.js",
-                            "/js/lib/API/storage.js",
-                            "/js/lib/API/runtime.js",
-                            "/js/lib/API/i18n.js",
-                            "/js/lib/API/notifications.js",
-                            "/js/lib/API/cookies.js",
-                            "/js/lib/API/browser_action.js",
-                            "/js/lib/API/tabs.js",
-                            "/js/lib/API/contextmenus.js",
-                            "/js/lib/API/web_request.js",
-                            "/js/lib/api.js",
-                            "/js/lib/sharingAcl.js",
-                            "/js/vendor/sha/sha.js",
-                            "/js/lib/otp.js",
-                            "/js/lib/passwordgen.js",
-                            "/js/background/service/contextMenu.js",
-                            "/js/background/service/background.js",
-                            "/js/background/service/httpAuth.js"
-                        ]
-                    },
-                    "browser_action": {
-                        "default_icon": "icons/icon19.png",
-                        "default_popup": "/html/browser_action/browser_action.html",
-                        "default_title": "Passman"
-                    },
-                    "commands": {
-                        "_execute_browser_action": {
-                            "suggested_key": {
-                                "chromeos": "Alt+Down",
-                                "linux": "Alt+Down",
-                                "mac": "Alt+Down",
-                                "windows": "Alt+Down"
-                            }
-                        }
-                    },
-                    "content_scripts": [
-                        {
-                            "all_frames": true,
-                            "css": [
-                                "/css/doorhanger-iframe.css"
-                            ],
-                            "js": [
-                                "/js/lib/promise.js",
-                                "/js/vendor/sjcl/sjcl.js",
-                                "/js/lib/API/base.js",
-                                "/js/lib/API/runtime.js",
-                                "/js/lib/API/extension.js",
-                                "/js/lib/API/cookies.js",
-                                "/js/lib/API/i18n.js",
-                                "/js/vendor/jquery/jquery.js",
-                                "/js/lib/jQuerytoObject.js",
-                                "/js/lib/findForm.js",
-                                "/js/lib/parseUrl.js",
-                                "/js/lib/parseTLD.js",
-                                "/js/lib/data/tlds.js",
-                                "/js/lib/domchanged.js",
-                                "/js/background/inject/inject.js"
-                            ],
-                            "jsBuild": [],
-                            "matches": [
-                                "http://*/*",
-                                "https://*/*"
-                            ]
-                        }
-                    ],
-                    "current_locale": "ru",
-                    "default_locale": "en",
-                    "externally_connectable": {
-                        "ids": []
-                    },
-                    "homepage_url": "https://github.com/nextcloud/passman-chrome-extension",
-                    "icons": {
-                        "128": "icons/icon128.png",
-                        "16": "icons/icon16.png",
-                        "32": "icons/icon32.png",
-                        "48": "icons/icon48.png",
-                        "64": "icons/icon64.png"
-                    },
-                    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjh6l38PY428rbh+PDk2R4mVjSxL3YxEEwBCeMWp5qqD1hghOy/v9iT4wCeXITYy39bloj9/rWX97hrA9qixq17z2lLUW/BPFfV2fkuBfs2M/Mfx/npdtHfwJL1FL4mHG/XRaMDwVQOHkh2aOSXmS1CG5GITJEalRohjwjBOlQzQDREUg5G3x3eMWDrzjcZJKY2Kd8BFbmwh7xmg3S+gU/N6rI0G+X6Ohx76DD4oDRc6Edj5O6T4aUVX09PtPCx2pKyU159t2a+s3BHiSIEw2C4rwVOW2izsfjHqrjapctOrUIUOGMqEtfidm4W5nuYtkmZ1eF4v68bN6Ftj2YyrgjwIDAQAB",
-                    "manifest_version": 2,
-                    "name": "Passman",
-                    "permissions": [
-                        "*://*/*",
-                        "notifications",
-                        "tabs",
-                        "clipboardWrite",
-                        "storage",
-                        "contextMenus",
-                        "webRequest",
-                        "webRequestBlocking"
-                    ],
-                    "short_name": "Passman",
-                    "update_url": "https://clients2.google.com/service/update2/crx",
-                    "version": "2.1.2",
-                    "web_accessible_resources": [
-                        "html/inject/doorhanger.html",
-                        "html/inject/password_picker.html",
-                        "html/inject/auto_login.html",
-                        "fonts/*",
-                        "icons/*"
-                    ]
-                },
-                "needs_sync": true,
-                "never_activated_since_loaded": true,
-                "path": "hlpjhlifkgmoibhollggngbbhbejecph/2.1.2_0",
-                "preferences": {},
-                "regular_only_preferences": {},
-                "state": 1
-            }
-#exists#
-#?exists(~/.config/chromium/Default/Extensions/hlpjhlifkgmoibhollggngbbhbejecph)!=&&exists(~/.config/chromium/Default/Extensions/nngceckbapebfimnlniiiahkandclblb)!=#
+#?exists(~/.config/chromium/Default/Extensions/fnaicdffflnofjppbagibeoednhnbjhg)!=&&exists(~/.config/chromium/Default/Extensions/nngceckbapebfimnlniiiahkandclblb)!=#
 	    ,
 #exists#
 #?exists(~/.config/chromium/Default/Extensions/nngceckbapebfimnlniiiahkandclblb)!=#
@@ -631,7 +468,7 @@
                         "managed_schema": "managed_schema.json"
                     },
                     "update_url": "https://clients2.google.com/service/update2/crx",
-                    "version": "2023.5.1",
+                    "version": "#-pkg(www-plugins/chrome-bitwarden)-#",
                     "web_accessible_resources": [
                         "notification/bar.html",
                         "images/icon38.png",
@@ -639,7 +476,7 @@
                     ]
                 },
                 "needs_sync": true,
-                "path": "nngceckbapebfimnlniiiahkandclblb/2023.5.1_0",
+                "path": "nngceckbapebfimnlniiiahkandclblb/#-pkg(www-plugins/chrome-bitwarden)-#_0",
                 "preferences": {},
                 "regular_only_preferences": {},
                 "state": 1,
@@ -651,8 +488,6 @@
 	},
         "toolbar": [
             "cjpalhdlnbpafiamejdnhcphjbkeiagm",
-            "hlpjhlifkgmoibhollggngbbhbejecph",
-            "gmmpjoepfelkmeedfkfkadgkhholibko",
             "nngceckbapebfimnlniiiahkandclblb"
         ]
     },
@@ -661,8 +496,7 @@
             "extensions": {
                 "settings": {
                     "cjpalhdlnbpafiamejdnhcphjbkeiagm": "4013706C949FD89AD1F588F32A08A9656D83C0A61DB56C141341E60CF4404C95",
-                    "gmmpjoepfelkmeedfkfkadgkhholibko": "C253FB70BF73E16A7589C63B4D16FF1A4CE1D498FE35271E18A47DD5074E1DF7",
-                    "hlpjhlifkgmoibhollggngbbhbejecph": "241E0496ECDC2F8F819D56195B5A9422E3A3591BEB58FD6A619CF5EC2BA9627D",
+                    "fnaicdffflnofjppbagibeoednhnbjhg": "8CD963F9765D0603AD154C7D14611AC1EBAC635E5306FE23E4614A506D1BCB19",
                     "nngceckbapebfimnlniiiahkandclblb": "DAB16DDC5FF5B8DAABCFB600A5100658521239E086378321AF855F34CFCFBB0C"
                 }
             }
diff --git a/www-plugins/chrome-floccus/files/configure.py b/www-plugins/chrome-floccus/files/configure.py
index 1cfe8e864..18b1c750b 100644
--- a/www-plugins/chrome-floccus/files/configure.py
+++ b/www-plugins/chrome-floccus/files/configure.py
@@ -44,8 +44,6 @@ except IOError:
     sys.stderr.write("Закройте браузер!\n")
     sys.exit(1)
 
-print(data_list)
-
 for k, v in data_list.items():
     db.put(bytes(k,encoding='utf-8'), bytes(str(v),encoding='utf-8'))
 db.close()