TelenkovDmitry 9 meses atrás
pai
commit
9bdaf0bd22
4 arquivos alterados com 41 adições e 77 exclusões
  1. 23 75
      .obsidian/workspace.json
  2. 12 0
      c/c common.md
  3. 1 1
      hardcore web development/4. Linux.md
  4. 5 1
      linux/vim.md

+ 23 - 75
.obsidian/workspace.json

@@ -1,23 +1,19 @@
 {
   "main": {
-    "id": "a01b3811920669eb",
+    "id": "148d5aec8ccf44d3",
     "type": "split",
     "children": [
       {
-        "id": "fd96e788edf57411",
+        "id": "446535721024f2a8",
         "type": "tabs",
         "children": [
           {
-            "id": "4b307134b450d3bf",
+            "id": "2af91785fcdea33c",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-<<<<<<< HEAD
-                "file": "proGit.md",
-=======
-                "file": "linux/bash.md",
->>>>>>> 8060681e424598740c5696401c80bc37a5a44ed6
+                "file": "hardcore web development/4. Linux.md",
                 "mode": "source",
                 "source": false
               }
@@ -29,15 +25,15 @@
     "direction": "vertical"
   },
   "left": {
-    "id": "d6ad346f6c69c25f",
+    "id": "32eb4e5c2d756e3b",
     "type": "split",
     "children": [
       {
-        "id": "9122c72c68b4853c",
+        "id": "300f818ed4fab219",
         "type": "tabs",
         "children": [
           {
-            "id": "fd350626e6fd4d03",
+            "id": "6c6f2132d7393211",
             "type": "leaf",
             "state": {
               "type": "file-explorer",
@@ -47,7 +43,7 @@
             }
           },
           {
-            "id": "35a75d07636b6662",
+            "id": "5036be895a5016bb",
             "type": "leaf",
             "state": {
               "type": "search",
@@ -62,7 +58,7 @@
             }
           },
           {
-            "id": "df97e07ab3ade02b",
+            "id": "6aa9d14b9beb7bd6",
             "type": "leaf",
             "state": {
               "type": "bookmarks",
@@ -76,24 +72,20 @@
     "width": 300
   },
   "right": {
-    "id": "52d42b97aa804faf",
+    "id": "368d437e39f970d6",
     "type": "split",
     "children": [
       {
-        "id": "14971c56f716bc26",
+        "id": "36b7b0f21b0f1c11",
         "type": "tabs",
         "children": [
           {
-            "id": "c1b456912a80dadb",
+            "id": "cab69b9af92f423c",
             "type": "leaf",
             "state": {
               "type": "backlink",
               "state": {
-<<<<<<< HEAD
-                "file": "proGit.md",
-=======
-                "file": "linux/bash.md",
->>>>>>> 8060681e424598740c5696401c80bc37a5a44ed6
+                "file": "hardcore web development/4. Linux.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -105,7 +97,7 @@
             }
           },
           {
-            "id": "7628d93601b6999c",
+            "id": "9cc96c2b9e0839bb",
             "type": "leaf",
             "state": {
               "type": "all-properties",
@@ -125,62 +117,18 @@
   },
   "left-ribbon": {
     "hiddenItems": {
-      "switcher:Open quick switcher": false,
-      "graph:Open graph view": false,
-      "canvas:Create new canvas": false,
-      "command-palette:Open command palette": false,
-      "markdown-importer:Open format converter": false
+      "switcher:Меню быстрого перехода": false,
+      "graph:Граф": false,
+      "canvas:Создать новый холст": false,
+      "command-palette:Открыть палитру команд": false,
+      "markdown-importer:Импорт Markdown-файлов": false
     }
   },
-<<<<<<< HEAD
-  "active": "4b307134b450d3bf",
-  "lastOpenFiles": []
-=======
-  "active": "4f8b822ecf1ab6df",
+  "active": "2af91785fcdea33c",
   "lastOpenFiles": [
-    "linux/alacritty.md",
-    "hardcore web development/4. Linux.md",
-    "linux/linux common.md",
-    "linux/GS server.md",
-    "linux/server.md",
-    "TODO.md",
-    "Тренировки и занятия.md",
     "linux/vim.md",
-    "linux/bash.md",
-    "ROTEK/universal IO/universal IO.md",
-    "Счета.md",
-    "linux/Tmux.md",
-    "proGit.md",
-    "FlyElectronics/LT8920.md",
-    "ROTEK/RT-701/common.md",
-    "Database.kdbx.SnMcza",
-    "hardcore web development/5-6-7 Internet.md",
-    "hardcore web development/9. Сессии, cookies, безопасность.md",
-    "STM32/build.md",
-    "STM32/IRQ + FreeRTOS.md",
-    "ROTEK/metrolog/readme.md",
-    "ROTEK/metrolog/M3 artery + stm32.md",
-    "ROTEK/metrolog/Текучка Метролог.md",
-    "ROTEK/bt67xx/common.md",
-    "FlyElectronics/Drone.md",
-    "configs/alacritty.toml",
-    "FlyElectronics/Grinding machine.md",
-    "Разное.md",
-    "keys/dtelenkov.key",
-    "keys/dtelenkov.crt",
-    "STM32",
-    "configs/wg0.conf",
-    "keys/wg.conf",
-    "keys/Новый текстовый документ.txt",
-    "keys/dmt_server.pub",
-    "keys/dmt_server",
-    "img/Pasted image 20240518111756.png",
-    "img/Pasted image 20240424185826.png",
-    "img/Pasted image 20240415124521.png",
-    "img/Pasted image 20240415124210.png",
-    "img/Pasted image 20240415123611.png",
-    "img/Pasted image 20240415122028.png",
-    "img/sch04.JPG"
+    "c/c common.md",
+    "linux/server.md",
+    "Тренировки и занятия.md"
   ]
->>>>>>> 8060681e424598740c5696401c80bc37a5a44ed6
 }

+ 12 - 0
c/c common.md

@@ -32,4 +32,16 @@ $ gcc -c main.c
 $ gcc -c func.c
 $ gcc -o main main.o func.o
 ```
+```bash
+$ ldd main # выведет используемые библиотеки
+```
 <h6>make</h6>
+Первая цель в Makefile - это цель по умолчанию
+```make
+make: main.o func.o
+```
+Если добавить m.cpp
+```make
+make: main.o func.o
+```
+То при вызове команды `make` утилита сама определит язык и нужную команду компилятор.

+ 1 - 1
hardcore web development/4. Linux.md

@@ -1,4 +1,4 @@
-e##### <font color = "#1D8571">О системе</font>
+#### <font color = "#1D8571">О системе</font>
 https://losst.pro/sbor-informatsii-o-sisteme-ubuntu
 ```bash
 $ hostnamectl # версия ОС, ядра

+ 5 - 1
linux/vim.md

@@ -31,4 +31,8 @@
 
 <h6>Команды ex</h6>
 `:e!` - стереть все изменения и заново открыть файл
-`:syntax on` - включить подсветку синтаксиса
+`:syntax on` - включить подсветку синтаксиса
+<h6>Настройки</h6>
+```bash
+set expandtab - пробелы вместо табуляции
+```