dot_bash_profile.tmpl

@@ -29,7 +29,7 @@ export XSECURELOCK_AUTHPROTO=authproto_pam
 export XSECURELOCK_BURNIN_MITIGATION=300
 export XSECURELOCK_PASSWORD_PROMPT=time
 
-{{ if eq .chezmoi.hostname "helix" -}}
+{{- if eq .chezmoi.hostname "helix" }}
 # scale GTK applicatons on hidpi screens
 export GDK_SCALE=2 GDK_DPI_SCALE=0.50 thunar
 export GDK_SCALE=2 GDK_DPI_SCALE="0.50 Simple-scan"

dot_config/fuzzel/fuzzel.ini

@@ -1,32 +1,32 @@
-# output=
+# output=<not set>
-layer = top
-exit-on-keyboard-focus-loss = yes
-
 font=Hack
 dpi-aware=auto
+# prompt=> 
 icon-theme=Qogir-dark
 icons-enabled=yes
-letter-spacing=0
+fields=filename,name,generic,exec
-prompt='>  ' 
+# password-character=*
+fuzzy=yes
+show-actions=yes
+terminal=kitty
+# launch-prefix=<not set>
 
 lines=15
-# line-height=
+width=30
-width=40
 tabs=4
 horizontal-pad=40
 vertical-pad=8
 inner-pad=0
 image-size-ratio=0.5
 
-fields=filename,name,generic,exec
+# line-height=<use font metrics>
-# password-character=*
+letter-spacing=0
-fuzzy=yes
+
-show-actions=yes
+layer = top
-terminal=kitty
+exit-on-keyboard-focus-loss = yes
-# launch-prefix=
 
 [colors]
-background=323d43ee
+background=525c6dff
 text=d8caacff
 match=83c092ff
 selection=72b783dd
@@ -36,3 +36,53 @@ border=d5b26bff
 [border]
 width=1
 radius=10
+
+[dmenu]
+# mode=text  # text|index
+# exit-immediately-if-empty=no
+
+[key-bindings]
+# cancel=Escape Control+g
+# execute=Return KP_Enter Control+y
+# execute-or-next=Tab
+# cursor-left=Left Control+b
+# cursor-left-word=Control+Left Mod1+b
+# cursor-right=Right Control+f
+# cursor-right-word=Control+Right Mod1+f
+# cursor-home=Home Control+a
+# cursor-end=End Control+e
+# delete-prev=BackSpace
+# delete-prev-word=Mod1+BackSpace Control+BackSpace
+# delete-next=Delete
+# delete-next-word=Mod1+d Control+Delete
+# delete-line=Control+k
+# prev=Up Control+p
+# prev-with-wrap=ISO_Left_Tab
+# prev-page=PageUp KP_PageUp
+# next=Down Control+n
+# next-with-wrap=none
+# next-page=Page_Down KP_Page_Down
+
+# custom-N: *dmenu mode only*. Like execute, but with a non-zero
+# exit-code; custom-1 exits with code 10, custom-2 with 11, custom-3
+# with 12, and so on.
+
+# custom-1=Mod1+1
+# custom-2=Mod1+2
+# custom-3=Mod1+3
+# custom-4=Mod1+4
+# custom-5=Mod1+5
+# custom-6=Mod1+6
+# custom-7=Mod1+7
+# custom-8=Mod1+8
+# custom-9=Mod1+9
+# custom-10=Mod1+0
+# custom-11=Mod1+exclam
+# custom-12=Mod1+at
+# custom-13=Mod1+numbersign
+# custom-14=Mod1+dollar
+# custom-15=Mod1+percent
+# custom-16=Mod1+dead_circumflex
+# custom-17=Mod1+ampersand
+# custom-18=Mod1+asterix
+# custom-19=Mod1+parentleft

dot_config/gammastep/config.ini

@@ -32,7 +32,7 @@ fade=1
 ;brightness-night=0.4
 ; Set the screen gamma (for all colors, or each color channel
 ; individually)
-gamma=0.9
+;gamma=0.8
 ;gamma=0.8:0.7:0.8
 ; This can also be set individually for day and night since
 ; version 1.10.

dot_config/kanshi/config

@@ -1,8 +1,6 @@
+
 profile dual {
+  #output * background ~/Pictures/Wallpapers/dark-forest-path.jpg scale
   output DP-1 mode 1920x1080@144.00Hz position 0,0
   output DP-2 mode 1920x1080@60.00Hz position 1920,0
 }
-
-profile laptop {
-    output eDP-1 mode 3840x2160@60Hz position 0,0 scale 2
-  }

dot_config/river/executable_init

@@ -114,41 +114,20 @@ riverctl map normal Super F11 enter-mode passthrough
 # Return to normal mode
 riverctl map passthrough Super F11 enter-mode normal
 
-{{ if (or (eq .chezmoi.hostname "helix") (eq .chezmoi.hostname "triangulum")) -}}
-
 # Function/Media keys
 for mode in normal locked
 do
 
-  # Volume
+    # Pipewire volume
+    riverctl map $mode None XF86AudioRaiseVolume  spawn 'pactl set-sink-volume @DEFAULT_SINK@ +5%'
+    riverctl map $mode None XF86AudioLowerVolume  spawn 'pactl set-sink-volume @DEFAULT_SINK@ -5%'
+    riverctl map $mode None XF86AudioMute         spawn 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
 
-  riverctl map $mode None XF86AudioMute          spawn 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
+    # Backlight brightness
-  riverctl map $mode None XF86AudioLowerVolume   spawn 'pactl set-sink-volume @DEFAULT_SINK@ -5%'
+    riverctl map $mode None XF86MonBrightnessUp   spawn 'light -A 5'
-  riverctl map $mode None XF86AudioRaiseVolume   spawn 'pactl set-sink-volume @DEFAULT_SINK@ +5%'
+    riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5'
-  riverctl map $mode None XF86AudioMicMute       spawn 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'
-
-  # Backlight
-  riverctl map $mode None XF86MonBrightnessDown  spawn 'light -U 5'
-  riverctl map $mode None XF86MonBrightnessUp    spawn 'light -A 5'
-
-  # Display
-  #riverctl map $mode None XF86Display            spawn ''
-
-  # WiFi
-  riverctl map $mode None XF86WLAN               spawn 'toggle-wifi'
-
-  # Notifications
-  #riverctl map $mode None XF86NotificationCenter spawn ''
-
-  # Phone
-  #riverctl map $mode None XF86PickupPhone        spawn ''
-  #riverctl map $mode None XF86HangupPhone        spawn ''
-
-  # Favorites
-  #riverctl map $mode None XF86Favorites          spawn ''
 
 done
-{{- end }}
 
 # Set background and border
 riverctl background-color 0x323d43
@@ -159,21 +138,6 @@ riverctl border-width 1
 
 # Keyboard repeat rate
 riverctl set-repeat 50 300
-{{- if eq .chezmoi.hostname "helix" }}
-
-# Touchpad
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad accel-profile adaptive
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad pointer-accel .5
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad drag enabled
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad disable-while-typing enabled
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad tap enabled
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad tap-button-map left-right-middle
-riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad scroll-method two-finger
-
-# Lid switch
-riverctl map-switch normal lid close "waylock -fork-on-lock -init-color 0x000000"
-{{- end }}
 
 ### "rule-add" not implemented yet???
 # Make all views with an app-id that starts with "float" and title "foo" start floating.
@@ -189,9 +153,9 @@ riverctl map-switch normal lid close "waylock -fork-on-lock -init-color 0x000000
 # Make all views with app-id "bar" and any title use client-side decorations
 # riverctl rule-add csd -app-id "bar"
 
-# Default layout generator - rivertile(1)
+# Default layoout generator - rivertile(1)
 riverctl default-layout rivertile
-rivertile -view-padding 4 -outer-padding 4 -main-ratio .5 &
+rivertile -view-padding 6 -outer-padding 6 -main-ratio .5 &
 
 # Autostart
 /usr/lib/at-spi-bus-launcher --launch-immediately &
@@ -201,18 +165,11 @@ gnome-keyring-daemon --start --components=secrets &
 gnome-keyring-daemon --start --components=ssh &
 pipewire-launcher &
 kanshi &
-dunst &
+swayidle -w timeout 600 waylock -fork-on-lock -init-color 0x000000 &
-{{- if eq .chezmoi.hostname "hydrus" }}
 swaybg -m fill -i $HOME/Pictures/Wallpapers/dark-forest-path.jpg &
-swayidle -w timeout 600 "waylock -fork-on-lock -init-color 0x000000" &
+dunst &
-{{- else if eq .chezmoi.hostname "helix" }}
-swaybg -m center -i "$HOME/Pictures/Wallpapers/Mountain Retreat.jpg" &
-swayidle-laptop &
-{{- else }}
-swayidle -w timeout 600 "waylock -fork-on-lock -init-color 0x000000" &
-{{- end }}
 gammastep -r &
-waybar-launcher &
+waybar &
 blueman-applet &
 evolution &
 mattermost-desktop &

dot_config/waybar/config

@@ -1,12 +1,7 @@
 {
-{{- if eq .chezmoi.hostname "hydrus"}}
+    "layer": "top",
     "output": "DP-1",
     "position": "bottom",
-{{- else }}
-    "output": "eDP-1",
-    "position": "top",
-{{- end }}
-    "layer": "top",
     "height": 24,
     // "width": 1280,
     "spacing": 4,
@@ -47,8 +42,8 @@
     },
 
     "river/tags": {
-        //"tag-labels": ["1", "2", "3", "4", "5"],
+        "tag-labels": ["1", "2", "3", "4", "5"],
-        //"num-tags": 5
+        "num-tags": 5
     },
     
     "idle_inhibitor": {

dot_config/waybar/style.css

@@ -5,12 +5,8 @@
 }
 
 window#waybar {
-  background-color: rgba(50, 61, 67, 0.85);
+  background-color: rgba(50, 61, 67, 0.8);
-{{- if eq .chezmoi.hostname "hydrus"}}
+  border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-  border-bottom: 3px solid rgba(208, 191, 155, 0.7);
-{{- else }}
-  border-top: 3px solid rgba(208, 191, 155, 0.7);
-{{- end }}
   color: #d0bf9b;
   transition-property: background-color;
   transition-duration: 0.5s;
@@ -166,11 +162,11 @@ label:focus {
 }
 
 #network {
-  background-color: #83c092;
+  background-color: #7fbbb3;
 }
 
 #network.disconnected {
-  background-color: #e68183;
+  background-color: #f53c3c;
 }
 
 #pulseaudio {
@@ -179,8 +175,8 @@ label:focus {
 }
 
 #pulseaudio.muted {
-  background-color: #dbbc7f;
+  background-color: #90b1b1;
-  color: #4a555b;
+  color: #2a5c45;
 }
 
 #wireplumber {

dot_config/wleave/layout

@@ -1,6 +1,6 @@
 {
     "label" : "lock",
-    "action" : "waylock -fork-on-lock -init-color 0x000000",
+    "action" : "waylock",
     "text" : "Lock",
     "keybind" : "l"
 }

dot_local/bin/executable_swayidle-laptop

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# dim screen after 2 minutes, turn screen off after 10, suspend after an hour
-echo "---" | tee -a /tmp/swayidle-dim.log
-swayidle -w \
-  timeout 120 "light -O && light -S .1" \
-    resume "light -I" \
-  2>&1 | tee -a /tmp/swayidle-dim.log & disown
-
-echo "---" | tee -a /tmp/swayidle.log
-swayidle -w \
-  timeout 600 "wlr-randr --output eDP-1 --off" \
-  timeout 3600 "loginctl suspend" \
-    resume "wlr-randr --output eDP-1 --on" \
-  before-sleep "if ![[ pgrep -x waylock ]]; then waylock -fork-on-lock -init-color 0x000000; fi" \
-  2>&1 | tee -a /tmp/swayidle.log & disown
-

dot_local/bin/executable_toggle-wifi

@@ -1,8 +1,9 @@
 #!/bin/sh
+## A simple script to turn wifi on/off
 
-if [ $(connmanctl state | awk '/State/ {print $NF}') == 'online' ]; then
+if [ $(nmcli radio wifi | awk '/led/ {print}') = 'enabled'  ] ; then
-  connmanctl disable wifi
+  nmcli radio wifi off
 else
-  connmanctl enable wifi
+  nmcli radio wifi on
 fi
 

dot_local/bin/executable_waybar-launcher

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Terminate already running bar instances
-killall -q waybar
-
-# Wait until the processes have been shut down
-while pgrep -u $UID -x waybar >/dev/null; do sleep 1; done
-
-# Make sure pipewire-pulse is running or module won't load
-until pgrep -u $UID -x pipewire-pulse >/dev/null; do sleep 1; done
-
-# Launch Waybar
-echo "---" | tee -a /tmp/waybar.log
-waybar 2>&1 | tee -a /tmp/waybar.log & disown
-