diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .obsidian/core-plugins.json | 3 | ||||
| -rw-r--r-- | .obsidian/workspace.json | 95 | ||||
| -rw-r--r-- | NixOS - Imperative container management.md | 3 | ||||
| -rw-r--r-- | NixOS - container directories.md | 3 | ||||
| -rw-r--r-- | conflict-files-obsidian-git.md | 17 |
6 files changed, 79 insertions, 44 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ab19508 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.obsidian/workspace.json
\ No newline at end of file diff --git a/.obsidian/core-plugins.json b/.obsidian/core-plugins.json index 436f43c..c89a841 100644 --- a/.obsidian/core-plugins.json +++ b/.obsidian/core-plugins.json @@ -26,5 +26,6 @@ "workspaces": false, "file-recovery": true, "publish": false, - "sync": false + "sync": false, + "webviewer": false }
\ No newline at end of file diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index c2973af..b94e45a 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -4,67 +4,80 @@ "type": "split", "children": [ { - "id": "f33c11cf18be28d7", + "id": "d7ac73dacb8efdbe", "type": "tabs", "children": [ { - "id": "3628dba7efa2e99a", + "id": "6bdd9a8324d3b0f0", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "Freenet CPU steal graph.md", + "file": "Build custom modules as profiles to manage various NixOS hosts.md", "mode": "source", "backlinks": true, "source": false }, "icon": "lucide-file", - "title": "Freenet CPU steal graph" + "title": "Build custom modules as profiles to manage various NixOS hosts" } }, { - "id": "b1754e4cb810f3a0", + "id": "84e32b3623ed3a00", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "How to show the mysql galera cluster status.md", + "file": "NixOS - Advantage of imperative container management.md", "mode": "source", "backlinks": true, "source": false }, "icon": "lucide-file", - "title": "How to show the mysql galera cluster status" + "title": "NixOS - Advantage of imperative container management" } }, { - "id": "5ac5819f83e59327", + "id": "be0892c76b1d189a", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "Managing the amount of WSGI processes ran by apache is done from the apache site configuration.md", + "file": "Nix Inherit.md", "mode": "source", "backlinks": true, "source": false }, "icon": "lucide-file", - "title": "Managing the amount of WSGI processes ran by apache is done from the apache site configuration" + "title": "Nix Inherit" } }, { - "id": "487149710eacf558", + "id": "1fb3c7b7af372a3c", "type": "leaf", "state": { - "type": "markdown", + "type": "split-diff-view", "state": { - "file": "daily/18-Apr-2025.md", - "mode": "source", - "backlinks": true, - "source": false + "aFile": "conflict-files-obsidian-git.md", + "bFile": "conflict-files-obsidian-git.md", + "aRef": "" }, - "icon": "lucide-file", - "title": "18-Apr-2025" + "icon": "diff", + "title": "Diff: conflict-files-obsidian-git" + } + }, + { + "id": "487206acc9e25de0", + "type": "leaf", + "state": { + "type": "split-diff-view", + "state": { + "aFile": ".gitignore", + "bFile": ".gitignore", + "aRef": "" + }, + "icon": "diff", + "title": "Diff: .gitignore" } } ], @@ -99,7 +112,7 @@ "state": { "type": "search", "state": { - "query": "iptables", + "query": "", "matchingCase": false, "explainSearch": false, "collapseAll": false, @@ -219,35 +232,35 @@ "obsidian-excalidraw-plugin:New drawing": false } }, - "active": "487149710eacf558", + "active": "1fb3c7b7af372a3c", "lastOpenFiles": [ - "daily/15-Apr-2025.md", + "NixOS - Imperative container management.md", + "conflict-files-obsidian-git.md", "daily/18-Apr-2025.md", - "Working with Nix shells.md", - "Managing the amount of WSGI processes ran by apache is done from the apache site configuration.md", - "How to show the mysql galera cluster status.md", - "Freenet CPU steal graph.md", "daily/17-Apr-2025.md", - "daily/14-Apr-2025.md", "daily/16-Apr-2025.md", - "Debugging issues with updating Puppet dependency.md", - "It's recommended to use small-medium ARC for hypervisors where ZFS is used.md", - "How to RIP (grep).md", - "Using Libvirt to manage QEMU image bitmaps.md", - "Importing GPG keys from a keyserver.md", - "Exposing development headers on Nixos.md", - "About keyboard layout on Wayland.md", - "Benchmarking code in Golang.md", - "Testing Golang programs.md", - "How to properly do options in a bash script with getopt!.md", - "We don't support filesystem discard syscalls on our openstack platform.md", - "Examples of proper JQ usage.md", - "Device mapper.md", + "daily/15-Apr-2025.md", + "daily/14-Apr-2025.md", "daily/11-Apr-2025.md", "daily/10-Apr-2025.md", - "List of tags I use in this Vault and their purpose.md", - "Managing Ceph on Devstack & OpenStack.md", "daily", + "YAGNI.md", + "Writing a test double before the real implementation gives feedback on design.md", + "Working with Nix shells.md", + "We don't support filesystem discard syscalls on our openstack platform.md", + "Using Libvirt to manage QEMU image bitmaps.md", + "Updating the image os admin user to fix password resets.md", + "The volume type of a Cinder volume can be changed.md", + "Testing Golang programs.md", + "Tempest Plugin.md", + "TDD.md", + "Rewriting subselect into just an additional join.md", + "Random notes on Freenet deployment.md", + "OpenStack Tempest.md", + "OVN upgrade.md", + "Network outage on single hypervisor causes Freenet to shutdown EVERYTHING.md", + "Managing the amount of WSGI processes ran by apache is done from the apache site configuration.md", + "Managing Ceph on Devstack & OpenStack.md", "ESP", "Excalidraw" ] diff --git a/NixOS - Imperative container management.md b/NixOS - Imperative container management.md index 7099e6e..4dba2ec 100644 --- a/NixOS - Imperative container management.md +++ b/NixOS - Imperative container management.md @@ -1,7 +1,6 @@ As root using `nixos-container`. -Container root: `/var/lib/nixos-containers -Config file: `/etc/nixos-containers` +[[NixOS - container directories]] Create with: `nixos-container create foo`. During create we can pass `--config` or `--config-file`. diff --git a/NixOS - container directories.md b/NixOS - container directories.md new file mode 100644 index 0000000..8c02bad --- /dev/null +++ b/NixOS - container directories.md @@ -0,0 +1,3 @@ + +Container root: `/var/lib/nixos-containers +Config file: `/etc/nixos-containers`
\ No newline at end of file diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md new file mode 100644 index 0000000..d8bbd4f --- /dev/null +++ b/conflict-files-obsidian-git.md @@ -0,0 +1,17 @@ +# Conflicts +Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` +(This file will automatically be deleted before commit) +[[#Additional Instructions]] available below file list + +- Not a file: .obsidian/workspace.json + +# Additional Instructions +I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. + +```diff +<<<<<<< HEAD + File changes in local repository +======= + File changes in remote repository +>>>>>>> origin/main +```
\ No newline at end of file |