From e4b7645102891d13d04a1f1c9039328c38e06966 Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Thu, 7 Mar 2024 02:49:09 +0100
Subject: [PATCH] Configure obsidian.nvim keybinds & more

- configure obsidian nvim keybinds
- fix typo: `img` => `imv`
- re-enable docker on tethys (also adds a hacky mysql db for... reasons)
---
 .../features/neovim/config/lua/my/options.lua | 49 -------------------
 home/features/neovim/default.nix              | 18 +++++--
 home/tethys.nix                               |  2 +-
 hosts/nixos/tethys/default.nix                |  9 +++-
 4 files changed, 23 insertions(+), 55 deletions(-)
 delete mode 100644 home/features/neovim/config/lua/my/options.lua

diff --git a/home/features/neovim/config/lua/my/options.lua b/home/features/neovim/config/lua/my/options.lua
deleted file mode 100644
index d5e8403..0000000
--- a/home/features/neovim/config/lua/my/options.lua
+++ /dev/null
@@ -1,49 +0,0 @@
-local M = {}
-
-function M.setup()
-  -- Disable filetype.vim
-  vim.g.do_filetype_lua = true
-  vim.g.did_load_filetypes = false
-
-  -- Basic options
-  vim.opt.joinspaces = false -- No double spaces with join
-  vim.opt.list = true -- Show some invisible characters
-  vim.opt.cmdheight = 0 -- Hide command line when it's not getting used
-
-  -- tcqj are there by default, and "r" automatically continues comments on enter
-  vim.opt.formatoptions = "tcqjr"
-
-  -- Line numbers
-  vim.opt.number = true -- Show line numbers
-  vim.opt.relativenumber = true -- Relative line numbers
-
-  vim.opt.expandtab = true -- Use spaces for the tab char
-  vim.opt.shiftwidth = 2 -- Size of an indent
-  vim.opt.tabstop = 2 -- Size of tab character
-  vim.opt.shiftround = true -- When using < or >, rounds to closest multiple of shiftwidth
-  vim.opt.smartindent = true -- Insert indents automatically
-
-  vim.opt.scrolloff = 4 -- Starts scrolling 4 lines from the edge of the screen
-  vim.opt.termguicolors = true -- True color support
-
-  vim.opt.ignorecase = true -- Ignore case
-  vim.opt.smartcase = true -- Do not ignore case with capitals
-
-  vim.opt.splitbelow = true -- Put new windows below current
-  vim.opt.splitright = true -- Put new windows right of current
-
-  vim.opt.wrap = false -- Disable line wrap (by default)
-  vim.opt.wildmode = { "list", "longest" } -- Command-line completion mode
-  vim.opt.completeopt = { "menu", "menuone", "noselect" }
-
-  vim.opt.undofile = true -- persist undos!!
-
-  -- Set leader
-  vim.g.mapleader = " "
-
-  -- Folding
-  vim.opt.foldmethod = "marker" -- use {{{ }}} for folding
-  vim.opt.foldcolumn = "1" -- show column with folds on the left
-end
-
-return M
diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix
index 20507f2..8169da6 100644
--- a/home/features/neovim/default.nix
+++ b/home/features/neovim/default.nix
@@ -1311,14 +1311,26 @@ let
             package = "epwalsh/obsidian.nvim";
             dependencies.lua = [ "plenary" ];
 
+            event = "VeryLazy";
             cond = [
               (blacklist [ "vscode" "firenvim" ])
               (lua /* lua */ "vim.loop.cwd() == ${encode vault}")
             ];
-            event = "VeryLazy";
 
-            keys.mapping = "<C-O>";
-            keys.action = "<cmd>ObsidianQuickSwitch<cr>";
+            config.keys =
+              let nmap = mapping: action: desc: {
+                inherit mapping desc;
+                action = "<cmd>Obsidian${action}<cr>";
+              };
+              in
+              [
+                (nmap "<C-O>" "QuickSwitch<cr>" "[o]pen note")
+                (nmap "<leader>ot" "Today" "[t]oday's note")
+                (nmap "<leader>oy" "Yesterday" "[y]esterday's note")
+                (nmap "<leader>oi" "Template" "[i]nstantiate template")
+                (nmap "<leader>on" "Template New note.md" "new [n]ote template")
+                (nmap "<leader>od" "Template New note.md" "new [d]ream template")
+              ];
 
             opts = {
               dir = vault;
diff --git a/home/tethys.nix b/home/tethys.nix
index 65dbc40..c3b8a91 100644
--- a/home/tethys.nix
+++ b/home/tethys.nix
@@ -47,7 +47,7 @@
     # }}} 
     # {{{ Media playing/recording
     mpv # Video player
-    img # Image viewer
+    imv # Image viewer
     # peek # GIF recorder
     # obs-studio # video recorder
     # }}}
diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix
index 6f8e093..1f8c4f2 100644
--- a/hosts/nixos/tethys/default.nix
+++ b/hosts/nixos/tethys/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }: {
+{ lib, pkgs, ... }: {
   # {{{ Imports
   imports = [
     ../common/global
@@ -41,7 +41,7 @@
   programs.kdeconnect.enable = true;
   programs.firejail.enable = true;
   programs.extra-container.enable = true;
-  # virtualisation.docker.enable = true;
+  virtualisation.docker.enable = true;
   # virtualisation.spiceUSBRedirection.enable = true; # This was required for the vm usb passthrough tomfoolery
   # }}}
   # {{{ Ad-hoc stylix targets
@@ -61,4 +61,9 @@
     in
     blacklist;
   # }}}
+
+  services.mysql = {
+    enable = true;
+    package = pkgs.mysql80;
+  };
 }