vault backup: 2026-09-04 22:23:09

.obsidian/workspace.json

@@ -4,24 +4,39 @@
     "type": "split",
     "children": [
       {
-        "id": "9d2580cd38bb9f26",
+        "id": "2ca03ae98b93b0b8",
         "type": "tabs",
         "children": [
           {
-            "id": "c3e5b400f87e4a39",
+            "id": "2dff01bd208bbc21",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "English/dictionary.md",
+                "file": "cybersec/AD/Active Directory Basics.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "dictionary"
+              "title": "Active Directory Basics"
+            }
+          },
+          {
+            "id": "d563e5b87c2bf0a1",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "obsidian.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "obsidian"
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -46,7 +61,7 @@
                 "searchQuery": ""
               },
               "icon": "lucide-folder-closed",
-              "title": "Файловый менеджер"
+              "title": "Files"
             }
           },
           {
@@ -186,58 +201,59 @@
   },
   "left-ribbon": {
     "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
+      "switcher:Open quick switcher": false,
-      "graph:Граф": false,
+      "graph:Open graph view": false,
-      "canvas:Создать новый холст": false,
+      "canvas:Create new canvas": false,
-      "daily-notes:Сегодняшняя заметка": false,
+      "daily-notes:Open today's daily note": false,
-      "templates:Вставить шаблон": false,
+      "templates:Insert template": false,
-      "command-palette:Открыть палитру команд": false,
+      "command-palette:Open command palette": false,
-      "bases:Создать новую базу": false,
+      "bases:Create new base": false,
-      "obsidian-excalidraw-plugin:Создать новый чертеж": false,
+      "obsidian-excalidraw-plugin:New drawing": false,
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "c3e5b400f87e4a39",
+  "active": "1973c33e0bd53ded",
   "lastOpenFiles": [
-    "Pasted image 20260831233617.png",
+    "conflict-files-obsidian-git.md",
-    "English/dictionary.md",
+    "obsidian.md",
-    "cybersec/Network/Протоколы/Протоколы.md",
+    "cybersec/AD/Active Directory Basics.md",
-    "cybersec/Network/Протоколы/SMTP.md",
+    "cybersec/AD/AD.md",
-    "cybersec/Network/Протоколы/POP3.md",
-    "cybersec/Network/Протоколы/IMAP.md",
-    "cybersec/Network/Протоколы/HTTP(S).md",
-    "cybersec/Network/Протоколы/FTP.md",
-    "cybersec/Network/Протоколы/DNS.md",
-    "cybersec/Network/Протоколы",
     "cybersec/Network/tcpdump.md",
+    "cybersec/Network/Wireshark.md",
     "cybersec/Network/photoes/wire7.gif",
     "cybersec/Network/photoes/wire6t.gif",
+    "cybersec/Network/photoes/цшку5.gif",
     "cybersec/Network/photoes/wire5.gif",
     "cybersec/Network/photoes/wire4.gif",
     "cybersec/Network/photoes/wire3.gif",
     "cybersec/Network/photoes/wire2.gif",
     "cybersec/Network/photoes/wire1.gif",
-    "cybersec/Network/photoes/photoes.md",
+    "cybersec/Network/wire1.gif",
-    "cybersec/Network/Wireshark.md",
+    "Pasted image 20260831233617.png",
-    "cybersec/AD/photoes/Pasted image 20260809103933.png",
-    "cybersec/AD/photoes/Pasted image 20260809103854.png",
-    "cybersec/AD/photoes",
     "English/Time clauses.md",
-    "English/English.md",
+    "English/Preposition.md",
+    "English/dictionary.md",
     "English/conditional.md",
-    "cybersec/Forensic/Network layers.md",
+    "cybersec/Network/Протоколы/IMAP.md",
+    "cybersec/Network/Протоколы/POP3.md",
+    "cybersec/Network/Протоколы/HTTP(S).md",
+    "cybersec/Network/Протоколы/SMTP.md",
+    "cybersec/Network/Firewall.md",
+    "cybersec/Network/Протоколы/FTP.md",
+    "cybersec/AD/photoes",
+    "cybersec/OS/Powershell commands.md",
+    "cybersec/OS/OS.md",
+    "cybersec/Network/Протоколы/Протоколы.md",
+    "cybersec/Network/Network.md",
+    "cybersec/Network/photoes/photoes.md",
+    "cybersec/Network/Протоколы/_Index_of_Протоколы.md",
+    "cybersec/cybersec.md",
+    "cybersec/_Index_of_cybersec.md",
+    "cybersec/Network/_Index_of_Network.md",
+    "cybersec/Network/DHCP.md",
+    "cybersec/Network/Протоколы",
     "Без названия.canvas",
     "Без названия 1.canvas",
-    "Excalidraw/Excalidraw.md",
-    "Excalidraw/Drawing 2026-07-30 11.54.23.excalidraw.md",
-    "Excalidraw/Drawing 2026-05-05 21.04.57.excalidraw.md",
-    "English/homework/WorkBook 4A.md",
-    "cybersec/cybersec.md",
-    "obsidian.md",
-    "Programming/ML/math_neuron.excalidraw.md",
-    "Programming/ML/biology_neuron.excalidraw.md",
-    "Programming/ML/Pytorch basics.md",
-    "Programming/ML/pytorch база.md",
     "English/homework"
   ]
 }

obsidian.md

@@ -1,4 +1,5 @@
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
+ [[conflict-files-obsidian-git|conflict-files-obsidian-git]]
  [[cybersec/cybersec|cybersec]]
  [[English/English|English]]
  [[L1/L1|L1]]