diff --git a/config/nvim/lua/lsp/tinymist.lua b/config/nvim/lua/lsp/tinymist.lua index f40de0f..fc33b3a 100644 --- a/config/nvim/lua/lsp/tinymist.lua +++ b/config/nvim/lua/lsp/tinymist.lua @@ -2,7 +2,7 @@ return { filetypes = { 'typst' }, settings = { formatterMode = 'typstyle', - exportPdf = 'onSave', + -- exportPdf = 'onSave', semanticTokens = 'disable', lint = { enabled = true, diff --git a/config/nvim/lua/plugins/dev.lua b/config/nvim/lua/plugins/dev.lua index 83f84bb..d4d1841 100644 --- a/config/nvim/lua/plugins/dev.lua +++ b/config/nvim/lua/plugins/dev.lua @@ -105,14 +105,14 @@ return { 'barrettruth/canola.nvim', enabled = true, after = function() - require('canola').setup({ + require('oil').setup({ skip_confirm_for_simple_edits = true, cleanup_buffers_on_delete = true, prompt_save_on_select_new_entry = false, float = { border = 'single' }, view_options = { is_hidden_file = function(name, bufnr) - local dir = require('canola').get_current_dir(bufnr) + local dir = require('oil').get_current_dir(bufnr) local is_dotfile = vim.startswith(name, '.') and name ~= '..' if not dir then @@ -145,7 +145,7 @@ return { end, }, }) - local refresh = require('canola.actions').refresh + local refresh = require('oil.actions').refresh local orig_refresh = refresh.callback refresh.callback = function(...) git_status = new_git_status() @@ -162,7 +162,7 @@ return { end end, group = vim.api.nvim_create_augroup( - 'ACanola', + 'AOil', { clear = true } ), }) @@ -170,7 +170,7 @@ return { event = 'DeferredUIEnter', keys = { { '-', 'e .' }, - { '_', 'Canola' }, + { '_', 'Oil' }, }, }, { diff --git a/flake.lock b/flake.lock index 7ee4c96..e56aba1 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1773093840, - "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=", + "lastModified": 1773179137, + "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86", + "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1773101084, - "narHash": "sha256-XljZHTJCn26qu7oAgcLq8DtZ+BSbXY3iQ/1ylPsw54I=", + "lastModified": 1773187529, + "narHash": "sha256-g+SvIUF9he6xFI5d3752wNAsOcbKBg6a0HpX16ggKY4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "eee7ee7a7936b1aa7f6e5115535f6daf805f6896", + "rev": "2c00dfe845f47f9cdab706372e82613d233e5c85", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1773098641, - "narHash": "sha256-tgtRikZ+jtvdHiUSFpXq+AKFV0nvPDlEyxlGG9CCAOU=", + "lastModified": 1773186516, + "narHash": "sha256-IPthgh8IUiFme222fCPbFzxZHDmvDY9ibNZ4MS3v+PA=", "owner": "neovim", "repo": "neovim", - "rev": "a81b059a45ba832f9ad0bdb1b37b7519e5922cac", + "rev": "3a7ade847f10e22af6cecf92046eee238d6b21f6", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772956932, - "narHash": "sha256-M0yS4AafhKxPPmOHGqIV0iKxgNO8bHDWdl1kOwGBwRY=", + "lastModified": 1773110118, + "narHash": "sha256-mPAG8phMbCReKSiKAijjjd3v7uVcJOQ75gSjGJjt/Rk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "608d0cadfed240589a7eea422407a547ad626a14", + "rev": "e607cb5360ff1234862ac9f8839522becb853bb9", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1772945022, - "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", + "lastModified": 1773225617, + "narHash": "sha256-IT0n3jJgf4M7U0EuZJ2XJwXBmSJVVK3auqWDGeHGMzY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", + "rev": "413a22ab7acf848ed4e20c3f47ea96ccd4788518", "type": "github" }, "original": { diff --git a/home/modules/shell.nix b/home/modules/shell.nix index 37f42b7..60a338f 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -130,16 +130,16 @@ in home.activation.awsConfig = lib.mkIf aws ( lib.hm.dag.entryAfter [ "writeBoundary" ] '' - dir="${config.xdg.configHome}/aws" - mkdir -p "$dir" - if [ ! -f "$dir/config" ]; then - cat > "$dir/config" << 'AWSEOF' -[default] -[profile barrett] -region = us-east-2 -output = json -AWSEOF - fi + dir="${config.xdg.configHome}/aws" + mkdir -p "$dir" + if [ ! -f "$dir/config" ]; then + cat > "$dir/config" << 'AWSEOF' + [default] + [profile barrett] + region = us-east-2 + output = json + AWSEOF + fi '' );