diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 77586b6..89bfd94 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -171,7 +171,11 @@ plugins.treesitter = { enable = true; nixGrammars = true; - settings.indent.enable = true; + settings = { + indent.enable = true; + auto_install = true; + highlight.enable = true; + }; }; plugins.fzf-lua = { enable = true; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 363efd6..eb920d5 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -39,11 +39,6 @@ initExtra = '' # disable control+s to pause terminal unsetopt FLOW_CONTROL - # manually integrate fzf cause we need to make sure zsh-vi-mode - # won't override C-r - function zvm_after_init() { - eval "$(${pkgs.fzf}/bin/fzf --zsh)" - } # useful emacs mode bindings bindkey -M viins "^E" end-of-line diff --git a/hosts/titan/Caddyfile b/hosts/titan/Caddyfile index 70cc99f..5969134 100644 --- a/hosts/titan/Caddyfile +++ b/hosts/titan/Caddyfile @@ -13,7 +13,7 @@ cything.io { import common - reverse_proxy localhost:8084 + redir https://cy7.sh/posts{uri} permanent header /.well-known/matrix/* Content-Type application/json header /.well-known/matrix/* Access-Control-Allow-Origin * diff --git a/justfile b/justfile index 95b1fda..e113688 100644 --- a/justfile +++ b/justfile @@ -1,9 +1,10 @@ update: + git branch -D update || true git switch -c update nix flake update git add flake.lock git commit -s -m "flake update" - git push + git push -f git switch main upgrade: