From 1aaf66c3b67405d6c7aed7a525de99af21154eab Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sun, 19 Jun 2022 10:28:33 -0500 Subject: [PATCH] Updates --- common/fish/functions.fish | 1 - common/git/config | 3 +++ common/htop/rc | 35 ++++++++++++++++++++++++++--------- common/neovim/init.lua | 8 +++----- os/linux/sway/config | 2 +- os/linux/waybar/config | 2 +- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/common/fish/functions.fish b/common/fish/functions.fish index 9a06b0f..dbe774e 100644 --- a/common/fish/functions.fish +++ b/common/fish/functions.fish @@ -96,7 +96,6 @@ end if has_command rg function rgl; rg --color always $argv | less -r; end alias rg "rg --text" - alias grep "rg" alias gr "rg" end diff --git a/common/git/config b/common/git/config index b31a147..cba20cf 100644 --- a/common/git/config +++ b/common/git/config @@ -92,3 +92,6 @@ # pushOption = merge_request.create # pushOption = merge_request.remove_source_branch # pushOption = merge_request.assign="daniel.flanagan" + +[url "git@git-p1ap1.divvy.co:"] + insteadOf = https://git-p1ap1.divvy.co diff --git a/common/htop/rc b/common/htop/rc index 7a98287..8f35857 100644 --- a/common/htop/rc +++ b/common/htop/rc @@ -1,12 +1,8 @@ # 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.1.2 -config_reader_min_version=2 +htop_version=3.2.0 +config_reader_min_version=3 fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=-1 -tree_sort_key=0 -tree_sort_direction=1 hide_kernel_threads=1 hide_userland_threads=1 shadow_other_users=0 @@ -21,10 +17,8 @@ highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 show_merged_command=0 -tree_view=1 -tree_view_always_by_pid=0 -all_branches_collapsed=0 header_margin=1 +screen_tabs=0 detailed_cpu_time=0 cpu_count_from_one=1 show_cpu_usage=1 @@ -42,3 +36,26 @@ column_meters_0=LeftCPUs2 Memory Swap column_meter_modes_0=1 1 1 column_meters_1=RightCPUs2 Tasks LoadAverage Uptime column_meter_modes_1=1 2 2 2 +tree_view=0 +sort_key=46 +tree_sort_key=0 +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_CPU +.tree_sort_key=PID +.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 PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command +.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 diff --git a/common/neovim/init.lua b/common/neovim/init.lua index 0cbb3e5..7113e9a 100644 --- a/common/neovim/init.lua +++ b/common/neovim/init.lua @@ -32,7 +32,7 @@ packer.startup(function() -- session management 'olimorris/persisted.nvim', config = function() - local should_autoload = #vim.v.argv >= 1 + local should_autoload = #vim.v.argv == 1 require 'persisted'.setup { autoload = should_autoload, autosave = should_autoload, @@ -74,7 +74,6 @@ packer.startup(function() local cmp = require 'cmp' local luasnip = require 'luasnip' - --[[ local prev_item = function(fallback) if cmp.visible() then cmp.select_prev_item() @@ -96,7 +95,6 @@ packer.startup(function() fallback() end end - ]] -- cmp.setup { snippet = { @@ -118,8 +116,8 @@ packer.startup(function() [''] = cmp.mapping.confirm { select = false }, -- [""] = cmp.mapping(next_item, { "i", "s" }), -- [""] = cmp.mapping(prev_item, { "i", "s" }), - -- [''] = cmp.mapping(next_item, { "i", "s" }), - -- [''] = cmp.mapping(prev_item, { "i", "s" }), + [''] = cmp.mapping(next_item, { "i", "s" }), + [''] = cmp.mapping(prev_item, { "i", "s" }), }, sources = cmp.config.sources({ { name = 'nvim_lsp' }, diff --git a/os/linux/sway/config b/os/linux/sway/config index d62ac6b..aa4d2f8 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -188,7 +188,7 @@ exec_always 'killall kanshi; kanshi' # prevents all windows from stealing focus no_focus [class=".*"] -output * bg $HOME/.wallpaper fill +output * background $HOME/.wallpaper fill include /etc/sway/config.d/* include $XDG_CONFIG_HOME/lytedev-env/*/sway/config diff --git a/os/linux/waybar/config b/os/linux/waybar/config index f261646..7f9a9e2 100644 --- a/os/linux/waybar/config +++ b/os/linux/waybar/config @@ -1,7 +1,7 @@ { "layer": "top", "position": "bottom", - "output": ["eDP-1", "DP-3"], + "output": ["eDP-1", "DP-1"], "height": 32, "modules-left": ["clock"], "modules-center": ["sway/workspaces"],