From 2b5e04de44b30b5fb095237fe8745ef29b7b77d3 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 4 Oct 2021 09:13:52 -0500 Subject: [PATCH 1/2] Remove private url --- common/fish/aliases.fish | 3 +-- common/fish/paths.fish | 1 + common/git/config | 4 ++++ common/htop/rc | 15 ++++++++++----- common/neovim/coc-settings.json | 2 +- os/linux/bin/wm | 2 +- os/linux/kanshi/config | 13 +++++++------ os/linux/sway/config | 1 + 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/common/fish/aliases.fish b/common/fish/aliases.fish index 6a682ea..39705a2 100755 --- a/common/fish/aliases.fish +++ b/common/fish/aliases.fish @@ -100,8 +100,7 @@ alias sctlu "systemctl --user" alias bt "sctl start bluetooth && sudo bluetoothctl" alias btctl "bt" alias resrc "source $XDG_CONFIG_HOME/fish/config.fish; fish_user_key_bindings" -alias sc "sc-im" -alias scs "sc-im $NOTES_PATH/_scratch.sc" +alias scs "sc $NOTES_PATH/_scratch.sc" alias disks "lsblk && df -h" alias dd "dd status=progress" alias wifi "sudo iwctl" diff --git a/common/fish/paths.fish b/common/fish/paths.fish index e5256aa..df4bcbb 100755 --- a/common/fish/paths.fish +++ b/common/fish/paths.fish @@ -8,6 +8,7 @@ set paths_candidates \ $DOTFILES_PATH/common/bin \ $HOME/.bin \ $HOME/.cargo/bin \ + $HOME/.deno/bin \ $HOME/.nimble/bin \ $HOME/.yarn/bin \ $HOME/.netlify/helper/bin diff --git a/common/git/config b/common/git/config index de277c2..79cd1fc 100644 --- a/common/git/config +++ b/common/git/config @@ -75,6 +75,10 @@ [include] path = $ENV_PATH/gitconfig + +[include] + path = $HOME/.config/lytedev-env/divvy/gitconfig + [color] ui = auto diff --git a/common/htop/rc b/common/htop/rc index 9e52749..0914ef8 100644 --- a/common/htop/rc +++ b/common/htop/rc @@ -1,8 +1,10 @@ # 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.0 +config_reader_min_version=2 fields=0 48 17 18 38 39 40 2 46 47 49 1 sort_key=46 -sort_direction=1 +sort_direction=-1 tree_sort_key=0 tree_sort_direction=1 hide_kernel_threads=1 @@ -11,6 +13,7 @@ shadow_other_users=0 show_thread_names=0 show_program_path=0 highlight_base_name=1 +highlight_deleted_exe=1 highlight_megabytes=1 highlight_threads=1 highlight_changes=0 @@ -20,6 +23,7 @@ strip_exe_from_cmdline=1 show_merged_command=0 tree_view=0 tree_view_always_by_pid=0 +all_branches_collapsed=0 header_margin=1 detailed_cpu_time=0 cpu_count_from_one=1 @@ -32,8 +36,9 @@ account_guest_in_cpu_meter=0 color_scheme=0 enable_mouse=1 delay=15 -left_meters=LeftCPUs2 Memory Swap -left_meter_modes=1 1 1 -right_meters=RightCPUs2 Tasks LoadAverage Uptime -right_meter_modes=1 2 2 2 hide_function_bar=0 +header_layout=two_50_50 +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 diff --git a/common/neovim/coc-settings.json b/common/neovim/coc-settings.json index b840e05..37ba1f8 100644 --- a/common/neovim/coc-settings.json +++ b/common/neovim/coc-settings.json @@ -1,5 +1,5 @@ { - "coc.preferences.formatOnSaveFiletypes": ["elixir", "ex", "exs"], + "coc.preferences.formatOnSaveFiletypes": ["elixir", "ex", "exs", "typescript"], "elixir.pathToElixirLS": "~/.elixir-ls/release/language_server.sh", "diagnostic-languageserver.filetypes": { "elixir": ["mix_credo", "mix_credo_compile"], diff --git a/os/linux/bin/wm b/os/linux/bin/wm index bd3ce33..60795af 100755 --- a/os/linux/bin/wm +++ b/os/linux/bin/wm @@ -1,2 +1,2 @@ #!/usr/bin/env sh -"$(dirname $0)/../sway/init" +exec "$(dirname "$0")/../sway/init" diff --git a/os/linux/kanshi/config b/os/linux/kanshi/config index 85117a8..ce004b8 100644 --- a/os/linux/kanshi/config +++ b/os/linux/kanshi/config @@ -1,3 +1,10 @@ +profile laptop-with-display2 { + output "Samsung Electric Company SAMSUNG 0x00000F00" enable mode 1280x720@60Hz position 0,0 scale 1 transform normal + + output eDP-1 enable position 1280,0 scale 2 transform normal + exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/laptop-single-workspace.bash" +} + profile desktop-H-2x4kside2 { output "Dell Inc. DELL U2720Q D3TM623" enable mode 3840x2160@60Hz position 0,0 scale 1 transform 270 output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 2160,1200 scale 1 transform normal @@ -32,12 +39,6 @@ profile desktop-ultrawide { exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-single-workspace.sh" } -profile laptop-with-display { - output "Sharp Corporation 0x144A 0x00000000" enable mode 1920x1080@60Hz position 0,0 scale 1 transform normal - output DP-1 enable mode 1920x1080@60Hz position 0,0 scale 1 transform normal - exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/laptop-single-workspace.bash" -} - profile laptop { output "Sharp Corporation 0x144A 0x00000000" enable mode 3200x1800@60Hz position 0,0 scale 2 transform normal } diff --git a/os/linux/sway/config b/os/linux/sway/config index 3dfa05e..545bcb4 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -175,6 +175,7 @@ bar { exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway exec mako exec pipewire +exec /usr/lib/kdeconnectd exec gammastep -t 6500:3500 -l 39.0:-94.5 exec_always 'killall kanshi; kanshi' From 441003f265397794d8ff91b92673b47bd01aa0e7 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 4 Oct 2021 09:18:12 -0500 Subject: [PATCH 2/2] Remove private url --- common/git/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/git/config b/common/git/config index 8794af2..571c598 100644 --- a/common/git/config +++ b/common/git/config @@ -79,11 +79,5 @@ [color] ui = auto -[http "https://git-p1ap1.divvy.co"] - proxy = socks://localhost:9982 - -[url "git@git-p1ap1.divvy.co"] - proxy = https://github.com/postmates - [push] default = current