Merge branch 'main' of ssh://git.a09.uk:48765/alex/alex-environ

home/.config/htop/htoprc

@@ -0,0 +1,61 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+htop_version=3.2.1
+config_reader_min_version=3
+fields=0 48 17 18 38 39 40 2 46 47 49 1
+hide_kernel_threads=1
+hide_userland_threads=0
+shadow_other_users=0
+show_thread_names=1
+show_program_path=1
+highlight_base_name=1
+highlight_deleted_exe=1
+highlight_megabytes=1
+highlight_threads=1
+highlight_changes=0
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=1
+header_margin=1
+screen_tabs=0
+detailed_cpu_time=0
+cpu_count_from_one=0
+show_cpu_usage=1
+show_cpu_frequency=0
+show_cpu_temperature=0
+degree_fahrenheit=0
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=0
+enable_mouse=1
+delay=15
+hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=AllCPUs Memory Zram Swap
+column_meter_modes_0=1 1 1 1
+column_meters_1=Tasks LoadAverage Uptime Systemd DiskIO NetworkIO
+column_meter_modes_1=2 2 2 2 2 2
+tree_view=0
+sort_key=47
+tree_sort_key=47
+sort_direction=-1
+tree_sort_direction=-1
+tree_view_always_by_pid=0
+all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PERCENT_MEM
+.tree_sort_key=PERCENT_MEM
+.tree_view=0
+.tree_view_always_by_pid=0
+.sort_direction=-1
+.tree_sort_direction=-1
+.all_branches_collapsed=0
+screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE
+.sort_key=IO_RATE
+.tree_sort_key=PID
+.tree_view=0
+.tree_view_always_by_pid=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0

home/.vimrc.d/filetypes.vim

@@ -46,3 +46,8 @@ let g:tex_flavor='latex'
 
 "Vim
 au BufNewFile,BufRead */.vimrc.d/* set filetype=vim
+
+"Helm
+autocmd BufRead,BufNewFile */templates/*.yaml,*/templates/*.tpl,*.gotmpl,helmfile.yaml set ft=helm
+" Use {{/* */}} as comments
+autocmd FileType helm setlocal commentstring={{/*\ %s\ */}}

home/.vimrc.d/plugins.vim

@@ -25,6 +25,7 @@ function! LoadPlugins()
     Plug 'morhetz/gruvbox'                              " gruvbox is a good colour scheme on 256 colours
 
     Plug 'amanning9/django-plus.vim'                    " Improvements for identifying files in django projects.
+    Plug 'towolf/vim-helm'
     Plug 'Glench/Vim-Jinja2-Syntax'                     " Jinja syntax detection.
 endfunction
 

private

@@ -1 +1 @@
-Subproject commit 0e34233ad56224b2096022a2c8b0f4b4bd87d2d0
+Subproject commit 051de63966223f86fb0859d28fbb3ef093bbb4c9