Merge remote-tracking branch 'origin/master'

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 $NOTES_PATH/_scratch.sc"
-alias scs "sc-im $NOTES_PATH/_scratch.sc"
 alias disks "lsblk && df -h"
 alias dd "dd status=progress"
 alias wifi "sudo iwctl"

common/git/config

@@ -70,20 +70,14 @@
 [gpg]
 	program = gpg2
 
-# [include]
+[include]
-	# path = $ENV_PATH/gitconfig
+	path = $ENV_PATH/gitconfig
+
+[include]
+	path = $HOME/.config/lytedev-env/divvy/gitconfig
+
 [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
-
-# This next lines include Netlify's Git Credential Helper configuration in your Git configuration.
-# [include]
-	# path = /home/daniel/.home/.config/netlify/helper/git-config

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

common/neovim/coc-settings.json

@@ -1,13 +1,13 @@
 {
+	"coc.preferences.formatOnSaveFiletypes": ["elixir", "ex", "exs", "typescript", "css", "markdown"],
   "languageserver": {
-    "arduino":{
+    "arduino": {
       "command":"/home/daniel/.home/.go/bin/arduino-language-server",
       "rootPatterns":["*.ino"],
       "filetypes":["arduino"],
       "args":["-cli", "/usr/bin/arduino-cli", "-clangd", "/usr/bin/clangd", "-cli-config", "/path/to/arduino-cli.yaml"]
     }
   },
-	"coc.preferences.formatOnSaveFiletypes": ["svelte", "css", "markdown"],
   "elixir.pathToElixirLS": "~/.elixir-ls/release/language_server.sh",
   "diagnostic-languageserver.filetypes": {
     "elixir": ["mix_credo", "mix_credo_compile"],

os/linux/bin/wm

@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-"$(dirname $0)/../sway/init"
+exec "$(dirname "$0")/../sway/init"

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 CWTM623" 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
@@ -35,6 +42,12 @@ profile desktop-ultrawide  {
   output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,560 scale 1 transform normal
 }
 
+# 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-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

os/linux/sway/config

@@ -178,6 +178,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'