From 9813d6305944e557478570d18033ba8907ff1485 Mon Sep 17 00:00:00 2001 From: subcrip Date: Tue, 4 Jun 2024 21:37:22 +0800 Subject: [PATCH] backup --- hypr/hyprland.conf | 8 +++++--- kitty.conf | 3 ++- nvim/lazy-lock.json | 8 ++++---- nvim/lua/config.lua | 9 +++++++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index a9d7e03..9b244ef 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -97,10 +97,10 @@ env = XMODIFIERS,"@im=fcitx" # https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 5 - gaps_out = 20 + gaps_in = 3 + gaps_out = 5 - border_size = 2 + border_size = 1 # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg @@ -219,6 +219,7 @@ $mainMod = SUPER # Sets "Windows" key as main modifier bind = $mainMod, T, exec, $terminal bind = $mainMod, C, killactive, bind = $mainMod, E, exec, $fileManager +bind = $mainMod, Z, exec, cd /home/user/RustIsBestLang/src/bin && /home/user/.local/bin/zed bind = $mainMod, V, togglefloating, bind = $mainMod, R, exec, $menu bind = $mainMod, P, pseudo, # dwindle @@ -231,6 +232,7 @@ bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d +bind = $mainMod, tab, exec, /home/user/.cargo/bin/hyprswitch --daemon # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 diff --git a/kitty.conf b/kitty.conf index b3736df..4b03dfe 100644 --- a/kitty.conf +++ b/kitty.conf @@ -3,11 +3,12 @@ font_family FiraCode Nerd Font Reg # install from AUR # yay -S ttf-victor-mono-nerd italic_font VictorMono NF Medium Italic -font_features FiraCodeNF-Reg +ss09 +ss10 +cv06 +font_features FiraCodeNF-Reg +ss09 +ss10 +cv06 +cv27 font_size 13 disable_ligatures cursor # modify_font cell_width 90% cursor_shape beam +cursor #A7E6FF cursor_blink_interval 0 scrollback_lines 10000 paste_actions quote-urls-at-prompt,confirm diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 6ebbbde..907875c 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -32,8 +32,8 @@ "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, "image.nvim": { "branch": "master", "commit": "645f997d171ea3d2505986a0519755600a26f02f" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "ebbf84eb23d796ffd92ad88b980d3cf89921add4" }, - "lazydev.nvim": { "branch": "main", "commit": "ddab2f1d901dc0c5c4f721da94c604cc1a86b5dc" }, + "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" }, + "lazydev.nvim": { "branch": "main", "commit": "e2bc1915b1056c422256f58025ff9a1e0488018c" }, "legendary.nvim": { "branch": "master", "commit": "ed71afddfbe70493cbbc6a51ec3433840913a3e2" }, "listish.nvim": { "branch": "master", "commit": "3bc4bb02036f3802c6428c6232633d3192ac3604" }, "lsp_signature.nvim": { "branch": "master", "commit": "2ec2ba23882329c1302dff773b0d3620371d634f" }, @@ -58,8 +58,9 @@ "nvim-numbertoggle": { "branch": "main", "commit": "c5827153f8a955886f1b38eaea6998c067d2992f" }, "nvim-origami": { "branch": "main", "commit": "fd3036a2235d188dce43274fed8392795a0cd392" }, "nvim-surround": { "branch": "main", "commit": "f1f0699a1d49f28e607ffa4361f1bbe757ac5ebc" }, - "nvim-treesitter": { "branch": "master", "commit": "a80fe081b4c5890980561e0de2458f64aaffbfc7" }, + "nvim-treesitter": { "branch": "master", "commit": "5a8e9644c49f992f47bacd7900f4404df6fd9d38" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, @@ -78,7 +79,6 @@ "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, "trouble.nvim": { "branch": "main", "commit": "915179759c9459b69faae90a38da6fc1ca6b90d7" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, - "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "813e1b3391c3f50100345bf3956c618f7e522e74" }, "vim-cursorword": { "branch": "master", "commit": "34852083276c1fd9ff4cccaf052111e7d5a2472e" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, "vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" }, diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index ad3c957..81c0152 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -376,7 +376,8 @@ local plugins = { opts = true, -- needed even when using default config }, { - 'altermo/ultimate-autopair.nvim', + dir = '/home/user/Documents/ultimate-autopair.nvim', + -- 'altermo/ultimate-autopair.nvim', event={'InsertEnter','CmdlineEnter'}, branch='v0.6', --recommended as each new version will have breaking changes opts={ @@ -397,6 +398,9 @@ local plugins = { } }, }, + { + 'RRethy/nvim-treesitter-endwise' -- lua `end` + }, } require("lazy").setup(plugins, {}) @@ -772,7 +776,8 @@ require("nvim-treesitter.configs").setup { ["[d"] = "@conditional.outer", } }, - } + }, + endwise = { enable = true, }, } local ts_repeat_move = require "nvim-treesitter.textobjects.repeatable_move"