fix fedora-asahi-remix

8 files changed, 348 insertions, 5 deletions

diff --git a/.bashrc b/.bashrc
index b52782a..ad713c8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -24,7 +24,7 @@ OS=${OS:-$(~/bin/os)}
 
 # Support different operating system environments
 case $OS in
-(arch|alpine)
+(arch|alpine|fedora-asahi-remix)
 	alias ls='ls --color=auto -v' ll='ls -AlFhv'
 	[ "$OS" = arch ] || trap 'printf "\e]2;${PWD/~/\~} ${BASH_COMMAND%ps1}\a"' DEBUG
 	;;
diff --git a/.config/foot/foot.ini.fedora-asahi-remix b/.config/foot/foot.ini.fedora-asahi-remix
new file mode 100644
index 0000000..8cbf843
--- /dev/null
+++ b/.config/foot/foot.ini.fedora-asahi-remix
@@ -0,0 +1,13 @@
+[main]
+#font=JetBrains Mono:size=8
+#font=DejaVu Sans Mono:size=8
+#font=Mono:size=8
+font=MiscFixed:pixelsize=13
+pad=2x0 center
+
+[cursor]
+color=ffffff ff0000
+
+[colors]
+background=ffffff
+foreground=000000
diff --git a/.config/i3status/config.fedora-asahi-remix b/.config/i3status/config.fedora-asahi-remix
new file mode 100644
index 0000000..17d3bb0
--- /dev/null
+++ b/.config/i3status/config.fedora-asahi-remix
@@ -0,0 +1,126 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+# Some icon chars can be found at https://emojipedia.org/objects/
+
+general {
+        colors = true
+        interval = 5
+}
+
+#order += "read_file hostname"
+#order += "ipv6"
+order += "wireless _first_"
+#order += "ethernet _first_"
+#order += "battery all"
+order += "battery 0"
+order += "disk /"
+#order += "disk /boot"
+order += "cpu_usage"
+#order += "load"
+order += "memory"
+#order += "cpu_temperature 0"
+order += "volume master"
+order += "tztime local"
+
+read_file hostname {
+	format = "%content"
+	path = "/etc/hostname"
+}
+
+wireless _first_ {
+        #format_up = "🌐 %essid %quality"
+        #format_up = "📶 %essid %quality"
+        format_up = "📡 %essid %signal %bitrate"
+        format_down = "📡 down"
+}
+
+ethernet _first_ {
+        format_up = "E: %ip (%speed)"
+        format_down = "E: down"
+}
+
+#
+battery all {
+	last_full_capacity = true
+	integer_battery_capacity = true
+#	format = "%status %percentage %remaining"
+#	format = "%status %percentage %remaining %consumption"
+	format = "%status %percentage"
+	status_chr = "⚡🔋"
+    status_bat = "🔋"
+    status_unk = "? UNK"
+    status_full = "⚡🔋"
+	threshold_type = "percentage"
+	low_threshold = 10
+}
+
+battery 0 {
+#	format = "%status %percentage"
+	format = "%status %percentage %consumption"
+	integer_battery_capacity = true
+	hide_seconds = true
+	status_chr = "⚡🔋"
+    status_bat = "🔋"
+    status_unk = "? UNK"
+    status_full = "⚡🔋"
+	threshold_type = "percentage"
+	low_threshold = 10
+	path = /sys/class/power_supply/macsmc-battery/uevent
+}
+
+#battery 0 {
+#	format = "%status %percentage %remaining %emptytime"
+#	format_down = "No battery"
+#	status_chr = "CHR"
+#	status_bat = "BAT"
+#	status_unk = "UNK"
+#	status_full = "FULL"
+#	path = "/sys/class/power_supply/BAT%d/uevent"
+#	low_threshold = 10
+#}
+
+disk "/" {
+        #format = "📀 %avail"
+        #format = "💽 %avail"
+        format = "/ %avail av."
+}
+
+disk "/boot" {
+        format = "/boot %avail"
+}
+
+cpu_usage {
+	format = "CPU %usage"
+}
+
+load {
+        format = "Load: %1min"
+}
+
+memory {
+        format = "Mem %available av."
+        threshold_degraded = "1G"
+        format_degraded = "MEMORY < %available"
+}
+
+cpu_temperature 0 {
+	format = "🌡 %degrees °C"
+	path = "/sys/devices/platform/coretemp.0/hwmon/hwmon*/temp?_input"
+}
+
+tztime local {
+        #format = "%Y-%m-%d %H:%M:%S"
+        format = "%a %d %b %H:%M:%S"
+        #format = "📅 %a %d %b ⌚ %H:%M:%S"
+}
+
+volume master {
+        format = "🔈 %volume"
+        format_muted = "🔈 mute (%volume)"
+        device = "default"
+}
diff --git a/.config/sway/config.fedora-asahi-remix b/.config/sway/config.fedora-asahi-remix
new file mode 100644
index 0000000..29ac076
--- /dev/null
+++ b/.config/sway/config.fedora-asahi-remix
@@ -0,0 +1,187 @@
+# xwayland disable
+
+# Setup sound (un-necessary on asahi-fedora-remix)
+# exec /usr/libexec/pipewire-launcher
+# exec dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+
+#input * {
+#	xkb_layout "us"
+#	xkb_variant "intl"
+#}
+#
+#input <identifier> xkb_model "pc101"
+
+bar {
+	status_command i3status
+}
+
+output * bg #103040 solid_color
+
+# output eDP-1 scale 2
+
+input type:touchpad {
+	tap enabled
+	natural_scroll enabled
+}
+
+font Monospace 7
+#font pango:MiscFixedSC613 9
+
+set $mod Mod4
+
+bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+bindsym $mod+q kill
+bindsym $mod+Return exec --no-startup-id foot
+#bindsym $mod+Return exec --no-startup-id xt
+#bindsym $mod+d exec --no-startup-id bemenu-run
+#bindsym $mod+d exec --no-startup-id i3-dmenu-desktop -dmenu="bemenu -i -fn 'Mono-12' --hf '#00ff00' --tf '#00ff00'"
+#bindsym $mod+d exec --no-startup-id i3-dmenu-desktop -dmenu="wmenu-run"
+#bindsym $mod+d exec --no-startup-id wemenu-run
+bindsym $mod+d exec --no-startup-id fuzzel -T foot
+bindsym XF86Sleep             exec echo "mem" | sudo tee /sys/power/state
+bindsym XF86ScreenSaver       exec swaylock -c 103040
+bindsym XF86RFKill            exec sudo rfkill toggle wlan && doas pkill -USR1 udhcpc
+bindsym XF86WLAN              exec sudo rfkill toggle wlan && doas pkill -USR1 udhcpc
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
+bindsym XF86MonBrightnessUp   exec brightnessctl set 5%+
+bindsym XF86AudioPlay         exec playerctl play-pause
+bindsym XF86AudioNext         exec playerctl next
+bindsym XF86AudioPrev         exec playerctl previous
+bindsym XF86AudioMute         exec pactl set-sink-mute @DEFAULT_SINK@ toggle && pkill -USR1 i3status
+bindsym XF86AudioLowerVolume  exec pactl set-sink-volume @DEFAULT_SINK@ -5% && pkill -USR1 i3status
+bindsym XF86AudioRaiseVolume  exec pactl set-sink-volume @DEFAULT_SINK@ +5% && pkill -USR1 i3status
+
+
+for_window [app_id="google-chrome"] floating enable
+#for_window [class="firefox"] floating enable
+for_window [class="thunderbird"] floating enable
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+m focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+m move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+z layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+#bindsym $mod+q focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace number $ws1
+bindsym $mod+2 workspace number $ws2
+bindsym $mod+3 workspace number $ws3
+bindsym $mod+4 workspace number $ws4
+bindsym $mod+5 workspace number $ws5
+bindsym $mod+6 workspace number $ws6
+bindsym $mod+7 workspace number $ws7
+bindsym $mod+8 workspace number $ws8
+bindsym $mod+9 workspace number $ws9
+bindsym $mod+0 workspace number $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number $ws1
+bindsym $mod+Shift+2 move container to workspace number $ws2
+bindsym $mod+Shift+3 move container to workspace number $ws3
+bindsym $mod+Shift+4 move container to workspace number $ws4
+bindsym $mod+Shift+5 move container to workspace number $ws5
+bindsym $mod+Shift+6 move container to workspace number $ws6
+bindsym $mod+Shift+7 move container to workspace number $ws7
+bindsym $mod+Shift+8 move container to workspace number $ws8
+bindsym $mod+Shift+9 move container to workspace number $ws9
+bindsym $mod+Shift+0 move container to workspace number $ws10
+
+# Cycle through active workspaces
+bindsym $mod+Tab workspace next
+bindsym $mod+Shift+Tab workspace prev
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+# bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Ctrl+backspace exec killall sway
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+	# These bindings trigger as soon as you enter the resize mode
+
+	# Pressing left will shrink the window’s width.
+	# Pressing right will grow the window’s width.
+	# Pressing up will shrink the window’s height.
+	# Pressing down will grow the window’s height.
+	bindsym j resize shrink width 10 px or 10 ppt
+	bindsym k resize grow height 10 px or 10 ppt
+	bindsym l resize shrink height 10 px or 10 ppt
+	bindsym m resize grow width 10 px or 10 ppt
+
+	# same bindings, but for the arrow keys
+	bindsym Left resize shrink width 10 px or 10 ppt
+	bindsym Down resize grow height 10 px or 10 ppt
+	bindsym Up resize shrink height 10 px or 10 ppt
+	bindsym Right resize grow width 10 px or 10 ppt
+
+	# back to normal: Enter or Escape or $mod+r
+	bindsym Return mode "default"
+	bindsym Escape mode "default"
+        bindsym $mod+r mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# Move a workspace to a different monitor
+bindsym $mod+greater move workspace to output right
+bindsym $mod+less move workspace to output left
diff --git a/.local/share/fonts/fixed/6x13.pcf b/.local/share/fonts/fixed/6x13.pcf
new file mode 100644
index 0000000..8097bc8
--- /dev/null
+++ b/.local/share/fonts/fixed/6x13.pcf
diff --git a/.local/share/fonts/fixed/6x13B.pcf b/.local/share/fonts/fixed/6x13B.pcf
new file mode 100644
index 0000000..fda1d2e
--- /dev/null
+++ b/.local/share/fonts/fixed/6x13B.pcf
diff --git a/.profile b/.profile
index d52b4f3..98093f8 100644
--- a/.profile
+++ b/.profile
@@ -7,14 +7,14 @@ case $OS in
 	PATH=~/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:~/go/bin
 	export XDG_RUNTIME_DIR=/run/user/$(id -u)
 	;;
+(fedora-asahi-remix)
+	PATH=~/bin:/usr/local/bin:/usr/sbin:/usr/bin:~/go/bin
+	export XKB_DEFAULT_LAYOUT=us XKB_DEFAULT_VARIANT=intl
+	;;
 (Darwin)
 	PATH=~/bin:~/mu/bin:/opt/homebrew/bin:/opt/homebrew/opt/ruby/bin:/opt/homebrew/opt/tcl-tk/bin:$PATH:~/go/bin:~/.cargo/bin:~/.pyenv/versions/2.7.18/bin:~/.local/bin
 	export REPLYTO='mvertes@free.fr'
 	export LANG=en_US.UTF-8
-	if [ -z "$SSH_AUTH_SOCK" ]; then
-		eval "$(ssh-agent -s)"
-		ssh-add
-	fi
 	. /opt/homebrew/etc/profile.d/bash_completion.sh
 	tabs -4
 	export HOMEBREW_NO_ANALYTICS=1
@@ -24,6 +24,11 @@ case $OS in
 	;;
 esac
 
+if [ -z "$SSH_AUTH_SOCK" ]; then
+	eval "$(ssh-agent -s)"
+	ssh-add
+fi
+
 case $SHELL in
 (*/ash)  export ENV=~/.shrc ;;
 (*/bash) type -t p >/dev/null || . ~/.bashrc ;;
diff --git a/bin/dotfiles-post-update b/bin/dotfiles-post-update
new file mode 100755
index 0000000..d6844f3
--- /dev/null
+++ b/bin/dotfiles-post-update
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# fix some dotfiles after 'dotfiles pull.
+
+os=$(os)
+case $os in
+fedora-asahi-remix)
+	cp ~/.config/foot/foot.ini.$os ~/.config/foot/foot.ini
+	cp ~/.config/i3status/config.$os ~/.config/i3status/config
+	cp ~/.config/sway/config.$os ~/.config/sway/config
+	;;
+esac