Merge remote-tracking branch 'origin/main'

common/envs

@@ -1,3 +1,4 @@
+os/android
 os/linux
 os/linux/arch
 os/linux/nix

common/git/config

@@ -1,5 +1,6 @@
 [user]
 	name = Daniel Flanagan
+	email = daniel@lyte.dev
 
 [filter "lfs"]
 	clean = git-lfs clean -- %f

common/helix/config.toml

@@ -4,6 +4,8 @@ theme = "custom"
 soft-wrap.enable = true
 auto-pairs = false
 auto-save = false
+completion-trigger-len = 1
+color-modes = false
 bufferline = "multiple"
 scrolloff = 8
 rulers = [80, 120]
@@ -21,6 +23,15 @@ hidden = false
 render = true
 character = "▏"
 
+[editor.lsp]
+display-messages = true
+display-inlay-hints = true
+
+[editor.statusline]
+left = ["mode", "spinner", "selections", "primary-selection-length", "position", "position-percentage", "diagnostics", "workspace-diagnostics"]
+center = ["file-name"]
+right = [ "version-control", "total-line-numbers", "file-encoding"]
+
 [keys.insert]
 j = { k = "normal_mode", j = "normal_mode", K = "normal_mode", J = "normal_mode" }
 

os/android/config.d.fish

@@ -0,0 +1,2 @@
+set --export --universal NOTES_PATH $NICE_HOME/storage/shared/notes
+

os/linux/libinput/gestures.conf

@@ -5,6 +5,6 @@ timeout 0.9
 
 gesture swipe left	3 swaymsg workspace back_and_forth
 
-gesture swipe right 2 swaymsg seat seat0 cursor press BTN_EXTRA && swaymsg seat seat0 cursor release BTN_EXTRA
+# gesture swipe right 2 swaymsg seat seat0 cursor press BTN_EXTRA && swaymsg seat seat0 cursor release BTN_EXTRA
 
-gesture swipe left  2 swaymsg seat seat0 cursor press BTN_SIDE && swaymsg seat seat0 cursor release BTN_SIDE
+# gesture swipe left  2 swaymsg seat seat0 cursor press BTN_SIDE && swaymsg seat seat0 cursor release BTN_SIDE

os/linux/sway/config

@@ -160,6 +160,10 @@ mode "resize" {
 	bindsym escape mode "default"
 }
 
+bar {
+	swaybar_command waybar
+}
+
 set $tilers "(kitty.*|firefox.*|slack.*|Slack.*|thunar.*|Alacritty.*|alacritty.*|Discord.*|discord.*)"
 for_window [title=".*"] floating enable
 for_window [app_id=$tilers] floating disable
@@ -182,8 +186,6 @@ exec mako
 
 exec kitty --single-instance
 exec /usr/lib/polkit-kde-authentication-agent-1
-exec eww daemon
-exec eww open-many bar
 
 # exec_always notify-send -a "sway" -i ~/.wallpaper "sway configuration loaded"
 

os/linux/waybar/config

@@ -28,6 +28,11 @@
 		"tooltip-format-enumerate-connected": "{device_alias}@{device_address}",
 		"tooltip-format-enumerate-connected-battery": "{device_alias}@{device_address} ( {device_battery_percentage}%)"
 	},
+    // "wireplumber": {
+    //     "format": "{volume}% {icon}",
+    //     "format-muted": "",
+    //     "on-click": "helvum"
+    // },
 	"sway/workspaces": {
 		"disable-scroll": false,
 		"persistent_workspaces": {
@@ -46,10 +51,10 @@
 		"format": "{name}"
 	},
 	"idle_inhibitor": {
-		"format": "<span foreground=\"#666666\">{icon}</span>",
+		"format": "{icon}",
 		"format-icons": {
-			"activated": "﯎",
+			"activated": "󰈈",
-			"deactivated": "﯏"
+			"deactivated": "󰈉"
 		}
 	},
 	"tray": {
@@ -66,7 +71,7 @@
 		"interval": 3
 	},
 	"memory": {
-		"format": "{} <span foreground=\"#666666\"></span>"
+		"format": "{} 󰍛"
 	},
 	"temperature": {
 		// "thermal-zone": 2,
@@ -79,7 +84,7 @@
 	"backlight": {
 		// "device": "acpi_video1",
 		"format": "{percent}% {icon}",
-		"format-icons": ["", ""]
+		"format-icons": ["", ""]
 	},
 	"battery": {
 		"states": {
@@ -92,8 +97,8 @@
 		"format-plugged": "{capacity}% ﮣ",
 		"format-alt": "{time} {icon}",
 		"format-good": "", // An empty format will hide the module
-		"format-full": "",
+		"format-full": "󰁹",
-		"format-icons": ["", "", "", "", ""]
+		"format-icons": ["󰂎", "󰁻", "󰁽", "󰁿", "󰂂"]
 	},
 	"network": {
 		"format-wifi": "{essid} ({signalStrength}%) ",
@@ -109,7 +114,7 @@
 		//"format-bluetooth": "{volume}% {icon} {format_source}",
 		//"format-bluetooth-muted": " {icon} {format_source}",
 		//"format-muted": " {format_source}",
-		"format-muted": "<span foreground=\"#666666\">ﱝ</span> {format_source}",
+		"format-muted": "󰝟  {format_source}",
 		"format-source": "<span foreground=\"#bf7998\"></span>",
 		"format-source-muted": "<span foreground=\"#6c88a6\"></span>",
 		"format-icons": {

os/linux/waybar/style.css

@@ -3,7 +3,7 @@
 * {
 	border: none;
 	border-radius: 0;
-	font-family: "IosevkaLyteTerm", sans-serif;
+	font-family: "IosevkaLyteTerm", "Symbols Nerd Font Mono", sans-serif;
 	font-size: 16px;
 	min-height: 0;
 }
@@ -68,10 +68,11 @@ window#waybar.empty {
 #idle_inhibitor,
 #mpd {
 	padding: 0 0.75em;
+	background-color: inherit;
+	color: @text;
 }
 
 #clock {
-	/* background-color: #64727D; */
 }
 
 #battery {