Compare commits
No commits in common. "537243b7b1d61f12ec26ba17320e2187668abb1c" and "9a48ad3381d0a6e0aec347054fd4faaead5691da" have entirely different histories.
537243b7b1
...
9a48ad3381
@ -34,7 +34,7 @@ background_alpha=0.4
|
|||||||
font_size=24
|
font_size=24
|
||||||
font_file=/yang/.local/share/fonts/CartographCFNerdFont-DemiBold.ttf
|
font_file=/yang/.local/share/fonts/CartographCFNerdFont-DemiBold.ttf
|
||||||
background_color=020202
|
background_color=020202
|
||||||
position=top-right
|
position=top-left
|
||||||
text_color=D8D8D8
|
text_color=D8D8D8
|
||||||
round_corners=5
|
round_corners=5
|
||||||
#GOVERLAY_THEME=amdradeon
|
#GOVERLAY_THEME=amdradeon
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
################### File Generated by GOverlay ###################
|
|
||||||
toggle_fps_limit=F1
|
|
||||||
|
|
||||||
|
|
||||||
legacy_layout=false
|
|
||||||
gpu_stats
|
|
||||||
gpu_temp
|
|
||||||
gpu_load_change
|
|
||||||
gpu_load_value=50,90
|
|
||||||
gpu_load_color=FFFFFF,FFAA7F,CC0000
|
|
||||||
gpu_text=GPU
|
|
||||||
cpu_stats
|
|
||||||
cpu_temp
|
|
||||||
cpu_load_change
|
|
||||||
core_load_change
|
|
||||||
cpu_load_value=50,90
|
|
||||||
cpu_load_color=FFFFFF,FFAA7F,CC0000
|
|
||||||
cpu_color=DE0835
|
|
||||||
cpu_text=CPU
|
|
||||||
io_color=D8D8D8
|
|
||||||
vram
|
|
||||||
vram_color=DE0835
|
|
||||||
ram
|
|
||||||
ram_color=DE0835
|
|
||||||
fps
|
|
||||||
engine_color=950524
|
|
||||||
gpu_color=DE0835
|
|
||||||
wine_color=950524
|
|
||||||
frame_timing=1
|
|
||||||
frametime_color=DE0835
|
|
||||||
media_player_color=950524
|
|
||||||
table_columns=3
|
|
||||||
background_alpha=0.4
|
|
||||||
font_size=24
|
|
||||||
font_file=/yang/.local/share/fonts/CartographCFNerdFont-DemiBold.ttf
|
|
||||||
background_color=020202
|
|
||||||
position=top-right
|
|
||||||
text_color=D8D8D8
|
|
||||||
round_corners=5
|
|
||||||
#GOVERLAY_THEME=amdradeon
|
|
||||||
toggle_hud=Shift_R+F12
|
|
||||||
toggle_logging=Shift_L+F2
|
|
||||||
upload_log=F5
|
|
||||||
output_folder=/home/jab
|
|
||||||
media_player_name=spotify
|
|
||||||
font_scale=0.8
|
|
@ -3,7 +3,6 @@ if status --is-login
|
|||||||
fish_add_path "$HOME/.cargo/bin"
|
fish_add_path "$HOME/.cargo/bin"
|
||||||
|
|
||||||
set -gx BAT_THEME "Solarized (light)"
|
set -gx BAT_THEME "Solarized (light)"
|
||||||
set -gx SOLARIZED true
|
|
||||||
set -gx EDITOR "nvim"
|
set -gx EDITOR "nvim"
|
||||||
|
|
||||||
if test -z "$WAYLAND_DISPLAY" && test "$XDG_VTNR" -eq 1
|
if test -z "$WAYLAND_DISPLAY" && test "$XDG_VTNR" -eq 1
|
||||||
|
@ -1,133 +0,0 @@
|
|||||||
" plugins
|
|
||||||
Plug 'tpope/vim-commentary'
|
|
||||||
|
|
||||||
set which-key
|
|
||||||
set commentary
|
|
||||||
" Set mouse to "a"
|
|
||||||
set mouse=a
|
|
||||||
|
|
||||||
" Set line numbers and relative line numbers
|
|
||||||
set nu
|
|
||||||
set rnu
|
|
||||||
|
|
||||||
" Append to clipboard
|
|
||||||
set clipboard+=unnamedplus
|
|
||||||
|
|
||||||
" Set tab settings
|
|
||||||
set tabstop=2
|
|
||||||
set softtabstop=2
|
|
||||||
set shiftwidth=2
|
|
||||||
set expandtab
|
|
||||||
|
|
||||||
" Enable smart indentation
|
|
||||||
set smartindent
|
|
||||||
|
|
||||||
" Disable text wrapping
|
|
||||||
set nowrap
|
|
||||||
|
|
||||||
" Disable swap and backup files, enable undofile
|
|
||||||
set noswapfile
|
|
||||||
set nobackup
|
|
||||||
let &undodir = $HOME . "/.vim/undodir"
|
|
||||||
set undofile
|
|
||||||
|
|
||||||
" Disable highlighting search results and enable incremental search
|
|
||||||
set nohlsearch
|
|
||||||
set incsearch
|
|
||||||
|
|
||||||
" Set scrolloff and signcolumn
|
|
||||||
set scrolloff=8
|
|
||||||
set signcolumn=yes
|
|
||||||
|
|
||||||
" Set filename characters
|
|
||||||
set isfname+=@-@
|
|
||||||
|
|
||||||
" Set update time
|
|
||||||
set updatetime=50
|
|
||||||
|
|
||||||
" Set colorcolumn
|
|
||||||
set colorcolumn=80
|
|
||||||
autocmd WinLeave * let &colorcolumn = "0"
|
|
||||||
autocmd WinEnter * let &colorcolumn = "80"
|
|
||||||
|
|
||||||
" Disable status line, command line, ruler, and mode display
|
|
||||||
set laststatus=0
|
|
||||||
set noshowcmd
|
|
||||||
set noruler
|
|
||||||
set noshowmode
|
|
||||||
|
|
||||||
" Set conceal level and cursor
|
|
||||||
set conceallevel=2
|
|
||||||
set concealcursor=n
|
|
||||||
|
|
||||||
" Set map leader to " "
|
|
||||||
let mapleader = " "
|
|
||||||
|
|
||||||
" Set case insensitive searching, smart case, and completion options
|
|
||||||
set ignorecase
|
|
||||||
set smartcase
|
|
||||||
set completeopt=menuone,noselect
|
|
||||||
|
|
||||||
" Set split settings
|
|
||||||
set splitright
|
|
||||||
set splitbelow
|
|
||||||
|
|
||||||
" Enable termguicolors and set terminal color
|
|
||||||
set termguicolors
|
|
||||||
let &t_Cs = "\e[4:3m"
|
|
||||||
let &t_Ce = "\e[4:0m"
|
|
||||||
|
|
||||||
set notimeout
|
|
||||||
|
|
||||||
" Normal mode mappings
|
|
||||||
nnoremap <silent> J :m '>+1<CR>gv=gv
|
|
||||||
nnoremap <silent> K :m '<-2<CR>gv=gv
|
|
||||||
nnoremap <silent> J mzJ`z
|
|
||||||
nnoremap <silent> <C-d> <C-d>zz
|
|
||||||
nnoremap <silent> <C-u> <C-u>zz
|
|
||||||
nnoremap <silent> n nzzzv
|
|
||||||
nnoremap <silent> N Nzzzv
|
|
||||||
nnoremap <leader>p [["_dP]]
|
|
||||||
nnoremap <silent> <leader>yy "+y
|
|
||||||
nnoremap <silent> <leader>Y "+Y
|
|
||||||
nnoremap <leader>dd "_d
|
|
||||||
nnoremap <silent> <C-c> <Esc>
|
|
||||||
nnoremap Q <nop>
|
|
||||||
nnoremap <silent> <A-k> :cnext<CR>zz
|
|
||||||
nnoremap <silent> <A-j> :cprev<CR>zz
|
|
||||||
nnoremap <silent> <leader>k :lnext<CR>zz
|
|
||||||
nnoremap <silent> <leader>j :lprev<CR>zz
|
|
||||||
nnoremap <leader>rr :%s/\<\<<C-r><C-w>\>/\<C-r><C-w>/gI<Left><Left><Left><Left>zz
|
|
||||||
nnoremap <silent> <leader>x :!chmod +x %<CR><CR>
|
|
||||||
nnoremap <leader>q :!go run %<CR><CR>
|
|
||||||
nnoremap <leader><Esc> <C-\><C-n>
|
|
||||||
nnoremap <leader>Sh <C-w>szz
|
|
||||||
nnoremap <leader>Sv <C-w>vzz
|
|
||||||
nnoremap <leader>Se <C-w>=zz
|
|
||||||
nnoremap <leader>Sx :close<CR>
|
|
||||||
nnoremap <C-l> <C-w>lzz
|
|
||||||
nnoremap <C-h> <C-w>hzz
|
|
||||||
nnoremap <C-j> <C-w>jzz
|
|
||||||
nnoremap <C-k> <C-w>kzz
|
|
||||||
nnoremap + <C-a>zz
|
|
||||||
nnoremap - <C-x>zz
|
|
||||||
nnoremap <left> 4<C-w><
|
|
||||||
nnoremap <right> 4<C-w>>
|
|
||||||
nnoremap <up> 4<C-w>+
|
|
||||||
nnoremap <down> 4<C-w>-
|
|
||||||
nnoremap <leader>gsj :GoTagAdd json <CR>zz
|
|
||||||
nnoremap <leader>gsy :GoTagAdd yaml <CR>zz
|
|
||||||
nnoremap <A-.> :bnext<CR>zz
|
|
||||||
nnoremap <A-,> :bprev<CR>zz
|
|
||||||
nnoremap <A-x> :bdelete<CR>zz
|
|
||||||
map <C-e> <action>(ActivateProjectToolWindow)
|
|
||||||
map <leader>sf <action>(SearchEverywhere)
|
|
||||||
map <leader>f <action>(ReformatCode)
|
|
||||||
|
|
||||||
|
|
||||||
" Visual mode mappings
|
|
||||||
vnoremap <silent> J :m '>+1<CR>gv=gv
|
|
||||||
vnoremap <silent> K :m '<-2<CR>gv=gv
|
|
||||||
vnoremap <silent> <leader>yy "+y
|
|
||||||
vnoremap <silent> <leader>dd "_d
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
|||||||
// Zed keymap
|
|
||||||
//
|
|
||||||
// For information on binding keys, see the Zed
|
|
||||||
// documentation: https://zed.dev/docs/key-bindings
|
|
||||||
//
|
|
||||||
// To see the default key bindings run `zed: open default keymap`
|
|
||||||
// from the command palette.
|
|
||||||
[
|
|
||||||
{
|
|
||||||
"context": "Workspace",
|
|
||||||
"bindings": {}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"context": "Editor && vim_mode == normal",
|
|
||||||
"bindings": {
|
|
||||||
"space s f": "file_finder::Toggle",
|
|
||||||
"space c a": "editor::ToggleCodeActions",
|
|
||||||
"space o t": "terminal_panel::ToggleFocus",
|
|
||||||
"space o l": "assistant::ToggleFocus",
|
|
||||||
"space o p": "projects::OpenRecent",
|
|
||||||
"alt-.": "pane::ActivateNextItem",
|
|
||||||
"alt-,": "pane::ActivatePrevItem",
|
|
||||||
"alt-x": "pane::CloseActiveItem",
|
|
||||||
"alt-1": "project_panel::ToggleFocus",
|
|
||||||
"alt-2": "outline_panel::ToggleFocus",
|
|
||||||
"alt-3": "collab_panel::ToggleFocus",
|
|
||||||
"alt-4": "editor::ToggleTabBar",
|
|
||||||
"ctrl-d": ["vim::ScrollDown", "editor::ScrollCursorCenter"],
|
|
||||||
"ctrl-u": ["vim::ScrollUp", "editor::ScrollCursorCenter"]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"context": "vim_mode == visual",
|
|
||||||
"bindings": {
|
|
||||||
"shift-j": "editor::MoveLineDown",
|
|
||||||
"shift-k": "editor::MoveLineUp"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"context": "Terminal",
|
|
||||||
"bindings": {
|
|
||||||
"ctrl-w": null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
@ -1,36 +0,0 @@
|
|||||||
// Zed settings
|
|
||||||
//
|
|
||||||
// For information on how to configure Zed, see the Zed
|
|
||||||
// documentation: https://zed.dev/docs/configuring-zed
|
|
||||||
//
|
|
||||||
// To see all of Zed's default settings without changing your
|
|
||||||
// custom settings, run `zed: open default settings` from the
|
|
||||||
// command palette
|
|
||||||
{
|
|
||||||
"chat_panel": {
|
|
||||||
"dock": "right"
|
|
||||||
},
|
|
||||||
"assistant": {
|
|
||||||
"default_model": {
|
|
||||||
"provider": "zed.dev",
|
|
||||||
"model": "claude-3-5-sonnet-20240620"
|
|
||||||
},
|
|
||||||
"version": "2"
|
|
||||||
},
|
|
||||||
"tab_bar": {
|
|
||||||
"show": true
|
|
||||||
},
|
|
||||||
"telemetry": {
|
|
||||||
"diagnostics": false,
|
|
||||||
"metrics": false
|
|
||||||
},
|
|
||||||
"vim_mode": true,
|
|
||||||
"relative_line_numbers": true,
|
|
||||||
"ui_font_size": 16,
|
|
||||||
"buffer_font_size": 16,
|
|
||||||
"theme": {
|
|
||||||
"mode": "system",
|
|
||||||
"light": "One Light",
|
|
||||||
"dark": "Solarized Dark"
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user