From 0200553526a1816ad748cbf73fb61d0cdcbd2829 Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Sun, 9 Jun 2024 14:12:03 -0400 Subject: [PATCH 01/14] migrating remaining configurations to init.lua --- .config/nvim/init.lua | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 90029e2..0293cb1 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -54,7 +54,7 @@ vim.ofoldmethod = indent vim.cmd('nnoremap za') -- Search and Replace -vim.cmd('nnoremap r :%s///g') +vim.cmd('nnoremap R :%s///g') -- Auto close brackets @@ -72,4 +72,41 @@ vim.cmd('noremap ') vim.cmd('noremap ') vim.cmd('noremap ') +-- Plugin keymappings + +-- NERDTree +vim.cmd('autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif') +vim.cmd('map :NERDTreeToggle') +vim.cmd('let NERDTreeMapOpenInTab="\r"') + +-- FZF +vim.cmd('nnoremap f :FZF') + +-- Fugitive +vim.cmd('nnoremap d :Gvdiffsplit') + +-- vim-go +-- Go syntax highlighting +vim.g.go_highlight_fields = 1 +vim.g.go_highlight_functions = 1 +vim.g.go_highlight_function_calls = 1 +vim.g.go_highlight_extra_types = 1 +vim.g.go_highlight_operators = 1 + +-- formatting and importing +vim.g.go_fmt_autosave = 1 +vim.g.go_fmt_command = "goimports" + +-- Status line types/signatures +vim.g.go_auto_type_info = 1 + +vim.cmd('autocmd FileType go nmap r (go-run)') +vim.cmd('autocmd FileType go nmap t (go-test)') +vim.cmd('autocmd FileType go nmap b (go-build)') + +vim.cmd('au filetype go inoremap . .') + +-- QOL Fixes +vim.o.completeopt=longest,menuone +vim.cmd("inoremap pumvisible() ? '' : 'u'") From d6d8adc92985c4ea3d9cf8e3c225cbf13db34779 Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Thu, 27 Jun 2024 20:57:07 -0400 Subject: [PATCH 02/14] Adjusting autocomplte opt on nvim --- .config/nvim/init.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 0293cb1..7f129b4 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,10 +1,9 @@ --- Set nocompatible -vim.o.compatible = false --- Plugins - local vim = vim local Plug = vim.fn['plug#'] +-- Set nocompatible +vim.o.compatible = false +-- Plugins vim.call('plug#begin') Plug('tpope/vim-fugitive') @@ -49,7 +48,7 @@ vim.cmd('nnoremap h :nohlsearch') vim.o.foldenable = true --enable folding vim.o.foldlevelstart = 10 --open most folds by default vim.o.foldnestmax = 10 -- 10 nested fold max -vim.ofoldmethod = indent +vim.o.foldmethod = indent -- space open/closes folds vim.cmd('nnoremap za') @@ -107,6 +106,6 @@ vim.cmd('autocmd FileType go nmap b (go-build)') vim.cmd('au filetype go inoremap . .') -- QOL Fixes -vim.o.completeopt=longest,menuone +vim.o.completeopt = "menu,menuone,noinsert" vim.cmd("inoremap pumvisible() ? '' : 'u'") From bacfc87875f15949903a05a1d681ba252cf162ad Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Fri, 28 Jun 2024 00:46:18 -0400 Subject: [PATCH 03/14] Manging dotfiles via stow now --- Makefile | 12 - .bash_aliases => bash/.bash_aliases | 0 .bashrc => bash/.bashrc | 2 +- .inputrc => bash/.inputrc | 0 .profile => bash/.profile | 0 btop/.config/btop/btop.conf | 200 ++++++ colors/badwolf.vim | 670 ------------------ .gitconfig => git/.gitconfig | 0 mdless/.config/mdless/mdless.theme | 68 ++ nvim/.config/nvim/init.lua | 130 ++++ .../powerline/colorschemes/default.json | 18 + powerline/.config/powerline/config.json | 8 + .../powerline/themes/shell/default.json | 43 ++ .../themes/shell/default_leftonly.json | 44 ++ .../.config/powerline/themes/zsh/default.json | 43 ++ .../themes/zsh/default_leftonly.json | 44 ++ pypoetry/.config/pypoetry/config.toml | 3 + .tmux.conf => tmux/.tmux.conf | 0 {.vim => vim/.vim}/colors/badwolf.vim | 0 .vimrc => vim/.vimrc | 7 +- .zsh_aliases => zsh/.zsh_aliases | 0 .zshrc => zsh/.zshrc | 4 +- 22 files changed, 606 insertions(+), 690 deletions(-) rename .bash_aliases => bash/.bash_aliases (100%) rename .bashrc => bash/.bashrc (98%) rename .inputrc => bash/.inputrc (100%) rename .profile => bash/.profile (100%) create mode 100644 btop/.config/btop/btop.conf delete mode 100644 colors/badwolf.vim rename .gitconfig => git/.gitconfig (100%) create mode 100644 mdless/.config/mdless/mdless.theme create mode 100644 nvim/.config/nvim/init.lua create mode 100644 powerline/.config/powerline/colorschemes/default.json create mode 100644 powerline/.config/powerline/config.json create mode 100644 powerline/.config/powerline/themes/shell/default.json create mode 100644 powerline/.config/powerline/themes/shell/default_leftonly.json create mode 100644 powerline/.config/powerline/themes/zsh/default.json create mode 100644 powerline/.config/powerline/themes/zsh/default_leftonly.json create mode 100644 pypoetry/.config/pypoetry/config.toml rename .tmux.conf => tmux/.tmux.conf (100%) rename {.vim => vim/.vim}/colors/badwolf.vim (100%) rename .vimrc => vim/.vimrc (94%) rename .zsh_aliases => zsh/.zsh_aliases (100%) rename .zshrc => zsh/.zshrc (95%) diff --git a/Makefile b/Makefile index 0873595..65f9384 100644 --- a/Makefile +++ b/Makefile @@ -11,18 +11,6 @@ showenv: @echo 'Module: '${MODULE} @echo 'Tag: '${TAG} -copy-files: - @echo 'Copying dotfiles from home directory' - @cp $(HOME)/.bash_aliases $(CURDIR) -# @cp $(HOME)/.zsh* $(CURDIR) - @cp $(HOME)/.bashrc $(CURDIR) - @cp $(HOME)/.gitconfig $(CURDIR) - @cp $(HOME)/.vimrc $(CURDIR) - @cp $(HOME)/.profile $(CURDIR) - @cp $(HOME)/.tmux.conf $(CURDIR) - @cp -r $(HOME)/.vim/colors $(CURDIR)/.vim/ -# @cp -r $(HOME)/.config $(CURDIR) - install-ansible: @echo 'Installing ansible' diff --git a/.bash_aliases b/bash/.bash_aliases similarity index 100% rename from .bash_aliases rename to bash/.bash_aliases diff --git a/.bashrc b/bash/.bashrc similarity index 98% rename from .bashrc rename to bash/.bashrc index 847751b..3510c4e 100644 --- a/.bashrc +++ b/bash/.bashrc @@ -152,7 +152,7 @@ fi # Powerline export PATH=$PATH:$HOME/.local/bin -if [ -f $HOME/.local/lib/python3.*/site-packages/powerline/bindings/bash/powerline.sh ]; then +if [ -f $HOME/.local/bin/powerline-daemon ]; then $HOME/.local/bin/powerline-daemon -q POWERLINE_BASH_CONTINUATION=1 POWERLINE_BASH_SELECT=1 diff --git a/.inputrc b/bash/.inputrc similarity index 100% rename from .inputrc rename to bash/.inputrc diff --git a/.profile b/bash/.profile similarity index 100% rename from .profile rename to bash/.profile diff --git a/btop/.config/btop/btop.conf b/btop/.config/btop/btop.conf new file mode 100644 index 0000000..7f8ffec --- /dev/null +++ b/btop/.config/btop/btop.conf @@ -0,0 +1,200 @@ +#? Config file for btop v. 1.2.3 + +#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. +#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" +color_theme = "Default" + +#* If the theme set background should be shown, set to False if you want terminal background transparency. +theme_background = True + +#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. +truecolor = True + +#* Set to true to force tty mode regardless if a real tty has been detected or not. +#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols. +force_tty = False + +#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. +#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box. +#* Use withespace " " as separator between different presets. +#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty" +presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty" + +#* Set to True to enable "h,j,k,l" keys for directional control in lists. +#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift. +vim_keys = False + +#* Rounded corners on boxes, is ignored if TTY mode is ON. +rounded_corners = True + +#* Default symbols to use for graph creation, "braille", "block" or "tty". +#* "braille" offers the highest resolution but might not be included in all fonts. +#* "block" has half the resolution of braille but uses more common characters. +#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY. +#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view. +graph_symbol = "braille" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_cpu = "default" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_mem = "default" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_net = "default" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_proc = "default" + +#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace. +shown_boxes = "cpu mem net proc" + +#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. +update_ms = 2000 + +#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu responsive", +#* "cpu lazy" sorts top process over time (easier to follow), "cpu responsive" updates top process directly. +proc_sorting = "cpu lazy" + +#* Reverse sorting order, True or False. +proc_reversed = False + +#* Show processes as a tree. +proc_tree = False + +#* Use the cpu graph colors in the process list. +proc_colors = True + +#* Use a darkening gradient in the process list. +proc_gradient = True + +#* If process cpu usage should be of the core it's running on or usage of the total available cpu power. +proc_per_core = False + +#* Show process memory as bytes instead of percent. +proc_mem_bytes = True + +#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate) +proc_info_smaps = False + +#* Show proc box on left side of screen instead of right. +proc_left = False + +#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available. +#* Select from a list of detected attributes from the options menu. +cpu_graph_upper = "total" + +#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available. +#* Select from a list of detected attributes from the options menu. +cpu_graph_lower = "total" + +#* Toggles if the lower CPU graph should be inverted. +cpu_invert_lower = True + +#* Set to True to completely disable the lower CPU graph. +cpu_single_graph = False + +#* Show cpu box at bottom of screen instead of top. +cpu_bottom = False + +#* Shows the system uptime in the CPU box. +show_uptime = True + +#* Show cpu temperature. +check_temp = True + +#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors. +cpu_sensor = "Auto" + +#* Show temperatures for cpu cores also if check_temp is True and sensors has been found. +show_coretemp = True + +#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core. +#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine. +#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries. +#* Example: "4:0 5:1 6:3" +cpu_core_map = "" + +#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine". +temp_scale = "celsius" + +#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024. +base_10_sizes = False + +#* Show CPU frequency. +show_cpu_freq = True + +#* Draw a clock at top of screen, formatting according to strftime, empty string to disable. +#* Special formatting: /host = hostname | /user = username | /uptime = system uptime +clock_format = "%X" + +#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort. +background_update = True + +#* Custom cpu model name, empty string to disable. +custom_cpu_name = "" + +#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ". +#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user". +disks_filter = "" + +#* Show graphs instead of meters for memory values. +mem_graphs = True + +#* Show mem box below net box instead of above. +mem_below_net = False + +#* If swap memory should be shown in memory box. +show_swap = True + +#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk. +swap_disk = True + +#* If mem box should be split to also show disks info. +show_disks = True + +#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar. +only_physical = True + +#* Read disks list from /etc/fstab. This also disables only_physical. +use_fstab = True + +#* Set to true to show available disk space for privileged users. +disk_free_priv = False + +#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view. +show_io_stat = True + +#* Toggles io mode for disks, showing big graphs for disk read/write speeds. +io_mode = False + +#* Set to True to show combined read/write io graphs in io mode. +io_graph_combined = False + +#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ". +#* Example: "/mnt/media:100 /:20 /boot:1". +io_graph_speeds = "" + +#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False. +net_download = 100 + +net_upload = 100 + +#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. +net_auto = True + +#* Sync the auto scaling for download and upload to whichever currently has the highest scale. +net_sync = False + +#* Starts with the Network Interface specified here. +net_iface = "" + +#* Show battery stats in top right if battery is present. +show_battery = True + +#* Which battery to use if multiple are present. "Auto" for auto detection. +selected_battery = "Auto" + +#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". +#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. +log_level = "WARNING" \ No newline at end of file diff --git a/colors/badwolf.vim b/colors/badwolf.vim deleted file mode 100644 index 9ce5441..0000000 --- a/colors/badwolf.vim +++ /dev/null @@ -1,670 +0,0 @@ -" _ _ _ __ -" | |__ __ _ __| | __ _____ | |/ _| -" | '_ \ / _` |/ _` | \ \ /\ / / _ \| | |_ -" | |_) | (_| | (_| | \ V V / (_) | | _| -" |_.__/ \__,_|\__,_| \_/\_/ \___/|_|_| -" -" I am the Bad Wolf. I create myself. -" I take the words. I scatter them in time and space. -" A message to lead myself here. -" -" A Vim colorscheme pieced together by Steve Losh. -" Available at http://stevelosh.com/projects/badwolf/ -" -" Why? {{{ -" -" After using Molokai for quite a long time, I started longing for -" a replacement. -" -" I love Molokai's high contrast and gooey, saturated tones, but it can be -" a little inconsistent at times. -" -" Also it's winter here in Rochester, so I wanted a color scheme that's a bit -" warmer. A little less blue and a bit more red. -" -" And so Bad Wolf was born. I'm no designer, but designers have been scattering -" beautiful colors through time and space long before I came along. I took -" advantage of that and reused some of my favorites to lead me to this scheme. -" -" }}} - -" Supporting code ------------------------------------------------------------- -" Preamble {{{ - -if !has("gui_running") && &t_Co != 88 && &t_Co != 256 - finish -endif - -set background=dark - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = "badwolf" - -if !exists("g:badwolf_html_link_underline") " {{{ - let g:badwolf_html_link_underline = 1 -endif " }}} - -if !exists("g:badwolf_css_props_highlight") " {{{ - let g:badwolf_css_props_highlight = 0 -endif " }}} - -" }}} -" Palette {{{ - -let s:bwc = {} - -" The most basic of all our colors is a slightly tweaked version of the Molokai -" Normal text. -let s:bwc.plain = ['f8f6f2', 15] - -" Pure and simple. -let s:bwc.snow = ['ffffff', 15] -let s:bwc.coal = ['000000', 16] - -" All of the Gravel colors are based on a brown from Clouds Midnight. -let s:bwc.brightgravel = ['d9cec3', 252] -let s:bwc.lightgravel = ['998f84', 245] -let s:bwc.gravel = ['857f78', 243] -let s:bwc.mediumgravel = ['666462', 241] -let s:bwc.deepgravel = ['45413b', 238] -let s:bwc.deepergravel = ['35322d', 236] -let s:bwc.darkgravel = ['242321', 235] -let s:bwc.blackgravel = ['1c1b1a', 233] -let s:bwc.blackestgravel = ['141413', 232] - -" A color sampled from a highlight in a photo of a glass of Dale's Pale Ale on -" my desk. -let s:bwc.dalespale = ['fade3e', 221] - -" A beautiful tan from Tomorrow Night. -let s:bwc.dirtyblonde = ['f4cf86', 222] - -" Delicious, chewy red from Made of Code for the poppiest highlights. -let s:bwc.taffy = ['ff2c4b', 196] - -" Another chewy accent, but use sparingly! -let s:bwc.saltwatertaffy = ['8cffba', 121] - -" The star of the show comes straight from Made of Code. -" -" You should almost never use this. It should be used for things that denote -" 'where the user is', which basically consists of: -" -" * The cursor -" * A REPL prompt -let s:bwc.tardis = ['0a9dff', 39] - -" This one's from Mustang, not Florida! -let s:bwc.orange = ['ffa724', 214] - -" A limier green from Getafe. -let s:bwc.lime = ['aeee00', 154] - -" Rose's dress in The Idiot's Lantern. -let s:bwc.dress = ['ff9eb8', 211] - -" Another play on the brown from Clouds Midnight. I love that color. -let s:bwc.toffee = ['b88853', 137] - -" Also based on that Clouds Midnight brown. -let s:bwc.coffee = ['c7915b', 173] -let s:bwc.darkroast = ['88633f', 95] - -" }}} -" Highlighting Function {{{ -function! s:HL(group, fg, ...) - " Arguments: group, guifg, guibg, gui, guisp - - let histring = 'hi ' . a:group . ' ' - - if strlen(a:fg) - if a:fg == 'fg' - let histring .= 'guifg=fg ctermfg=fg ' - else - let c = get(s:bwc, a:fg) - let histring .= 'guifg=#' . c[0] . ' ctermfg=' . c[1] . ' ' - endif - endif - - if a:0 >= 1 && strlen(a:1) - if a:1 == 'bg' - let histring .= 'guibg=bg ctermbg=bg ' - else - let c = get(s:bwc, a:1) - let histring .= 'guibg=#' . c[0] . ' ctermbg=' . c[1] . ' ' - endif - endif - - if a:0 >= 2 && strlen(a:2) - let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' ' - endif - - if a:0 >= 3 && strlen(a:3) - let c = get(s:bwc, a:3) - let histring .= 'guisp=#' . c[0] . ' ' - endif - - " echom histring - - execute histring -endfunction -" }}} -" Configuration Options {{{ - -if exists('g:badwolf_darkgutter') && g:badwolf_darkgutter - let s:gutter = 'blackestgravel' -else - let s:gutter = 'blackgravel' -endif - -if exists('g:badwolf_tabline') - if g:badwolf_tabline == 0 - let s:tabline = 'blackestgravel' - elseif g:badwolf_tabline == 1 - let s:tabline = 'blackgravel' - elseif g:badwolf_tabline == 2 - let s:tabline = 'darkgravel' - elseif g:badwolf_tabline == 3 - let s:tabline = 'deepgravel' - else - let s:tabline = 'blackestgravel' - endif -else - let s:tabline = 'blackgravel' -endif - -" }}} - -" Actual colorscheme ---------------------------------------------------------- -" Vanilla Vim {{{ - -" General/UI {{{ - -call s:HL('Normal', 'plain', 'blackgravel') - -call s:HL('Folded', 'mediumgravel', 'bg', 'none') - -call s:HL('VertSplit', 'lightgravel', 'bg', 'none') - -call s:HL('CursorLine', '', 'darkgravel', 'none') -call s:HL('CursorColumn', '', 'darkgravel') -call s:HL('ColorColumn', '', 'darkgravel') - -call s:HL('TabLine', 'plain', s:tabline, 'none') -call s:HL('TabLineFill', 'plain', s:tabline, 'none') -call s:HL('TabLineSel', 'coal', 'tardis', 'none') - -call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold') - -call s:HL('NonText', 'deepgravel', 'bg') -call s:HL('SpecialKey', 'deepgravel', 'bg') - -call s:HL('Visual', '', 'deepgravel') -call s:HL('VisualNOS', '', 'deepgravel') - -call s:HL('Search', 'coal', 'dalespale', 'bold') -call s:HL('IncSearch', 'coal', 'tardis', 'bold') - -call s:HL('Underlined', 'fg', '', 'underline') - -call s:HL('StatusLine', 'coal', 'tardis', 'bold') -call s:HL('StatusLineNC', 'snow', 'deepgravel', 'bold') - -call s:HL('Directory', 'dirtyblonde', '', 'bold') - -call s:HL('Title', 'lime') - -call s:HL('ErrorMsg', 'taffy', 'bg', 'bold') -call s:HL('MoreMsg', 'dalespale', '', 'bold') -call s:HL('ModeMsg', 'dirtyblonde', '', 'bold') -call s:HL('Question', 'dirtyblonde', '', 'bold') -call s:HL('WarningMsg', 'dress', '', 'bold') - -" This is a ctags tag, not an HTML one. 'Something you can use c-] on'. -call s:HL('Tag', '', '', 'bold') - -" hi IndentGuides guibg=#373737 -" hi WildMenu guifg=#66D9EF guibg=#000000 - -" }}} -" Gutter {{{ - -call s:HL('LineNr', 'mediumgravel', s:gutter) -call s:HL('SignColumn', '', s:gutter) -call s:HL('FoldColumn', 'mediumgravel', s:gutter) - -" }}} -" Cursor {{{ - -call s:HL('Cursor', 'coal', 'tardis', 'bold') -call s:HL('vCursor', 'coal', 'tardis', 'bold') -call s:HL('iCursor', 'coal', 'tardis', 'none') - -" }}} -" Syntax highlighting {{{ - -" Start with a simple base. -call s:HL('Special', 'plain') - -" Comments are slightly brighter than folds, to make 'headers' easier to see. -call s:HL('Comment', 'gravel') -call s:HL('Todo', 'snow', 'bg', 'bold') -call s:HL('SpecialComment', 'snow', 'bg', 'bold') - -" Strings are a nice, pale straw color. Nothing too fancy. -call s:HL('String', 'dirtyblonde') - -" Control flow stuff is taffy. -call s:HL('Statement', 'taffy', '', 'bold') -call s:HL('Keyword', 'taffy', '', 'bold') -call s:HL('Conditional', 'taffy', '', 'bold') -call s:HL('Operator', 'taffy', '', 'none') -call s:HL('Label', 'taffy', '', 'none') -call s:HL('Repeat', 'taffy', '', 'none') - -" Functions and variable declarations are orange, because plain looks weird. -call s:HL('Identifier', 'orange', '', 'none') -call s:HL('Function', 'orange', '', 'none') - -" Preprocessor stuff is lime, to make it pop. -" -" This includes imports in any given language, because they should usually be -" grouped together at the beginning of a file. If they're in the middle of some -" other code they should stand out, because something tricky is -" probably going on. -call s:HL('PreProc', 'lime', '', 'none') -call s:HL('Macro', 'lime', '', 'none') -call s:HL('Define', 'lime', '', 'none') -call s:HL('PreCondit', 'lime', '', 'bold') - -" Constants of all kinds are colored together. -" I'm not really happy with the color yet... -call s:HL('Constant', 'toffee', '', 'bold') -call s:HL('Character', 'toffee', '', 'bold') -call s:HL('Boolean', 'toffee', '', 'bold') - -call s:HL('Number', 'toffee', '', 'bold') -call s:HL('Float', 'toffee', '', 'bold') - -" Not sure what 'special character in a constant' means, but let's make it pop. -call s:HL('SpecialChar', 'dress', '', 'bold') - -call s:HL('Type', 'dress', '', 'none') -call s:HL('StorageClass', 'taffy', '', 'none') -call s:HL('Structure', 'taffy', '', 'none') -call s:HL('Typedef', 'taffy', '', 'bold') - -" Make try/catch blocks stand out. -call s:HL('Exception', 'lime', '', 'bold') - -" Misc -call s:HL('Error', 'snow', 'taffy', 'bold') -call s:HL('Debug', 'snow', '', 'bold') -call s:HL('Ignore', 'gravel', '', '') - -" }}} -" Completion Menu {{{ - -call s:HL('Pmenu', 'plain', 'deepergravel') -call s:HL('PmenuSel', 'coal', 'tardis', 'bold') -call s:HL('PmenuSbar', '', 'deepergravel') -call s:HL('PmenuThumb', 'brightgravel') - -" }}} -" Diffs {{{ - -call s:HL('DiffDelete', 'coal', 'coal') -call s:HL('DiffAdd', '', 'deepergravel') -call s:HL('DiffChange', '', 'darkgravel') -call s:HL('DiffText', 'snow', 'deepergravel', 'bold') - -" }}} -" Spelling {{{ - -if has("spell") - call s:HL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale') - call s:HL('SpellBad', '', 'bg', 'undercurl', 'dalespale') - call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale') - call s:HL('SpellRare', '', '', 'undercurl', 'dalespale') -endif - -" }}} - -" }}} -" Plugins {{{ - -" CtrlP {{{ - - " the message when no match is found - call s:HL('CtrlPNoEntries', 'snow', 'taffy', 'bold') - - " the matched pattern - call s:HL('CtrlPMatch', 'orange', 'bg', 'none') - - " the line prefix '>' in the match window - call s:HL('CtrlPLinePre', 'deepgravel', 'bg', 'none') - - " the prompt’s base - call s:HL('CtrlPPrtBase', 'deepgravel', 'bg', 'none') - - " the prompt’s text - call s:HL('CtrlPPrtText', 'plain', 'bg', 'none') - - " the prompt’s cursor when moving over the text - call s:HL('CtrlPPrtCursor', 'coal', 'tardis', 'bold') - - " 'prt' or 'win', also for 'regex' - call s:HL('CtrlPMode1', 'coal', 'tardis', 'bold') - - " 'file' or 'path', also for the local working dir - call s:HL('CtrlPMode2', 'coal', 'tardis', 'bold') - - " the scanning status - call s:HL('CtrlPStats', 'coal', 'tardis', 'bold') - - " TODO: CtrlP extensions. - " CtrlPTabExtra : the part of each line that’s not matched against (Comment) - " CtrlPqfLineCol : the line and column numbers in quickfix mode (|s:HL-Search|) - " CtrlPUndoT : the elapsed time in undo mode (|s:HL-Directory|) - " CtrlPUndoBr : the square brackets [] in undo mode (Comment) - " CtrlPUndoNr : the undo number inside [] in undo mode (String) - -" }}} -" EasyMotion {{{ - -call s:HL('EasyMotionTarget', 'tardis', 'bg', 'bold') -call s:HL('EasyMotionShade', 'deepgravel', 'bg') - -" }}} -" Interesting Words {{{ - -" These are only used if you're me or have copied the hNUM mappings -" from my Vimrc. -call s:HL('InterestingWord1', 'coal', 'orange') -call s:HL('InterestingWord2', 'coal', 'lime') -call s:HL('InterestingWord3', 'coal', 'saltwatertaffy') -call s:HL('InterestingWord4', 'coal', 'toffee') -call s:HL('InterestingWord5', 'coal', 'dress') -call s:HL('InterestingWord6', 'coal', 'taffy') - - -" }}} -" Makegreen {{{ - -" hi GreenBar term=reverse ctermfg=white ctermbg=green guifg=coal guibg=#9edf1c -" hi RedBar term=reverse ctermfg=white ctermbg=red guifg=white guibg=#C50048 - -" }}} -" Rainbow Parentheses {{{ - -call s:HL('level16c', 'mediumgravel', '', 'bold') -call s:HL('level15c', 'dalespale', '', '') -call s:HL('level14c', 'dress', '', '') -call s:HL('level13c', 'orange', '', '') -call s:HL('level12c', 'tardis', '', '') -call s:HL('level11c', 'lime', '', '') -call s:HL('level10c', 'toffee', '', '') -call s:HL('level9c', 'saltwatertaffy', '', '') -call s:HL('level8c', 'coffee', '', '') -call s:HL('level7c', 'dalespale', '', '') -call s:HL('level6c', 'dress', '', '') -call s:HL('level5c', 'orange', '', '') -call s:HL('level4c', 'tardis', '', '') -call s:HL('level3c', 'lime', '', '') -call s:HL('level2c', 'toffee', '', '') -call s:HL('level1c', 'saltwatertaffy', '', '') - -" }}} -" ShowMarks {{{ - -call s:HL('ShowMarksHLl', 'tardis', 'blackgravel') -call s:HL('ShowMarksHLu', 'tardis', 'blackgravel') -call s:HL('ShowMarksHLo', 'tardis', 'blackgravel') -call s:HL('ShowMarksHLm', 'tardis', 'blackgravel') - -" }}} - -" }}} -" Filetype-specific {{{ - -" Clojure {{{ - -call s:HL('clojureSpecial', 'taffy', '', '') -call s:HL('clojureDefn', 'taffy', '', '') -call s:HL('clojureDefMacro', 'taffy', '', '') -call s:HL('clojureDefine', 'taffy', '', '') -call s:HL('clojureMacro', 'taffy', '', '') -call s:HL('clojureCond', 'taffy', '', '') - -call s:HL('clojureKeyword', 'orange', '', 'none') - -call s:HL('clojureFunc', 'dress', '', 'none') -call s:HL('clojureRepeat', 'dress', '', 'none') - -call s:HL('clojureParen0', 'lightgravel', '', 'none') - -call s:HL('clojureAnonArg', 'snow', '', 'bold') - -" }}} -" Common Lisp {{{ - -call s:HL('lispFunc', 'lime', '', 'none') -call s:HL('lispVar', 'orange', '', 'bold') -call s:HL('lispEscapeSpecial', 'orange', '', 'none') - -" }}} -" CSS {{{ - -if g:badwolf_css_props_highlight - call s:HL('cssColorProp', 'taffy', '', 'none') - call s:HL('cssBoxProp', 'taffy', '', 'none') - call s:HL('cssTextProp', 'taffy', '', 'none') - call s:HL('cssRenderProp', 'taffy', '', 'none') - call s:HL('cssGeneratedContentProp', 'taffy', '', 'none') -else - call s:HL('cssColorProp', 'fg', '', 'none') - call s:HL('cssBoxProp', 'fg', '', 'none') - call s:HL('cssTextProp', 'fg', '', 'none') - call s:HL('cssRenderProp', 'fg', '', 'none') - call s:HL('cssGeneratedContentProp', 'fg', '', 'none') -end - -call s:HL('cssValueLength', 'toffee', '', 'bold') -call s:HL('cssColor', 'toffee', '', 'bold') -call s:HL('cssBraces', 'lightgravel', '', 'none') -call s:HL('cssIdentifier', 'orange', '', 'bold') -call s:HL('cssClassName', 'orange', '', 'none') - -" }}} -" Diff {{{ - -call s:HL('gitDiff', 'lightgravel', '',) - -call s:HL('diffRemoved', 'dress', '',) -call s:HL('diffAdded', 'lime', '',) -call s:HL('diffFile', 'coal', 'taffy', 'bold') -call s:HL('diffNewFile', 'coal', 'taffy', 'bold') - -call s:HL('diffLine', 'coal', 'orange', 'bold') -call s:HL('diffSubname', 'orange', '', 'none') - -" }}} -" Django Templates {{{ - -call s:HL('djangoArgument', 'dirtyblonde', '',) -call s:HL('djangoTagBlock', 'orange', '') -call s:HL('djangoVarBlock', 'orange', '') -" hi djangoStatement guifg=#ff3853 gui=bold -" hi djangoVarBlock guifg=#f4cf86 - -" }}} -" HTML {{{ - -" Punctuation -call s:HL('htmlTag', 'darkroast', 'bg', 'none') -call s:HL('htmlEndTag', 'darkroast', 'bg', 'none') - -" Tag names -call s:HL('htmlTagName', 'coffee', '', 'bold') -call s:HL('htmlSpecialTagName', 'coffee', '', 'bold') -call s:HL('htmlSpecialChar', 'lime', '', 'none') - -" Attributes -call s:HL('htmlArg', 'coffee', '', 'none') - -" Stuff inside an tag - -if g:badwolf_html_link_underline - call s:HL('htmlLink', 'lightgravel', '', 'underline') -else - call s:HL('htmlLink', 'lightgravel', '', 'none') -endif - -" }}} -" Java {{{ - -call s:HL('javaClassDecl', 'taffy', '', 'bold') -call s:HL('javaScopeDecl', 'taffy', '', 'bold') -call s:HL('javaCommentTitle', 'gravel', '') -call s:HL('javaDocTags', 'snow', '', 'none') -call s:HL('javaDocParam', 'dalespale', '', '') - -" }}} -" LaTeX {{{ - -call s:HL('texStatement', 'tardis', '', 'none') -call s:HL('texMathZoneX', 'orange', '', 'none') -call s:HL('texMathZoneA', 'orange', '', 'none') -call s:HL('texMathZoneB', 'orange', '', 'none') -call s:HL('texMathZoneC', 'orange', '', 'none') -call s:HL('texMathZoneD', 'orange', '', 'none') -call s:HL('texMathZoneE', 'orange', '', 'none') -call s:HL('texMathZoneV', 'orange', '', 'none') -call s:HL('texMathZoneX', 'orange', '', 'none') -call s:HL('texMath', 'orange', '', 'none') -call s:HL('texMathMatcher', 'orange', '', 'none') -call s:HL('texRefLabel', 'dirtyblonde', '', 'none') -call s:HL('texRefZone', 'lime', '', 'none') -call s:HL('texComment', 'darkroast', '', 'none') -call s:HL('texDelimiter', 'orange', '', 'none') -call s:HL('texZone', 'brightgravel', '', 'none') - -augroup badwolf_tex - au! - - au BufRead,BufNewFile *.tex syn region texMathZoneV start="\\(" end="\\)\|%stopzone\>" keepend contains=@texMathZoneGroup - au BufRead,BufNewFile *.tex syn region texMathZoneX start="\$" skip="\\\\\|\\\$" end="\$\|%stopzone\>" keepend contains=@texMathZoneGroup -augroup END - -" }}} -" LessCSS {{{ - -call s:HL('lessVariable', 'lime', '', 'none') - -" }}} -" Lispyscript {{{ - -call s:HL('lispyscriptDefMacro', 'lime', '', '') -call s:HL('lispyscriptRepeat', 'dress', '', 'none') - -" }}} -" REPLs {{{ -" This isn't a specific plugin, but just useful highlight classes for anything -" that might want to use them. - -call s:HL('replPrompt', 'tardis', '', 'bold') - -" }}} -" Mail {{{ - -call s:HL('mailSubject', 'orange', '', 'bold') -call s:HL('mailHeader', 'lightgravel', '', '') -call s:HL('mailHeaderKey', 'lightgravel', '', '') -call s:HL('mailHeaderEmail', 'snow', '', '') -call s:HL('mailURL', 'toffee', '', 'underline') -call s:HL('mailSignature', 'gravel', '', 'none') - -call s:HL('mailQuoted1', 'gravel', '', 'none') -call s:HL('mailQuoted2', 'dress', '', 'none') -call s:HL('mailQuoted3', 'dirtyblonde', '', 'none') -call s:HL('mailQuoted4', 'orange', '', 'none') -call s:HL('mailQuoted5', 'lime', '', 'none') - -" }}} -" Markdown {{{ - -call s:HL('markdownHeadingRule', 'lightgravel', '', 'bold') -call s:HL('markdownHeadingDelimiter', 'lightgravel', '', 'bold') -call s:HL('markdownOrderedListMarker', 'lightgravel', '', 'bold') -call s:HL('markdownListMarker', 'lightgravel', '', 'bold') -call s:HL('markdownItalic', 'snow', '', 'bold') -call s:HL('markdownBold', 'snow', '', 'bold') -call s:HL('markdownH1', 'orange', '', 'bold') -call s:HL('markdownH2', 'lime', '', 'bold') -call s:HL('markdownH3', 'lime', '', 'none') -call s:HL('markdownH4', 'lime', '', 'none') -call s:HL('markdownH5', 'lime', '', 'none') -call s:HL('markdownH6', 'lime', '', 'none') -call s:HL('markdownLinkText', 'toffee', '', 'underline') -call s:HL('markdownIdDeclaration', 'toffee') -call s:HL('markdownAutomaticLink', 'toffee', '', 'bold') -call s:HL('markdownUrl', 'toffee', '', 'bold') -call s:HL('markdownUrldelimiter', 'lightgravel', '', 'bold') -call s:HL('markdownLinkDelimiter', 'lightgravel', '', 'bold') -call s:HL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold') -call s:HL('markdownCodeDelimiter', 'dirtyblonde', '', 'bold') -call s:HL('markdownCode', 'dirtyblonde', '', 'none') -call s:HL('markdownCodeBlock', 'dirtyblonde', '', 'none') - -" }}} -" MySQL {{{ - -call s:HL('mysqlSpecial', 'dress', '', 'bold') - -" }}} -" Python {{{ - -hi def link pythonOperator Operator -call s:HL('pythonBuiltin', 'dress') -call s:HL('pythonBuiltinObj', 'dress') -call s:HL('pythonBuiltinFunc', 'dress') -call s:HL('pythonEscape', 'dress') -call s:HL('pythonException', 'lime', '', 'bold') -call s:HL('pythonExceptions', 'lime', '', 'none') -call s:HL('pythonPrecondit', 'lime', '', 'none') -call s:HL('pythonDecorator', 'taffy', '', 'none') -call s:HL('pythonRun', 'gravel', '', 'bold') -call s:HL('pythonCoding', 'gravel', '', 'bold') - -" }}} -" SLIMV {{{ - -" Rainbow parentheses -call s:HL('hlLevel0', 'gravel') -call s:HL('hlLevel1', 'orange') -call s:HL('hlLevel2', 'saltwatertaffy') -call s:HL('hlLevel3', 'dress') -call s:HL('hlLevel4', 'coffee') -call s:HL('hlLevel5', 'dirtyblonde') -call s:HL('hlLevel6', 'orange') -call s:HL('hlLevel7', 'saltwatertaffy') -call s:HL('hlLevel8', 'dress') -call s:HL('hlLevel9', 'coffee') - -" }}} -" Vim {{{ - -call s:HL('VimCommentTitle', 'lightgravel', '', 'bold') - -call s:HL('VimMapMod', 'dress', '', 'none') -call s:HL('VimMapModKey', 'dress', '', 'none') -call s:HL('VimNotation', 'dress', '', 'none') -call s:HL('VimBracket', 'dress', '', 'none') - -" }}} - -" }}} - diff --git a/.gitconfig b/git/.gitconfig similarity index 100% rename from .gitconfig rename to git/.gitconfig diff --git a/mdless/.config/mdless/mdless.theme b/mdless/.config/mdless/mdless.theme new file mode 100644 index 0000000..389a481 --- /dev/null +++ b/mdless/.config/mdless/mdless.theme @@ -0,0 +1,68 @@ +--- +metadata: + border: d blue on_black + marker: d black on_black + color: d white on_black +emphasis: + bold: b + italic: u i + bold-italic: b u i +h1: + color: b intense_black on_white + pad: d black on_white + pad_char: "=" +h2: + color: b white on_intense_black + pad: d white on_intense_black + pad_char: "-" +h3: + color: u b yellow +h4: + color: u yellow +h5: + color: b white +h6: + color: b white +link: + brackets: b black + text: u b blue + url: cyan +image: + bang: red + brackets: b black + title: cyan + url: u yellow +list: + bullet: b intense_red + number: b intense_blue + color: intense_white +footnote: + brackets: b black on_black + caret: b yellow on_black + title: x yellow on_black + note: u white on_black +code_span: + marker: b white + color: b white on_intense_black +code_block: + marker: intense_black + bg: on_black + color: white on_black + border: blue + title: magenta + eol: intense_black on_black + pygments_theme: monokai +dd: + marker: d red + color: b white +hr: + color: d white +table: + border: d black + header: yellow + divider: b black + color: white + bg: on_black +html: + brackets: d yellow on_black + color: yellow on_black diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua new file mode 100644 index 0000000..aac09de --- /dev/null +++ b/nvim/.config/nvim/init.lua @@ -0,0 +1,130 @@ +local vim = vim +local Plug = vim.fn['plug#'] +-- Set nocompatible +vim.o.compatible = false + +-- Plugins +vim.call('plug#begin') + +Plug('tpope/vim-fugitive') +Plug('fatih/vim-go') +Plug('preservim/nerdtree') +Plug('junegunn/fzf', { ['do'] = function() + vim.fn['fzf#install']() +end }) +Plug('ap/vim-buftabline') + +vim.call('plug#end') + +-- Colors +vim.cmd('syntax enable') +vim.cmd('colorscheme slate') + +-- UI +vim.o.number = false -- line numbers +vim.o.relativenumber = true -- relative line numbers +vim.o.showcmd = true -- show command in bottom bar +vim.o.cursorline = true -- highlight current line +vim.o.wildmenu = true -- visual autocomplete for command menu +vim.o.lazyredraw = true -- redraw only when we need to. +vim.o.showmatch = true -- highlight matching [{()}] +vim.o.incsearch = true -- search as characters are entered +vim.o.hlsearch = true -- highlight matches +vim.o.expandtab = true -- expand tabs into spaces +vim.o.tabstop = 4 -- tabs equal 4 spaces +vim.o.shiftwidth = 4 -- >> or << commands shift lines 4 spaces +vim.o.mouse = '' +vim.cmd('filetype indent on') -- load filetype-specific indent files + +-- Buffer Management +vim.cmd('nnoremap :bnext') +vim.cmd('nnoremap :bprev') +vim.cmd('nnoremap :bd') + +-- Toggle serach highlight +vim.cmd('nnoremap h :nohlsearch') + +-- Folding Settings +vim.o.foldenable = true --enable folding +vim.o.foldlevelstart = 10 --open most folds by default +vim.o.foldnestmax = 10 -- 10 nested fold max +vim.o.foldmethod = indent +-- space open/closes folds +vim.cmd('nnoremap za') + +-- Search and Replace +vim.cmd('nnoremap R :%s///g') + + +-- Auto close brackets +vim.cmd('inoremap { {}ha') +vim.cmd('inoremap ( ()ha') +vim.cmd('inoremap [ []ha') +vim.cmd('inoremap " ""ha') +vim.cmd("inoremap ' ''ha") +vim.cmd('inoremap ` ``ha') + + +-- disable arrow keys +vim.cmd('noremap ') +vim.cmd('noremap ') +vim.cmd('noremap ') +vim.cmd('noremap ') + +-- trigger autocomplete +vim.cmd('inoremap ') + + +-- Plugin keymappings + +-- NERDTree +vim.cmd('autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif') +vim.cmd('map :NERDTreeToggle') +vim.cmd('let NERDTreeMapOpenInTab="\r"') + +-- FZF +vim.cmd('nnoremap f :FZF') + +-- Fugitive +vim.cmd('nnoremap d :Gvdiffsplit') + +-- vim-go +-- Go syntax highlighting +vim.g.go_highlight_fields = 1 +vim.g.go_highlight_functions = 1 +vim.g.go_highlight_function_calls = 1 +vim.g.go_highlight_extra_types = 1 +vim.g.go_highlight_operators = 1 + +-- formatting and importing +vim.g.go_fmt_autosave = 1 +vim.g.go_fmt_command = "goimports" + +-- Status line types/signatures +vim.g.go_auto_type_info = 1 + +vim.cmd('autocmd FileType go nmap r (go-run)') +vim.cmd('autocmd FileType go nmap t (go-test)') +vim.cmd('autocmd FileType go nmap b (go-build)') + +vim.cmd('au filetype go inoremap . .') + +-- QOL Fixes +vim.o.completeopt = "menu,menuone,noinsert" +-- Set keymap options +local opts = { expr = true, noremap = true, silent = true } + +-- inoremap pumvisible() ? "\" : "\u\" +vim.api.nvim_set_keymap('i', '', 'pumvisible() ? "\\" : "\\u\\"', opts) + +-- inoremap pumvisible() ? '' : '=pumvisible() ? "\Down>" : ""' +vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Down>" : ""\'', opts) + +-- inoremap pumvisible() ? '' : '=pumvisible() ? "\Down>" : ""' +vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Down>" : ""\'', opts) + +-- inoremap pumvisible() ? '' : '=pumvisible() ? "\Up>" : ""' +vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Up>" : ""\'', opts) + +-- inoremap pumvisible() ? '' : '=pumvisible() ? "\Up>" : ""' +vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Up>" : ""\'', opts) diff --git a/powerline/.config/powerline/colorschemes/default.json b/powerline/.config/powerline/colorschemes/default.json new file mode 100644 index 0000000..e688837 --- /dev/null +++ b/powerline/.config/powerline/colorschemes/default.json @@ -0,0 +1,18 @@ +{ + "groups": { + "gitstatus": { "fg": "gray8", "bg": "gray2", "attrs": [] }, + "gitstatus_branch": { "fg": "gray8", "bg": "gray2", "attrs": [] }, + "gitstatus_branch_clean": { "fg": "green", "bg": "gray2", "attrs": [] }, + "gitstatus_branch_dirty": { "fg": "gray8", "bg": "gray2", "attrs": [] }, + "gitstatus_branch_detached": { "fg": "mediumpurple", "bg": "gray2", "attrs": [] }, + "gitstatus_tag": { "fg": "darkcyan", "bg": "gray2", "attrs": [] }, + "gitstatus_behind": { "fg": "gray10", "bg": "gray2", "attrs": [] }, + "gitstatus_ahead": { "fg": "gray10", "bg": "gray2", "attrs": [] }, + "gitstatus_staged": { "fg": "green", "bg": "gray2", "attrs": [] }, + "gitstatus_unmerged": { "fg": "brightred", "bg": "gray2", "attrs": [] }, + "gitstatus_changed": { "fg": "mediumorange", "bg": "gray2", "attrs": [] }, + "gitstatus_untracked": { "fg": "brightestorange", "bg": "gray2", "attrs": [] }, + "gitstatus_stashed": { "fg": "darkblue", "bg": "gray2", "attrs": [] }, + "gitstatus:divider": { "fg": "gray8", "bg": "gray2", "attrs": [] } + } +} diff --git a/powerline/.config/powerline/config.json b/powerline/.config/powerline/config.json new file mode 100644 index 0000000..1d7ef02 --- /dev/null +++ b/powerline/.config/powerline/config.json @@ -0,0 +1,8 @@ +{ + "ext": { + "shell": { + "theme": "default_leftonly" + } + } +} + diff --git a/powerline/.config/powerline/themes/shell/default.json b/powerline/.config/powerline/themes/shell/default.json new file mode 100644 index 0000000..38039d8 --- /dev/null +++ b/powerline/.config/powerline/themes/shell/default.json @@ -0,0 +1,43 @@ +{ + "segments": { + "left": [ + { + "function": "powerline.segments.shell.mode" + }, + { + "function": "powerline.segments.common.net.hostname", + "priority": 10 + }, + { + "function": "powerline.segments.common.env.user", + "priority": 30 + }, + { + "function": "powerline.segments.common.env.virtualenv", + "priority": 50 + }, + { + "function": "powerline.segments.shell.cwd", + "priority": 10 + }, + { + "function": "powerline.segments.shell.jobnum", + "priority": 20 + } + ], + "right": [ + { + "function": "powerline.segments.shell.last_pipe_status", + "priority": 10 + }, + { + "function": "powerline.segments.common.vcs.stash", + "priority": 50 + }, + { + "function": "powerline.segments.common.vcs.branch", + "priority": 40 + } + ] + } +} diff --git a/powerline/.config/powerline/themes/shell/default_leftonly.json b/powerline/.config/powerline/themes/shell/default_leftonly.json new file mode 100644 index 0000000..1a436fb --- /dev/null +++ b/powerline/.config/powerline/themes/shell/default_leftonly.json @@ -0,0 +1,44 @@ +{ + "segments": { + "left": [ + { + "function": "powerline.segments.common.net.hostname", + "priority": 10 + }, + { + "function": "powerline.segments.common.env.user", + "priority": 30 + }, + { + "function": "powerline.segments.common.bat.battery" + }, + { + "function": "powerline.segments.common.time.date", + "args": { + "format": "%Y-%m-%d %H:%M", + "istime": true + } + }, + { + "function": "powerline.segments.common.env.virtualenv", + "priority": 50 + }, + { + "function": "powerline.segments.shell.cwd", + "args" : { + "dir_limit_depth": 3, + "dir_shorten_len": 1 + }, + "priority": 10 + }, + { + "function": "powerline_gitstatus.gitstatus", + "priority": 40 + }, + { + "function": "powerline.segments.shell.last_pipe_status", + "priority": 90 + } + ] + } +} diff --git a/powerline/.config/powerline/themes/zsh/default.json b/powerline/.config/powerline/themes/zsh/default.json new file mode 100644 index 0000000..38039d8 --- /dev/null +++ b/powerline/.config/powerline/themes/zsh/default.json @@ -0,0 +1,43 @@ +{ + "segments": { + "left": [ + { + "function": "powerline.segments.shell.mode" + }, + { + "function": "powerline.segments.common.net.hostname", + "priority": 10 + }, + { + "function": "powerline.segments.common.env.user", + "priority": 30 + }, + { + "function": "powerline.segments.common.env.virtualenv", + "priority": 50 + }, + { + "function": "powerline.segments.shell.cwd", + "priority": 10 + }, + { + "function": "powerline.segments.shell.jobnum", + "priority": 20 + } + ], + "right": [ + { + "function": "powerline.segments.shell.last_pipe_status", + "priority": 10 + }, + { + "function": "powerline.segments.common.vcs.stash", + "priority": 50 + }, + { + "function": "powerline.segments.common.vcs.branch", + "priority": 40 + } + ] + } +} diff --git a/powerline/.config/powerline/themes/zsh/default_leftonly.json b/powerline/.config/powerline/themes/zsh/default_leftonly.json new file mode 100644 index 0000000..1a436fb --- /dev/null +++ b/powerline/.config/powerline/themes/zsh/default_leftonly.json @@ -0,0 +1,44 @@ +{ + "segments": { + "left": [ + { + "function": "powerline.segments.common.net.hostname", + "priority": 10 + }, + { + "function": "powerline.segments.common.env.user", + "priority": 30 + }, + { + "function": "powerline.segments.common.bat.battery" + }, + { + "function": "powerline.segments.common.time.date", + "args": { + "format": "%Y-%m-%d %H:%M", + "istime": true + } + }, + { + "function": "powerline.segments.common.env.virtualenv", + "priority": 50 + }, + { + "function": "powerline.segments.shell.cwd", + "args" : { + "dir_limit_depth": 3, + "dir_shorten_len": 1 + }, + "priority": 10 + }, + { + "function": "powerline_gitstatus.gitstatus", + "priority": 40 + }, + { + "function": "powerline.segments.shell.last_pipe_status", + "priority": 90 + } + ] + } +} diff --git a/pypoetry/.config/pypoetry/config.toml b/pypoetry/.config/pypoetry/config.toml new file mode 100644 index 0000000..9620411 --- /dev/null +++ b/pypoetry/.config/pypoetry/config.toml @@ -0,0 +1,3 @@ +[repositories] +[repositories.testpypi] +url = "https://test.pypi.org/legacy/" diff --git a/.tmux.conf b/tmux/.tmux.conf similarity index 100% rename from .tmux.conf rename to tmux/.tmux.conf diff --git a/.vim/colors/badwolf.vim b/vim/.vim/colors/badwolf.vim similarity index 100% rename from .vim/colors/badwolf.vim rename to vim/.vim/colors/badwolf.vim diff --git a/.vimrc b/vim/.vimrc similarity index 94% rename from .vimrc rename to vim/.vimrc index 55fecd6..07c3c1f 100644 --- a/.vimrc +++ b/vim/.vimrc @@ -123,14 +123,11 @@ autocmd FileType go nmap b (go-build) au filetype go inoremap . . - " Auto complete QOL fixes set completeopt=longest,menuone inoremap pumvisible() ? "\" : "\u\" -inoremap pumvisible() ? '' : - \ '=pumvisible() ? "\Down>" : ""' -inoremap pumvisible() ? '' : - \ '=pumvisible() ? "\Down>" : ""' +inoremap pumvisible() ? '' : '=pumvisible() ? "\Down>" : ""' +inoremap pumvisible() ? '' : '=pumvisible() ? "\Down>" : ""' " disable arrow keys diff --git a/.zsh_aliases b/zsh/.zsh_aliases similarity index 100% rename from .zsh_aliases rename to zsh/.zsh_aliases diff --git a/.zshrc b/zsh/.zshrc similarity index 95% rename from .zshrc rename to zsh/.zshrc index 8b229e1..27ed693 100644 --- a/.zshrc +++ b/zsh/.zshrc @@ -52,7 +52,7 @@ export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init --path)" if [ -f ~/.zsh_secrets ]; then - . ~/.zsh_secrests + . ~/.zsh_secrets fi if [ -f ~/.zsh_aliases ]; then . ~/.zsh_aliases @@ -69,7 +69,7 @@ export TINYCARE_WORKSPACE="$HOME/workspace/projects,$HOME/workspace/wochstudios" # Powerline export PATH=$PATH:$HOME/.local/bin -if [ -f $HOME/.local/lib/python3.*/site-packages/powerline/bindings/zsh/powerline.zsh ]; then +if [ -f $HOME/.local/bin/powerline-daemon ]; then $HOME/.local/bin/powerline-daemon -q . $HOME/.local/lib/python3.*/site-packages/powerline/bindings/zsh/powerline.zsh fi From bd4ec8054374146b8de408da11f1a12cadea865e Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Tue, 2 Jul 2024 11:17:55 -0400 Subject: [PATCH 04/14] config updates --- git/.gitconfig | 1 + nvim/.config/nvim/init.lua | 24 +--- nvim/.config/nvim/lua/coc_config.lua | 186 +++++++++++++++++++++++++++ zsh/.zsh_aliases | 3 + zsh/.zshrc | 9 ++ 5 files changed, 203 insertions(+), 20 deletions(-) create mode 100644 nvim/.config/nvim/lua/coc_config.lua diff --git a/git/.gitconfig b/git/.gitconfig index 7937b52..4d7bc7f 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -9,6 +9,7 @@ lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)%Creset' --abbrev-commit stash-all = stash save --include-untracked undo = reset --soft HEAD^ + nah = reset --hard HEAD graph = log --graph --all ' --pretty=format:%Cred%h%Creset %ad | [%C(bold blue)%an%Creset] %Cgreen%d%Creset %s' --date=iso [init] defaultBranch = main diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index aac09de..2574a22 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -13,6 +13,8 @@ Plug('junegunn/fzf', { ['do'] = function() vim.fn['fzf#install']() end }) Plug('ap/vim-buftabline') +Plug('neoclide/coc.nvim', { ['branch'] = 'release' }) + vim.call('plug#end') @@ -107,24 +109,6 @@ vim.cmd('autocmd FileType go nmap r (go-run)') vim.cmd('autocmd FileType go nmap t (go-test)') vim.cmd('autocmd FileType go nmap b (go-build)') -vim.cmd('au filetype go inoremap . .') - --- QOL Fixes -vim.o.completeopt = "menu,menuone,noinsert" --- Set keymap options -local opts = { expr = true, noremap = true, silent = true } - --- inoremap pumvisible() ? "\" : "\u\" -vim.api.nvim_set_keymap('i', '', 'pumvisible() ? "\\" : "\\u\\"', opts) - --- inoremap pumvisible() ? '' : '=pumvisible() ? "\Down>" : ""' -vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Down>" : ""\'', opts) - --- inoremap pumvisible() ? '' : '=pumvisible() ? "\Down>" : ""' -vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Down>" : ""\'', opts) - --- inoremap pumvisible() ? '' : '=pumvisible() ? "\Up>" : ""' -vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Up>" : ""\'', opts) +--vim.cmd('au filetype go inoremap . .') --- inoremap pumvisible() ? '' : '=pumvisible() ? "\Up>" : ""' -vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \'\' : \'=pumvisible() ? "\\Up>" : ""\'', opts) +require("coc_config") diff --git a/nvim/.config/nvim/lua/coc_config.lua b/nvim/.config/nvim/lua/coc_config.lua new file mode 100644 index 0000000..938c61a --- /dev/null +++ b/nvim/.config/nvim/lua/coc_config.lua @@ -0,0 +1,186 @@ +-- https://raw.githubusercontent.com/neoclide/coc.nvim/master/doc/coc-example-config.lua + +-- Some servers have issues with backup files, see #649 +vim.opt.backup = false +vim.opt.writebackup = false + +-- Having longer updatetime (default is 4000 ms = 4s) leads to noticeable +-- delays and poor user experience +vim.opt.updatetime = 300 + +-- Always show the signcolumn, otherwise it would shift the text each time +-- diagnostics appeared/became resolved +vim.opt.signcolumn = "yes" + +local keyset = vim.keymap.set +-- Autocomplete +function _G.check_back_space() + local col = vim.fn.col('.') - 1 + return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil +end + +-- Use Tab for trigger completion with characters ahead and navigate +-- NOTE: There's always a completion item selected by default, you may want to enable +-- no select by setting `"suggest.noselect": true` in your configuration file +-- NOTE: Use command ':verbose imap ' to make sure Tab is not mapped by +-- other plugins before putting this into your config +local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false} +keyset("i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts) +keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts) + +-- Make to accept selected completion item or notify coc.nvim to format +-- u breaks current undo, please make your own choice +keyset("i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts) + +-- Use to trigger snippets +keyset("i", "", "(coc-snippets-expand-jump)") +-- Use to trigger completion +keyset("i", "", "coc#refresh()", {silent = true, expr = true}) + +-- Use `[g` and `]g` to navigate diagnostics +-- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list +keyset("n", "[g", "(coc-diagnostic-prev)", {silent = true}) +keyset("n", "]g", "(coc-diagnostic-next)", {silent = true}) + +-- GoTo code navigation +keyset("n", "gd", "(coc-definition)", {silent = true}) +keyset("n", "gy", "(coc-type-definition)", {silent = true}) +keyset("n", "gi", "(coc-implementation)", {silent = true}) +keyset("n", "gr", "(coc-references)", {silent = true}) + + +-- Use K to show documentation in preview window +function _G.show_docs() + local cw = vim.fn.expand('') + if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then + vim.api.nvim_command('h ' .. cw) + elseif vim.api.nvim_eval('coc#rpc#ready()') then + vim.fn.CocActionAsync('doHover') + else + vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw) + end +end +keyset("n", "K", 'lua _G.show_docs()', {silent = true}) + + +-- Highlight the symbol and its references on a CursorHold event(cursor is idle) +vim.api.nvim_create_augroup("CocGroup", {}) +vim.api.nvim_create_autocmd("CursorHold", { + group = "CocGroup", + command = "silent call CocActionAsync('highlight')", + desc = "Highlight symbol under cursor on CursorHold" +}) + + +-- Symbol renaming +keyset("n", "rn", "(coc-rename)", {silent = true}) + + +-- Formatting selected code +keyset("x", "f", "(coc-format-selected)", {silent = true}) +keyset("n", "f", "(coc-format-selected)", {silent = true}) + + +-- Setup formatexpr specified filetype(s) +vim.api.nvim_create_autocmd("FileType", { + group = "CocGroup", + pattern = "typescript,json", + command = "setl formatexpr=CocAction('formatSelected')", + desc = "Setup formatexpr specified filetype(s)." +}) + +-- Update signature help on jump placeholder +vim.api.nvim_create_autocmd("User", { + group = "CocGroup", + pattern = "CocJumpPlaceholder", + command = "call CocActionAsync('showSignatureHelp')", + desc = "Update signature help on jump placeholder" +}) + +-- Apply codeAction to the selected region +-- Example: `aap` for current paragraph +local opts = {silent = true, nowait = true} +keyset("x", "a", "(coc-codeaction-selected)", opts) +keyset("n", "a", "(coc-codeaction-selected)", opts) + +-- Remap keys for apply code actions at the cursor position. +keyset("n", "ac", "(coc-codeaction-cursor)", opts) +-- Remap keys for apply source code actions for current file. +keyset("n", "as", "(coc-codeaction-source)", opts) +-- Apply the most preferred quickfix action on the current line. +keyset("n", "qf", "(coc-fix-current)", opts) + +-- Remap keys for apply refactor code actions. +keyset("n", "re", "(coc-codeaction-refactor)", { silent = true }) +keyset("x", "r", "(coc-codeaction-refactor-selected)", { silent = true }) +keyset("n", "r", "(coc-codeaction-refactor-selected)", { silent = true }) + +-- Run the Code Lens actions on the current line +keyset("n", "cl", "(coc-codelens-action)", opts) + + +-- Map function and class text objects +-- NOTE: Requires 'textDocument.documentSymbol' support from the language server +keyset("x", "if", "(coc-funcobj-i)", opts) +keyset("o", "if", "(coc-funcobj-i)", opts) +keyset("x", "af", "(coc-funcobj-a)", opts) +keyset("o", "af", "(coc-funcobj-a)", opts) +keyset("x", "ic", "(coc-classobj-i)", opts) +keyset("o", "ic", "(coc-classobj-i)", opts) +keyset("x", "ac", "(coc-classobj-a)", opts) +keyset("o", "ac", "(coc-classobj-a)", opts) + + +-- Remap and to scroll float windows/popups +---@diagnostic disable-next-line: redefined-local +local opts = {silent = true, nowait = true, expr = true} +keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) +keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) +keyset("i", "", + 'coc#float#has_scroll() ? "=coc#float#scroll(1)" : ""', opts) +keyset("i", "", + 'coc#float#has_scroll() ? "=coc#float#scroll(0)" : ""', opts) +keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) +keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) + + +-- Use CTRL-S for selections ranges +-- Requires 'textDocument/selectionRange' support of language server +keyset("n", "", "(coc-range-select)", {silent = true}) +keyset("x", "", "(coc-range-select)", {silent = true}) + + +-- Add `:Format` command to format current buffer +vim.api.nvim_create_user_command("Format", "call CocAction('format')", {}) + +-- " Add `:Fold` command to fold current buffer +vim.api.nvim_create_user_command("Fold", "call CocAction('fold', )", {nargs = '?'}) + +-- Add `:OR` command for organize imports of the current buffer +vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {}) + +-- Add (Neo)Vim's native statusline support +-- NOTE: Please see `:h coc-status` for integrations with external plugins that +-- provide custom statusline: lightline.vim, vim-airline +vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}") + +-- Mappings for CoCList +-- code actions and coc stuff +---@diagnostic disable-next-line: redefined-local +local opts = {silent = true, nowait = true} +-- Show all diagnostics +keyset("n", "a", ":CocList diagnostics", opts) +-- Manage extensions +keyset("n", "e", ":CocList extensions", opts) +-- Show commands +keyset("n", "c", ":CocList commands", opts) +-- Find symbol of current document +keyset("n", "o", ":CocList outline", opts) +-- Search workspace symbols +keyset("n", "s", ":CocList -I symbols", opts) +-- Do default action for next item +keyset("n", "j", ":CocNext", opts) +-- Do default action for previous item +keyset("n", "k", ":CocPrev", opts) +-- Resume latest coc list +keyset("n", "p", ":CocListResume", opts) diff --git a/zsh/.zsh_aliases b/zsh/.zsh_aliases index 521e603..c381fa1 100644 --- a/zsh/.zsh_aliases +++ b/zsh/.zsh_aliases @@ -6,3 +6,6 @@ alias cpv='rsync -ah --info=progress2' alias update="sudo apt update && sudo apt upgrade -y" alias cdw="cd $HOME/workspace" alias tf="terraform" + +# remap +alias vim='nvim' diff --git a/zsh/.zshrc b/zsh/.zshrc index 27ed693..be66131 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -36,6 +36,12 @@ zstyle ':completion:*' verbose true zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31' zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd' + +if [ -d /snap/bin ] ; then + PATH="/snap/bin:$PATH" +fi + + # set PATH so it includes user's private bin if it exists if [ -d "$HOME/bin" ] ; then PATH="$HOME/bin:$PATH" @@ -89,3 +95,6 @@ export PATH=$PATH:/$HOME/.cargo/bin complete -C /usr/bin/terraform terraform source ~/.local/bin/zsh-autosuggestions/zsh-autosuggestions.zsh + +export VIRTUAL_ENV_DISABLE_PROMPT= +export BUILDX_EXPERIMENTAL=1 From 45d05b2560596bb207a60a6d9566ee2d1f1389ba Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Tue, 2 Jul 2024 11:25:42 -0400 Subject: [PATCH 05/14] fixing mapping colision in coc_config --- nvim/.config/nvim/lua/coc_config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/.config/nvim/lua/coc_config.lua b/nvim/.config/nvim/lua/coc_config.lua index 938c61a..aaa3183 100644 --- a/nvim/.config/nvim/lua/coc_config.lua +++ b/nvim/.config/nvim/lua/coc_config.lua @@ -77,8 +77,8 @@ keyset("n", "rn", "(coc-rename)", {silent = true}) -- Formatting selected code -keyset("x", "f", "(coc-format-selected)", {silent = true}) -keyset("n", "f", "(coc-format-selected)", {silent = true}) +keyset("x", "F", "(coc-format-selected)", {silent = true}) +keyset("n", "F", "(coc-format-selected)", {silent = true}) -- Setup formatexpr specified filetype(s) From a955d8fd1ed47380b2e32eac9fad42f08fba5d77 Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Tue, 2 Jul 2024 12:24:30 -0400 Subject: [PATCH 06/14] Updating ansible playbook with stow --- ansible-playbooks/apt-packages.yml | 2 +- ansible-playbooks/dotfile-copy.yml | 44 ++++++++++------------------- ansible-playbooks/setup.yml | 3 ++ ansible-playbooks/snap-packages.yml | 9 ++++++ 4 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 ansible-playbooks/snap-packages.yml diff --git a/ansible-playbooks/apt-packages.yml b/ansible-playbooks/apt-packages.yml index fada30f..d549c84 100644 --- a/ansible-playbooks/apt-packages.yml +++ b/ansible-playbooks/apt-packages.yml @@ -117,7 +117,6 @@ - ncurses-base - ncurses-bin - ncurses-term - - neovim - openssh-server - openssh-sftp-server - pkg-config @@ -156,6 +155,7 @@ - libmysqlclient-dev - zsh - jq + - stow - name: Add my user to docker group ansible.builtin.user: name: "{{ ansible_user_id }}" diff --git a/ansible-playbooks/dotfile-copy.yml b/ansible-playbooks/dotfile-copy.yml index c7740e4..18bfcca 100644 --- a/ansible-playbooks/dotfile-copy.yml +++ b/ansible-playbooks/dotfile-copy.yml @@ -1,32 +1,18 @@ --- -- name: Copy dotfiles +- name: Configure dotfiles hosts: localhost tasks: - - name: Copy .bashrc - copy: - src: "{{ playbook_dir }}/../.bashrc" - dest: "/home/{{ ansible_user_id }}" - - name: Copy .bash_aliases - copy: - src: "{{ playbook_dir }}/../.bash_aliases" - dest: "/home/{{ ansible_user_id }}" - - name: Copy .profile - copy: - src: "{{ playbook_dir }}/../.profile" - dest: "/home/{{ ansible_user_id }}" - - name: Copy .vimrc - copy: - src: "{{ playbook_dir }}/../.vimrc" - dest: "/home/{{ ansible_user_id }}" - - name: Copy .gitconfig - copy: - src: "{{ playbook_dir }}/../.gitconfig" - dest: "/home/{{ ansible_user_id }}" - - name: Copy .vim - copy: - src: "{{ playbook_dir }}/../.vim" - dest: "/home/{{ ansible_user_id }}" - - name: Copy .config - copy: - src: "{{ playbook_dir }}/../.config" - dest: "/home/{{ ansible_user_id }}" + - name: Stow dotfile packages + shell: | + stow bash + stow git + stow btop + stow mdless + stow powerline + stow pypoetry + stow tmux + stow zsh + stow vim + stow nvim + args: + chdir: "{{ playbook_dir }}/.." diff --git a/ansible-playbooks/setup.yml b/ansible-playbooks/setup.yml index 19eb98c..7e942f1 100644 --- a/ansible-playbooks/setup.yml +++ b/ansible-playbooks/setup.yml @@ -2,6 +2,9 @@ - name: Install apt packages import_playbook: apt-packages.yml +- name: Install snap packages + import_playbook: snap-packages.yml + - name: Copy dotfiles import_playbook: dotfile-copy.yml diff --git a/ansible-playbooks/snap-packages.yml b/ansible-playbooks/snap-packages.yml new file mode 100644 index 0000000..c3ad856 --- /dev/null +++ b/ansible-playbooks/snap-packages.yml @@ -0,0 +1,9 @@ +--- +- name: snap-pacakges + hosts: localhost + tasks: + - name: Install "nvim" with option --classic + community.general.snap: + name: nvim + classic: true + become: true From 05376a70225d4fb91398b9c2b740aba1f559d18c Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Wed, 3 Jul 2024 16:33:53 -0400 Subject: [PATCH 07/14] ignore vim bundle directory --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2c1b2f2..abd78fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.vim/bundle +vim/.vim/bundle *ssh .bash_secrets *history* From 801a1b63499c41746ca620ea0734985ac5cdcb65 Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Wed, 3 Jul 2024 21:32:38 -0400 Subject: [PATCH 08/14] Adding i3 configs --- i3/.config/i3/config | 147 +++++++++++++++++++++++++++++++++++++ i3/.config/i3status/config | 52 +++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 i3/.config/i3/config create mode 100644 i3/.config/i3status/config diff --git a/i3/.config/i3/config b/i3/.config/i3/config new file mode 100644 index 0000000..ca8053e --- /dev/null +++ b/i3/.config/i3/config @@ -0,0 +1,147 @@ +# set modifier +set $super Mod4 +set $alt Mod1 + +# set font +font pango: Ubuntu Nerd Font 8 + +# Use Mouse+$super to drag floating windows to their wanted position +floating_modifier $super + +#autostart +exec --no-startup-id autorandr --change work +exec --no-startup-id hsetroot -fill ~/.wallpaper.png +exec --no-startup-id xsettingsd & +#exec --no-startup-id picom -b + +# start a terminal +bindsym $super+Return exec kitty + +# start dmenu (a program launcher) +bindsym $super+Shift+d exec i3-dmenu-desktop --dmenu="dmenu -i -fn 'Noto Sans:size=8'" +bindsym $super+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Noto Sans 8' + +# common apps keybinds +bindsym Print exec scrot 'Cheese_%a-%d%b%y_%H.%M.png' -e 'viewnior ~/$f' +bindsym $super+l exec i3lock -i ~/.wallpaper.png +bindsym $super+Shift+w exec firefox +bindsym $super+Shift+f exec thunar;workspace 3;focus +bindsym $super+Shift+g exec geany + +#change volume +bindsym XF86AudioRaiseVolume exec amixer -q set Master 5%+ +bindsym XF86AudioLowerVolume exec amixer -q set Master 5%- +bindsym XF86AudioMute exec amixer set Master toggle + +# music control +bindsym XF86AudioNext exec mpc next +bindsym XF86AudioPrev exec mpc prev +bindsym XF86AudioPlay exec mpc toggle +bindsym XF86AudioStop exec mpc stop + +# kill focused window +bindsym $super+c kill +bindsym $alt+F4 kill + +# change focus +bindsym $super+Left focus left +bindsym $super+Down focus down +bindsym $super+Up focus up +bindsym $super+Right focus right + +# move focused window +bindsym $super+Shift+Left move left +bindsym $super+Shift+Down move down +bindsym $super+Shift+Up move up +bindsym $super+Shift+Right move right + +# split in horizontal orientation +bindsym $super+h split h + +# split in vertical orientation +bindsym $super+v split v + +# enter fullscreen mode for the focused container +bindsym $super+f fullscreen toggle + +# change container layout split +bindsym $super+s layout toggle split + +# toggle tiling / floating +bindsym $super+space floating toggle + +# change focus between tiling / floating windows +bindsym $super+Shift+space focus mode_toggle + +# switch to workspace +bindsym $alt+Control+Right workspace next +bindsym $alt+Control+Left workspace prev +bindsym $super+1 workspace 1 +bindsym $super+2 workspace 2 +bindsym $super+3 workspace 3 +bindsym $super+4 workspace 4 +bindsym $super+5 workspace 5 +bindsym $super+6 workspace 6 + +# move focused container to workspace +bindsym $super+Shift+1 move container to workspace 1 +bindsym $super+Shift+2 move container to workspace 2 +bindsym $super+Shift+3 move container to workspace 3 +bindsym $super+Shift+4 move container to workspace 4 +bindsym $super+Shift+5 move container to workspace 5 +bindsym $super+Shift+6 move container to workspace 6 + +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $super+Shift+r restart + +# exit i3 +bindsym $super+q exec "i3-nagbar -t warning -m 'Really, exit?' -b 'Yes' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + bindsym Left resize shrink width 5 px or 5 ppt + bindsym Down resize grow height 5 px or 5 ppt + bindsym Up resize shrink height 5 px or 5 ppt + bindsym Right resize grow width 5 px or 5 ppt + bindsym Return mode "default" +} +bindsym $super+r mode "resize" + +# panel +bar { + colors { + statusline #ffffff + separator #4b5262 + + # colour of border, background, and text + focused_workspace #2f343f #1F6CE1 #d8dee8 + active_workspace #2f343f #2f343f #d8dee8 + inactive_workspace #2f343f #2f343f #d8dee8 + urgent_workspacei #2f343f #ebcb8b #2f343f + } + status_command i3status +} + +# window rules, you can find the window class using xprop +for_window [class=".*"] border none +assign [class=URxvt] 1 +assign [class=Firefox|Transmission-gtk] 2 +assign [class=Thunar|File-roller] 3 +assign [class=Geany|Evince|Gucharmap|Soffice|libreoffice*] 4 +assign [class=Audacity|Vlc|mpv|Ghb|Xfburn|Gimp*|Inkscape] 5 +assign [class=Lxappearance|System-config-printer.py|Lxtask|GParted|Pavucontrol|Exo-helper*|Lxrandr|Arandr] 6 +for_window [class=Viewnior|feh|Audacious|File-roller|Lxappearance|Lxtask|Pavucontrol] floating enable +for_window [class=URxvt|Firefox|Geany|Evince|Soffice|libreoffice*|mpv|Ghb|Xfburn|Gimp*|Inkscape|Vlc|Lxappearance|Audacity] focus +for_window [class=Xfburn|GParted|System-config-printer.py|Lxtask|Pavucontrol|Exo-helper*|Lxrandr|Arandr] focus + +# colour of border, background, text, indicator, and child_border +client.focused #bf616a #2f343f #d8dee8 #bf616a #d8dee8 +client.focused_inactive #2f343f #2f343f #d8dee8 #2f343f #2f343f +client.unfocused #2f343f #2f343f #d8dee8 #2f343f #2f343f +client.urgent #2f343f #2f343f #d8dee8 #2f343f #2f343f +client.placeholder #2f343f #2f343f #d8dee8 #2f343f #2f343f +client.background #2f343f + +# Gaps +gaps inner 5px +gaps outer 5px diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config new file mode 100644 index 0000000..95994e1 --- /dev/null +++ b/i3/.config/i3status/config @@ -0,0 +1,52 @@ +general { + output_format = "i3bar" + colors = true + markup = pango + interval = 5 + color_good = '#2f343f' + color_degraded = '#ebcb8b' + color_bad = '#ba5e57' +} + +order += "load" +order += "cpu_temperature 0" +order += "disk /" +order += "disk /home" +order += "wireless wlp2s0" +order += "volume master" +order += "time" + +load { + format = " %5min Load " +} + +cpu_temperature 0 { + format = "  %degrees °C " + path = "/sys/class/thermal/thermal_zone0/temp" +} + +disk "/" { + format = "  %free Free " +} + +disk "/home" { + format = "  %free Free " +} + + +wireless wlp2s0 { + format_up = " %essid " + format_down = " Disconnected " +} + +volume master { + format = " %volume " + format_muted = " Muted " + device = "default" + mixer = "Master" + mixer_idx = 0 +} + +time { + format = "%Y-%m-%d %H:%M " +} From 3c8f99052bcde26b7920503195515ceaaf24e4a1 Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Sun, 21 Jul 2024 10:06:17 -0400 Subject: [PATCH 09/14] configs from trigkey setup --- alacritty/.config/alacritty/alacritty.toml | 15 +++++++++++++++ ansible-playbooks/apt-packages.yml | 3 +++ ansible-playbooks/cli-packages.yml | 4 ++++ ansible-playbooks/dotfile-copy.yml | 2 ++ ansible-playbooks/setup.yml | 2 +- .../vim-package-mangers-install.yml | 15 +++++++++++++++ ansible-playbooks/vundle-install.yml | 8 -------- i3/.config/i3/config | 17 ++++++++--------- i3/.config/i3status/config | 14 ++------------ nvim/.config/nvim/coc-settings.json | 10 ++++++++++ zsh/.zshrc | 6 ++++++ 11 files changed, 66 insertions(+), 30 deletions(-) create mode 100644 alacritty/.config/alacritty/alacritty.toml create mode 100644 ansible-playbooks/vim-package-mangers-install.yml delete mode 100644 ansible-playbooks/vundle-install.yml create mode 100644 nvim/.config/nvim/coc-settings.json diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..f030fb6 --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml @@ -0,0 +1,15 @@ +[font.bold] +family = "JetBrainsMono Nerd Font" +style = "Bold" + +[font.bold_italic] +family = "JetBrainsMono Nerd Font" +style = "Bold Italic" + +[font.italic] +family = "JetBrainsMono Nerd Font" +style = "Italic" + +[font.normal] +family = "JetBrainsMono Nerd Font" +style = "Regular" diff --git a/ansible-playbooks/apt-packages.yml b/ansible-playbooks/apt-packages.yml index d549c84..75768f5 100644 --- a/ansible-playbooks/apt-packages.yml +++ b/ansible-playbooks/apt-packages.yml @@ -156,6 +156,9 @@ - zsh - jq - stow + - snapd + - hsetroot + - rofi - name: Add my user to docker group ansible.builtin.user: name: "{{ ansible_user_id }}" diff --git a/ansible-playbooks/cli-packages.yml b/ansible-playbooks/cli-packages.yml index 5eb2cb6..a2616d7 100644 --- a/ansible-playbooks/cli-packages.yml +++ b/ansible-playbooks/cli-packages.yml @@ -3,6 +3,10 @@ - name: cli-packages hosts: localhost tasks: + - name: Instal ZSH autosuggestions + git: + repo: 'https://github.com/zsh-users/zsh-autosuggestions' + dest: ~/.local/bin/zsh-autosuggestions/zsh-autosuggestions.zsh - name: Download AWS zip shell: 'curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "{{ playbook_dir }}/awscliv2.zip"' diff --git a/ansible-playbooks/dotfile-copy.yml b/ansible-playbooks/dotfile-copy.yml index 18bfcca..6c6ec2b 100644 --- a/ansible-playbooks/dotfile-copy.yml +++ b/ansible-playbooks/dotfile-copy.yml @@ -14,5 +14,7 @@ stow zsh stow vim stow nvim + stow i3 + stow alacritty args: chdir: "{{ playbook_dir }}/.." diff --git a/ansible-playbooks/setup.yml b/ansible-playbooks/setup.yml index 7e942f1..e593572 100644 --- a/ansible-playbooks/setup.yml +++ b/ansible-playbooks/setup.yml @@ -9,7 +9,7 @@ import_playbook: dotfile-copy.yml - name: Install vundle - import_playbook: vundle-install.yml + import_playbook: vim-package-managers-install.yml - name: Install gems import_playbook: gem-packages.yml diff --git a/ansible-playbooks/vim-package-mangers-install.yml b/ansible-playbooks/vim-package-mangers-install.yml new file mode 100644 index 0000000..7175e3a --- /dev/null +++ b/ansible-playbooks/vim-package-mangers-install.yml @@ -0,0 +1,15 @@ +--- +- name: vundle-install + hosts: localhost + tasks: + - name: Install vundle plugin manager for Vim + git: + repo: 'https://github.com/VundleVim/Vundle.vim.git' + dest: ~/.vim/bundle/Vundle.vim +- name: vim-plug-install + hosts: localhost + tasks: + - name: Install vim-plug + shell: > + curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ + https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim diff --git a/ansible-playbooks/vundle-install.yml b/ansible-playbooks/vundle-install.yml deleted file mode 100644 index 2209aab..0000000 --- a/ansible-playbooks/vundle-install.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: vundle-install - hosts: localhost - tasks: - - name: Install vundle plugin manager for Vim - git: - repo: 'https://github.com/VundleVim/Vundle.vim.git' - dest: ~/.vim/bundle/Vundle.vim \ No newline at end of file diff --git a/i3/.config/i3/config b/i3/.config/i3/config index ca8053e..4234028 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -3,26 +3,25 @@ set $super Mod4 set $alt Mod1 # set font -font pango: Ubuntu Nerd Font 8 +font pango: InconsolataGo Nerd Font Regular 12 # Use Mouse+$super to drag floating windows to their wanted position floating_modifier $super #autostart -exec --no-startup-id autorandr --change work -exec --no-startup-id hsetroot -fill ~/.wallpaper.png exec --no-startup-id xsettingsd & -#exec --no-startup-id picom -b - +exec --no-startup-id xrandr --output DVI-I-2-2 --mode 1920x1080 --above DisplayPort-2 --output DVI-I-1-1 --mode 1920x1080 --right-of DVI-I-2-2 --output DisplayPort-2 --off +exec --no-startup-id /usr/libexec/gsd-xsettings +exec --no-startup-id nitrogen --restore # start a terminal -bindsym $super+Return exec kitty +bindsym $super+Return exec alacritty # start dmenu (a program launcher) bindsym $super+Shift+d exec i3-dmenu-desktop --dmenu="dmenu -i -fn 'Noto Sans:size=8'" -bindsym $super+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Noto Sans 8' +bindsym $super+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'InconsolataGo Nerd Font Regular 12' # common apps keybinds -bindsym Print exec scrot 'Cheese_%a-%d%b%y_%H.%M.png' -e 'viewnior ~/$f' +bindsym --release Print exec gnome-screenshot -i bindsym $super+l exec i3lock -i ~/.wallpaper.png bindsym $super+Shift+w exec firefox bindsym $super+Shift+f exec thunar;workspace 3;focus @@ -143,5 +142,5 @@ client.placeholder #2f343f #2f343f #d8dee8 #2f343f #2f343f client.background #2f343f # Gaps -gaps inner 5px +gaps inner 7px gaps outer 5px diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config index 95994e1..665060e 100644 --- a/i3/.config/i3status/config +++ b/i3/.config/i3status/config @@ -11,8 +11,6 @@ general { order += "load" order += "cpu_temperature 0" order += "disk /" -order += "disk /home" -order += "wireless wlp2s0" order += "volume master" order += "time" @@ -21,23 +19,15 @@ load { } cpu_temperature 0 { - format = "  %degrees °C " + format = " CPU %degrees °C " path = "/sys/class/thermal/thermal_zone0/temp" } disk "/" { - format = "  %free Free " -} - -disk "/home" { - format = "  %free Free " + format = " Disk %free Free " } -wireless wlp2s0 { - format_up = " %essid " - format_down = " Disconnected " -} volume master { format = " %volume " diff --git a/nvim/.config/nvim/coc-settings.json b/nvim/.config/nvim/coc-settings.json new file mode 100644 index 0000000..95ba565 --- /dev/null +++ b/nvim/.config/nvim/coc-settings.json @@ -0,0 +1,10 @@ + { + "languageserver": { + "go": { + "command": "gopls", + "rootPatterns": ["go.mod"], + "trace.server": "verbose", + "filetypes": ["go"] + } + } + } diff --git a/zsh/.zshrc b/zsh/.zshrc index be66131..a9b0eb1 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -98,3 +98,9 @@ source ~/.local/bin/zsh-autosuggestions/zsh-autosuggestions.zsh export VIRTUAL_ENV_DISABLE_PROMPT= export BUILDX_EXPERIMENTAL=1 + +# FZF +# Set up fzf key bindings and fuzzy completion +source <(fzf --zsh) + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh From 7d3d7d738c4c67135bfac7f7bcd9a01e787762fe Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Sun, 21 Jul 2024 22:40:45 -0400 Subject: [PATCH 10/14] Fixing typo --- ansible-playbooks/vim-package-mangers-install.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 ansible-playbooks/vim-package-mangers-install.yml diff --git a/ansible-playbooks/vim-package-mangers-install.yml b/ansible-playbooks/vim-package-mangers-install.yml deleted file mode 100644 index 7175e3a..0000000 --- a/ansible-playbooks/vim-package-mangers-install.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: vundle-install - hosts: localhost - tasks: - - name: Install vundle plugin manager for Vim - git: - repo: 'https://github.com/VundleVim/Vundle.vim.git' - dest: ~/.vim/bundle/Vundle.vim -- name: vim-plug-install - hosts: localhost - tasks: - - name: Install vim-plug - shell: > - curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim From a326557bcee820669cdd20e773f14b239a4eeb9a Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Sun, 21 Jul 2024 22:40:55 -0400 Subject: [PATCH 11/14] Fixing typo --- .../vim-package-managers-install.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 ansible-playbooks/vim-package-managers-install.yml diff --git a/ansible-playbooks/vim-package-managers-install.yml b/ansible-playbooks/vim-package-managers-install.yml new file mode 100644 index 0000000..7175e3a --- /dev/null +++ b/ansible-playbooks/vim-package-managers-install.yml @@ -0,0 +1,15 @@ +--- +- name: vundle-install + hosts: localhost + tasks: + - name: Install vundle plugin manager for Vim + git: + repo: 'https://github.com/VundleVim/Vundle.vim.git' + dest: ~/.vim/bundle/Vundle.vim +- name: vim-plug-install + hosts: localhost + tasks: + - name: Install vim-plug + shell: > + curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ + https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim From 3b172d1539a679a0dfb8f2769a02dbf0df55481e Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Sun, 21 Jul 2024 22:46:58 -0400 Subject: [PATCH 12/14] adjusting github action --- .github/workflows/run-test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index 0326bad..ad0e6c5 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -1,13 +1,9 @@ name: dotfiles-test on: - push: - branches: [ "dev" ] pull_request: branches: [ "main" ] - workflow_dispatch: - jobs: install: runs-on: ubuntu-latest From df698ca6d9ca53ba7b557b98ddf4eab869d51404 Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Sun, 21 Jul 2024 23:01:52 -0400 Subject: [PATCH 13/14] adjusting .zshrc --- zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index a9b0eb1..d2dab45 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -96,7 +96,6 @@ export PATH=$PATH:/$HOME/.cargo/bin complete -C /usr/bin/terraform terraform source ~/.local/bin/zsh-autosuggestions/zsh-autosuggestions.zsh -export VIRTUAL_ENV_DISABLE_PROMPT= export BUILDX_EXPERIMENTAL=1 # FZF @@ -104,3 +103,4 @@ export BUILDX_EXPERIMENTAL=1 source <(fzf --zsh) [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh +export VIRTUAL_ENV_DISABLE_PROMPT=1 From 79e1f2eec84a026b66031c1d8e177ba06b31529c Mon Sep 17 00:00:00 2001 From: DMcP89 Date: Sun, 29 Sep 2024 23:54:57 -0400 Subject: [PATCH 14/14] Some changes from PopOs environment --- .../themes/zsh/default_leftonly.json | 3 --- i3/.config/i3/config | 19 ++++++------------- nvim/.config/nvim/coc-settings.json | 14 +++++++++++++- .../themes/shell/default_leftonly.json | 3 --- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.config/powerline/themes/zsh/default_leftonly.json b/.config/powerline/themes/zsh/default_leftonly.json index 1a436fb..adbc523 100644 --- a/.config/powerline/themes/zsh/default_leftonly.json +++ b/.config/powerline/themes/zsh/default_leftonly.json @@ -9,9 +9,6 @@ "function": "powerline.segments.common.env.user", "priority": 30 }, - { - "function": "powerline.segments.common.bat.battery" - }, { "function": "powerline.segments.common.time.date", "args": { diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 4234028..3c67e69 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -24,19 +24,12 @@ bindsym $super+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show dru bindsym --release Print exec gnome-screenshot -i bindsym $super+l exec i3lock -i ~/.wallpaper.png bindsym $super+Shift+w exec firefox -bindsym $super+Shift+f exec thunar;workspace 3;focus -bindsym $super+Shift+g exec geany - -#change volume -bindsym XF86AudioRaiseVolume exec amixer -q set Master 5%+ -bindsym XF86AudioLowerVolume exec amixer -q set Master 5%- -bindsym XF86AudioMute exec amixer set Master toggle - -# music control -bindsym XF86AudioNext exec mpc next -bindsym XF86AudioPrev exec mpc prev -bindsym XF86AudioPlay exec mpc toggle -bindsym XF86AudioStop exec mpc stop +bindsym $super+Shift+g exec thunderbird + +# scratchpad +bindsym $alt+Shift+m move scratchpad +bindsym $alt+m scratchpad show + # kill focused window bindsym $super+c kill diff --git a/nvim/.config/nvim/coc-settings.json b/nvim/.config/nvim/coc-settings.json index 95ba565..8fc5f00 100644 --- a/nvim/.config/nvim/coc-settings.json +++ b/nvim/.config/nvim/coc-settings.json @@ -6,5 +6,17 @@ "trace.server": "verbose", "filetypes": ["go"] } - } + }, + "pyright.inlayHints.variableTypes": false, + "pyright.inlayHints.parameterTypes": false, + "pyright.inlayHints.functionReturnTypes": false, + "pyright.disableDiagnostics": true, + "yaml.schemas": { + "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.22.0-standalone-strict/all.json": "/*.kubernetes.yaml", + "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.22.0-standalone-strict/all.json": "/*.k8s.yaml" + }, + "yaml.validate": true, + "yaml.format.enable": true, + "yaml.hover": true, + "yaml.completion": true } diff --git a/powerline/.config/powerline/themes/shell/default_leftonly.json b/powerline/.config/powerline/themes/shell/default_leftonly.json index 1a436fb..adbc523 100644 --- a/powerline/.config/powerline/themes/shell/default_leftonly.json +++ b/powerline/.config/powerline/themes/shell/default_leftonly.json @@ -9,9 +9,6 @@ "function": "powerline.segments.common.env.user", "priority": 30 }, - { - "function": "powerline.segments.common.bat.battery" - }, { "function": "powerline.segments.common.time.date", "args": {