[fix] Sync macos changes

This commit is contained in:
Uttarayan Mondal
2022-12-29 16:56:46 +05:30
parent 113fe0d4ef
commit 1f4a22f77a
9 changed files with 70 additions and 12 deletions

View File

@@ -0,0 +1,27 @@
complete -c sflasher -n "__fish_use_subcommand" -s h -l help -d 'Print help information'
complete -c sflasher -n "__fish_use_subcommand" -f -a "list" -d 'List the connected keyboards supported by this tool'
complete -c sflasher -n "__fish_use_subcommand" -f -a "firmware" -d 'Operation on a specific keyboard'
complete -c sflasher -n "__fish_use_subcommand" -f -a "flash"
complete -c sflasher -n "__fish_use_subcommand" -f -a "reboot"
complete -c sflasher -n "__fish_use_subcommand" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
complete -c sflasher -n "__fish_seen_subcommand_from list" -s v -l verbose -d 'Print the devices in verbose mode'
complete -c sflasher -n "__fish_seen_subcommand_from list" -s b -l bootloader -d 'Show devices in bootloader mode'
complete -c sflasher -n "__fish_seen_subcommand_from list" -s n -l normal -d 'Show devices in normal mode'
complete -c sflasher -n "__fish_seen_subcommand_from list" -s a -l all -d 'Show devices in any mode'
complete -c sflasher -n "__fish_seen_subcommand_from list" -s h -l help -d 'Print help information'
complete -c sflasher -n "__fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from check; and not __fish_seen_subcommand_from help" -s h -l help -d 'Print help information'
complete -c sflasher -n "__fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from check; and not __fish_seen_subcommand_from help" -f -a "check"
complete -c sflasher -n "__fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from check; and not __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
complete -c sflasher -n "__fish_seen_subcommand_from firmware; and __fish_seen_subcommand_from check" -s h -l help -d 'Print help information'
complete -c sflasher -n "__fish_seen_subcommand_from firmware; and __fish_seen_subcommand_from help; and not __fish_seen_subcommand_from check; and not __fish_seen_subcommand_from help" -f -a "check"
complete -c sflasher -n "__fish_seen_subcommand_from firmware; and __fish_seen_subcommand_from help; and not __fish_seen_subcommand_from check; and not __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
complete -c sflasher -n "__fish_seen_subcommand_from flash" -s k -l keyboard -d 'The path to the keyboard' -r
complete -c sflasher -n "__fish_seen_subcommand_from flash" -s o -l offset -d 'The offset to flash from' -r
complete -c sflasher -n "__fish_seen_subcommand_from flash" -s h -l help -d 'Print help information'
complete -c sflasher -n "__fish_seen_subcommand_from reboot" -s h -l help -d 'Print help information'
complete -c sflasher -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from list; and not __fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from flash; and not __fish_seen_subcommand_from reboot; and not __fish_seen_subcommand_from help" -f -a "list" -d 'List the connected keyboards supported by this tool'
complete -c sflasher -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from list; and not __fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from flash; and not __fish_seen_subcommand_from reboot; and not __fish_seen_subcommand_from help" -f -a "firmware" -d 'Operation on a specific keyboard'
complete -c sflasher -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from list; and not __fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from flash; and not __fish_seen_subcommand_from reboot; and not __fish_seen_subcommand_from help" -f -a "flash"
complete -c sflasher -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from list; and not __fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from flash; and not __fish_seen_subcommand_from reboot; and not __fish_seen_subcommand_from help" -f -a "reboot"
complete -c sflasher -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from list; and not __fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from flash; and not __fish_seen_subcommand_from reboot; and not __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
complete -c sflasher -n "__fish_seen_subcommand_from help; and __fish_seen_subcommand_from firmware; and not __fish_seen_subcommand_from check" -f -a "check"

View File

@@ -54,6 +54,6 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_pager_color_selected_background:\x2dr
SETUVAR fish_user_paths:/Users/fs0c131y/\x2ecargo/bin\x1e/Users/fs0c131y/\x2elocal/bin
SETUVAR fish_user_paths:/opt/homebrew/Cellar/arm\x2dgcc\x2dbin\x408/8\x2d2019\x2dq3\x2dupdate_2/bin\x1e/Users/fs0c131y/\x2ecargo/bin\x1e/Users/fs0c131y/\x2elocal/bin
SETUVAR nvm_data:/Users/fs0c131y/\x2elocal/share/nvm
SETUVAR nvm_mirror:https\x3a//nodejs\x2eorg/dist

View File

View File

@@ -746,7 +746,7 @@ mark1_background #ff5555
#: Advanced {{{
# shell .
shell fish
shell /opt/homebrew/bin/fish
#: The shell program to execute. The default value of . means to use
#: whatever shell is set as the default shell for the current user.

View File

@@ -33,4 +33,5 @@ local colors = {
-- Override some colors
vim.cmd('hi Normal guibg='..colors.black)
vim.cmd('hi EndOfBuffer guibg='..colors.black)
-- vim.cmd('hi ToggleTerm1Buffer guibg='..colors.black)
-- vim.cmd('hi NonText guibg='..colors.black)

View File

@@ -1,11 +1,15 @@
-- local lspstatus = require('lsp-status')
-- lspstatus.register_progress()
-- require("lsp.rust-analyzer")
require("lsp.lua-language-server")
require("lsp.tsserver")
require("lsp.clangd")
require("lsp.pyright")
-- require("lsp.tsserver")
-- require("lsp.pyright")
-- require("lsp.rust-analyzer")
-- require 'lspconfig'.clangd.setup {}
require 'lspconfig'.tsserver.setup {}
require 'lspconfig'.pyright.setup {}
require 'lspconfig'.sqls.setup {}
-- Set completeopt to have a better completion experience
-- vim.o.completeopt= "menuone,noinsert,noselect"

View File

@@ -13,7 +13,33 @@ end
return require('packer').startup(function()
-- Packer can manage itself
use 'wbthomason/packer.nvim'
use { 'wbthomason/packer.nvim' }
use { 'williamboman/mason.nvim',
config = function()
require("mason").setup({
ui = {
icons = {
package_installed = "",
package_pending = "",
package_uninstalled = ""
}
}
})
end
}
use {
"williamboman/mason-lspconfig.nvim",
config = function()
require("mason-lspconfig").setup({
ensure_installed = { "sumneko_lua", "rust_analyzer" },
automatic_installation = true,
})
end
}
use { 'mhartington/formatter.nvim' }
-- use 'imsnif/kdl.vim'
use 'christianrondeau/vim-base64'
use {
'NTBBloodbath/galaxyline.nvim', branch = 'main',
@@ -86,10 +112,10 @@ return require('packer').startup(function()
}
use { 'neovim/nvim-lspconfig', config = function() require("lsp") end, }
use { 'williamboman/nvim-lsp-installer' }
use { 'nvim-lua/lsp-status.nvim' }
use { 'ms-jpq/coq_nvim', requires = { 'ms-jpq/coq.artifacts' } }
use { 'ms-jpq/coq_nvim', requires = { 'ms-jpq/coq.artifacts' }, run = ':COQdeps' }
use { 'ms-jpq/chadtree', run = ':CHADdeps' }
use { 'ms-jpq/coq.thirdparty', config = function()
require("coq_3p")({
{
@@ -99,7 +125,8 @@ return require('packer').startup(function()
max_lines = 99,
deadline = 500,
unsafe = { "rm", "poweroff", "mv" }
}, { src = "bc", short_name = "MATH", precision = 6 },
},
{ src = "bc", short_name = "MATH", precision = 6 },
{ src = "copilot", short_name = "COP", accept_key = "<C-l>" },
{ src = "dap" }
})
@@ -160,7 +187,6 @@ return require('packer').startup(function()
}
use { 'simrat39/rust-tools.nvim', config = function() require 'setup.rust-tools' end }
use 'ms-jpq/chadtree'
use 'ellisonleao/glow.nvim'
use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } }

View File

@@ -19,7 +19,7 @@ set -g @plugin 'dracula/tmux'
run -b '~/.config/tmux/plugins/tpm/tpm'
set -g default-shell '/opt/homebrew/bin/fish'
set -g default-terminal 'xterm-256color'
set -g default-terminal 'tmux-256color'
set -ga terminal-overrides ',*256col*:Tc'
set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'
set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'

View File

@@ -1,7 +1,7 @@
local wezterm = require 'wezterm';
return {
font = wezterm.font("Hasklug Nerd Font"),
font = wezterm.font_with_fallback {"Hasklug Nerd Font", "Hasklug Nerd Font Mono"},
font_size = 16,
colors = {
-- The default text color