Skip to content

Commit

Permalink
single commit for master
Browse files Browse the repository at this point in the history
  • Loading branch information
ThePrimeagen committed Dec 1, 2021
1 parent 874636d commit 00576d6
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 649 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bin/.local/bin/solang

9 changes: 3 additions & 6 deletions bin/.local/bin/tmux-sessionizer
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [[ $# -eq 1 ]]; then
selected=$1
else
selected=$(find ~/work/builds ~/ ~/work ~/personal -mindepth 1 -maxdepth 1 -type d | fzf)
selected=$(find ~/work/builds ~/ ~/work ~/personal ~/personal/yt -mindepth 1 -maxdepth 1 -type d | fzf)
fi

if [[ -z $selected ]]; then
Expand All @@ -12,6 +12,7 @@ fi

selected_name=$(basename "$selected" | tr . _)
tmux_running=$(pgrep tmux)

if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then
tmux new-session -s $selected_name -c $selected
exit 0
Expand All @@ -21,8 +22,4 @@ if ! tmux has-session -t $selected_name 2> /dev/null; then
tmux new-session -ds $selected_name -c $selected
fi

if [[ -z $TMUX ]]; then
tmux attach-session -t $selected_name
else
tmux switch-client -t $selected_name
fi
tmux switch-client -t $selected_name
86 changes: 43 additions & 43 deletions i3/.config/i3/config
Original file line number Diff line number Diff line change
Expand Up @@ -101,52 +101,52 @@ bindsym $mod+a focus parent
#bindsym $mod+d focus child

# switch to workspace
# bindsym $mod+1 workspace 1
# bindsym $mod+2 workspace 2
# bindsym $mod+3 workspace 3
# bindsym $mod+4 workspace 4
# bindsym $mod+5 workspace 5
# bindsym $mod+6 workspace 6
# bindsym $mod+7 workspace 7
# bindsym $mod+8 workspace 8
# bindsym $mod+9 workspace 9
# bindsym $mod+0 workspace 10

# switch to workspace
bindsym $mod+Shift+equal workspace 1
bindsym $mod+bracketleft workspace 2
bindsym $mod+Shift+bracketleft workspace 3
bindsym $mod+Shift+9 workspace 4
bindsym $mod+Shift+7 workspace 5
bindsym $mod+equal workspace 6
bindsym $mod+Shift+0 workspace 7
bindsym $mod+Shift+bracketright workspace 8
bindsym $mod+bracketright workspace 9
bindsym $mod+Shift+8 workspace 10
bindsym $mod+1 workspace 1
bindsym $mod+2 workspace 2
bindsym $mod+3 workspace 3
bindsym $mod+4 workspace 4
bindsym $mod+5 workspace 5
bindsym $mod+6 workspace 6
bindsym $mod+7 workspace 7
bindsym $mod+8 workspace 8
bindsym $mod+9 workspace 9
bindsym $mod+0 workspace 10

# move focused container to workspace
bindsym $mod+1 move container to workspace 1
bindsym $mod+2 move container to workspace 2
bindsym $mod+3 move container to workspace 3
bindsym $mod+4 move container to workspace 4
bindsym $mod+5 move container to workspace 5
bindsym $mod+6 move container to workspace 6
bindsym $mod+7 move container to workspace 7
bindsym $mod+8 move container to workspace 8
bindsym $mod+9 move container to workspace 9
bindsym $mod+0 move container to workspace 10
bindsym $mod+Shift+1 move container to workspace 1
bindsym $mod+Shift+2 move container to workspace 2
bindsym $mod+Shift+3 move container to workspace 3
bindsym $mod+Shift+4 move container to workspace 4
bindsym $mod+Shift+5 move container to workspace 5
bindsym $mod+Shift+6 move container to workspace 6
bindsym $mod+Shift+7 move container to workspace 7
bindsym $mod+Shift+8 move container to workspace 8
bindsym $mod+Shift+9 move container to workspace 9
bindsym $mod+Shift+0 move container to workspace 10

# move focused container to workspace
# bindsym $mod+Shift+1 move container to workspace 1
# bindsym $mod+Shift+2 move container to workspace 2
# bindsym $mod+Shift+3 move container to workspace 3
# bindsym $mod+Shift+4 move container to workspace 4
# bindsym $mod+Shift+5 move container to workspace 5
# bindsym $mod+Shift+6 move container to workspace 6
# bindsym $mod+Shift+7 move container to workspace 7
# bindsym $mod+Shift+8 move container to workspace 8
# bindsym $mod+Shift+9 move container to workspace 9
# bindsym $mod+Shift+0 move container to workspace 10
# switch to workspace
#_ bindsym $mod+Shift+equal workspace 1
#_ bindsym $mod+bracketleft workspace 2
#_ bindsym $mod+Shift+bracketleft workspace 3
#_ bindsym $mod+Shift+9 workspace 4
#_ bindsym $mod+Shift+7 workspace 5
#_ bindsym $mod+equal workspace 6
#_ bindsym $mod+Shift+0 workspace 7
#_ bindsym $mod+Shift+bracketright workspace 8
#_ bindsym $mod+bracketright workspace 9
#_ bindsym $mod+Shift+8 workspace 10
#_
#_ # move focused container to workspace
#_ bindsym $mod+1 move container to workspace 1
#_ bindsym $mod+2 move container to workspace 2
#_ bindsym $mod+3 move container to workspace 3
#_ bindsym $mod+4 move container to workspace 4
#_ bindsym $mod+5 move container to workspace 5
#_ bindsym $mod+6 move container to workspace 6
#_ bindsym $mod+7 move container to workspace 7
#_ bindsym $mod+8 move container to workspace 8
#_ bindsym $mod+9 move container to workspace 9
#_ bindsym $mod+0 move container to workspace 10


# reload the configuration file
Expand Down
8 changes: 5 additions & 3 deletions nvim/.config/nvim/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/nvim-cmp'
Plug 'tzachar/cmp-tabnine', { 'do': './install.sh' }
Plug 'onsails/lspkind-nvim'
Plug 'github/copilot.vim'
" Plug 'github/copilot.vim'
Plug 'nvim-lua/lsp_extensions.nvim'

" Plug 'nvim-lua/completion-nvim'
Plug 'glepnir/lspsaga.nvim'
Expand Down Expand Up @@ -82,10 +83,10 @@ Plug 'sbdchd/neoformat'
call plug#end()

" Adding local modules
let &runtimepath.=',' . expand("$HOME") . '/personal/harpoon/master'
let &runtimepath.=',' . expand("$HOME") . '/personal/harpoon/tmux'
let &runtimepath.=',' . expand("$HOME") . '/personal/vim-with-me/ui'
let &runtimepath.=',' . expand("$HOME") . '/personal/git-worktree.nvim/master'
let &runtimepath.=',' . expand("$HOME") . '/personal/refactoring.nvim/printfyou'
let &runtimepath.=',' . expand("$HOME") . '/personal/refactoring.nvim/master'

" let g:vimspector_install_gadgets = [ 'debugpy', 'vscode-cpptools', 'CodeLLDB' ]

Expand Down Expand Up @@ -132,6 +133,7 @@ nnoremap <leader>dwm :lua require("vim-with-me").disconnect()<CR>
nnoremap <leader>gll :let g:_search_term = expand("%")<CR><bar>:Gclog -- %<CR>:call search(g:_search_term)<CR>
nnoremap <leader>gln :cnext<CR>:call search(_search_term)<CR>
nnoremap <leader>glp :cprev<CR>:call search(_search_term)<CR>
nnoremap <leader>nf :!./scripts/format.py %
nnoremap <leader>x :silent !chmod +x %<CR>
Expand Down
17 changes: 13 additions & 4 deletions nvim/.config/nvim/lua/theprimeagen/lsp.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
local sumneko_root_path = "/home/theprimeagen/personal/lua-language-server"
local sumneko_binary = sumneko_root_path .. "/bin/Linux/lua-language-server"

vim.lsp.set_log_level("debug")

local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true

Expand Down Expand Up @@ -57,7 +55,7 @@ cmp.setup({
sources = {
-- tabnine completion? yayaya

{ name = "cmp_tabnine" },
-- { name = "cmp_tabnine" },

{ name = "nvim_lsp" },

Expand Down Expand Up @@ -123,7 +121,18 @@ require("lspconfig").gopls.setup(config({
}))

-- who even uses this?
require("lspconfig").rust_analyzer.setup(config({}))
require("lspconfig").rust_analyzer.setup(config({
cmd = { "rustup", "run", "nightly", "rust-analyzer"},
--[[
settings = {
rust = {
unstable_features = true,
build_on_save = false,
all_features = true,
},
}
--]]
}))

require("lspconfig").sumneko_lua.setup(config({
cmd = { sumneko_binary, "-E", sumneko_root_path .. "/main.lua" },
Expand Down
2 changes: 2 additions & 0 deletions nvim/.config/nvim/plugin/refactoring.vim
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
lua require("theprimeagen")

lua require("refactoring").setup({})

vnoremap <silent> <leader>rr :lua require("theprimeagen.telescope").refactors()<CR>
nnoremap <silent> <leader>rr :lua require("theprimeagen.telescope").refactors()<CR>
nnoremap <silent> <leader>df :lua require("refactoring").debug.printf({below = false})<CR>
Expand Down
2 changes: 1 addition & 1 deletion nvim/.config/nvim/plugin/telescope.vim
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ nnoremap <Leader>pf :lua require('telescope.builtin').find_files()<CR>
nnoremap <leader>pw :lua require('telescope.builtin').grep_string { search = vim.fn.expand("<cword>") }<CR>
nnoremap <leader>pb :lua require('telescope.builtin').buffers()<CR>
nnoremap <leader>vh :lua require('telescope.builtin').help_tags()<CR>
nnoremap <leader>vrc :lua require('theprimeagen.telescope').search_dotfiles()<CR>
nnoremap <leader>vrc :lua require('theprimeagen.telescope').search_dotfiles({ hidden = true })<CR>
nnoremap <leader>va :lua require('theprimeagen.telescope').anime_selector()<CR>
nnoremap <leader>vc :lua require('theprimeagen.telescope').chat_selector()<CR>
nnoremap <leader>gc :lua require('theprimeagen.telescope').git_branches()<CR>
Expand Down
1 change: 1 addition & 0 deletions tmux/.tmux-cht-languages
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
golang
solidity
nodejs
javascript
tmux
Expand Down
Loading

0 comments on commit 00576d6

Please sign in to comment.