summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <mike@pionative.com>2024-03-08 21:31:13 +0100
committerMike Vink <mike@pionative.com>2024-03-08 21:31:13 +0100
commit4b8d71a669112b6e6b4d91381a0e0afaf08cfc9b (patch)
tree5a4dd4b37617d5b3984a6998fc2202e5637ff0f4
parent9d6e650ae42e9f858ba0a695d581b0c24f1cb9de (diff)
update
-rw-r--r--machines/work.nix1
-rwxr-xr-xmut/bin/vremote4
-rw-r--r--mut/lf/lfrc1
-rw-r--r--mut/neovim/fnl/conf/init.fnl8
-rw-r--r--profiles/core/home.nix4
-rw-r--r--profiles/core/neovim.nix1
6 files changed, 16 insertions, 3 deletions
diff --git a/machines/work.nix b/machines/work.nix
index 5343bd6..4c43fdb 100644
--- a/machines/work.nix
+++ b/machines/work.nix
@@ -40,6 +40,7 @@
pkgs.kubelogin
pkgs.zsh
pkgs.bashInteractive
+ pkgs.awscli2
];
hm.home.sessionPath = [
"/opt/homebrew/bin"
diff --git a/mut/bin/vremote b/mut/bin/vremote
index 7b0ee06..9cdc9e9 100755
--- a/mut/bin/vremote
+++ b/mut/bin/vremote
@@ -1,5 +1,7 @@
#!/bin/bash
-PATH="/etc/profiles/per-user/$USER/bin:/run/current-system/sw/bin:/usr/bin:/bin"
+if [ -z "$PATH" ]; then
+ PATH="/etc/profiles/per-user/$USER/bin:/run/current-system/sw/bin:/usr/bin:/bin"
+fi
server_pipe="$XDG_CACHE_HOME/nvim/server.pipe"
(
if ! [ -e "$server_pipe" ]; then
diff --git a/mut/lf/lfrc b/mut/lf/lfrc
index 7887ef5..c34ba42 100644
--- a/mut/lf/lfrc
+++ b/mut/lf/lfrc
@@ -163,6 +163,7 @@ map i :rename # before extension
map a :rename; cmd-right # after extension
map B bulkrename
map b $setbg $f
+map <backspace2> clear
map <c-e> down
map <c-y> up
diff --git a/mut/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl
index 0cd1b8e..d183a5a 100644
--- a/mut/neovim/fnl/conf/init.fnl
+++ b/mut/neovim/fnl/conf/init.fnl
@@ -96,6 +96,14 @@
(local uis (vim.iter (vim.api.nvim_list_uis)))
(uis:map (fn [ui] (vim.fn.chanclose ui.chan))))))
+(do
+ (local obsidian (require "obsidian"))
+ (obsidian.setup
+ { :workspaces
+ [{
+ :name "notes"
+ :path "~/Sync/my/notes"}]}))
+
(vim.api.nvim_create_user_command
:NixEdit
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 4763bca..08e2c06 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -129,7 +129,7 @@
lfcd () {
tmp="$(mktemp -uq)"
trap 'rm -f $tmp >/dev/null 2>&1 && trap - HUP INT QUIT TERM EXIT' HUP INT QUIT TERM EXIT
- lf -last-dir-path="$tmp" "$@"
+ EDITOR=vremote lf -last-dir-path="$tmp" "$@"
if [ -f "$tmp" ]; then
dir="$(cat "$tmp")"
[ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
@@ -137,7 +137,7 @@
}
bindkey -s '^o' '^ulfcd\n'
- export EDITOR="vremote"
+ export EDITOR="nvim"
export TERMINAL="st"
( command -v brew ) &>/dev/null && eval "$(/opt/homebrew/bin/brew shellenv)"
( command -v docker ) &>/dev/null && eval "$(docker completion zsh)"
diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix
index c4f7a2e..e1da7cc 100644
--- a/profiles/core/neovim.nix
+++ b/profiles/core/neovim.nix
@@ -64,6 +64,7 @@
venn-nvim
gv-vim
zoxide-vim
+ obsidian-nvim
# Coding
fzf-lua