diff options
| -rw-r--r-- | .bash_profile | 6 | ||||
| -rw-r--r-- | .config/foot/foot.ini | 2 | ||||
| -rw-r--r-- | .config/mango/config.conf | 39 | ||||
| -rw-r--r-- | .config/swaylock/config | 31 | ||||
| -rwxr-xr-x | scripts/graphical-startup | 6 | ||||
| -rwxr-xr-x | scripts/lock | 2 | ||||
| -rwxr-xr-x | scripts/lock_computer | 4 | ||||
| -rwxr-xr-x | scripts/sleep_computer | 5 | ||||
| -rwxr-xr-x | scripts/startup | 4 | ||||
| -rwxr-xr-x | scripts/sysinfo | 54 |
10 files changed, 103 insertions, 50 deletions
diff --git a/.bash_profile b/.bash_profile index f807124..ba43ca0 100644 --- a/.bash_profile +++ b/.bash_profile @@ -21,6 +21,12 @@ else chmod 0700 "${XDG_RUNTIME_DIR}" fi +# Create other XDG directories +export XDG_CACHE_HOME="${HOME}/.cache" +export XDG_CONFIG_HOME="${HOME}/.config" +export XDG_DATA_HOME="${HOME}/.local/share" +export XDG_STATE_HOME="${HOME}/.local/state" + # Auto-start wm on tty1 if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then exec mango diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index 9f6b2f6..19a55d0 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -8,7 +8,7 @@ # title=foot # locked-title=no -font=monospace:size=12 +font=ComicShannsMono:size=14 # font-bold=<bold variant of regular font> # font-italic=<italic variant of regular font> # font-bold-italic=<bold+italic variant of regular font> diff --git a/.config/mango/config.conf b/.config/mango/config.conf index 9d20b25..64cd298 100644 --- a/.config/mango/config.conf +++ b/.config/mango/config.conf @@ -1,4 +1,5 @@ -# More option see https://github.com/DreamMaoMao/mango/wiki/ +# Init +exec-once=graphical-startup # Window effect blur=0 @@ -30,7 +31,7 @@ unfocused_opacity=1.0 animations=1 layer_animations=1 animation_type_open=slide -animation_type_close=slide +animation_type_close=zoom animation_fade_in=1 animation_fade_out=1 tag_animation_direction=1 @@ -41,7 +42,7 @@ fadeout_begin_opacity=0.8 animation_duration_move=500 animation_duration_open=400 animation_duration_tag=350 -animation_duration_close=800 +animation_duration_close=300 animation_duration_focus=0 animation_curve_open=0.46,1.0,0.29,1 animation_curve_move=0.46,1.0,0.29,1 @@ -74,7 +75,7 @@ overviewgappi=5 overviewgappo=30 # Misc -no_border_when_single=1 +no_border_when_single=0 axis_bind_apply_timeout=100 focus_on_activate=1 idleinhibit_ignore_visible=0 @@ -119,8 +120,8 @@ scratchpad_width_ratio=0.8 scratchpad_height_ratio=0.9 borderpx=2 rootcolor=0x201b14ff -bordercolor=0x44444400 -focuscolor=0x444444ff +bordercolor=0x444444ff +focuscolor=0x656565ff maximizescreencolor=0x89aa61ff urgentcolor=0xad401fff scratchpadcolor=0x516c93ff @@ -146,10 +147,27 @@ tagrule=id:9,layout_name:tile # reload config bind=SUPER,r,reload_config -# menu and terminal and browser +# cool binds bind=SUPER,Return,spawn,swenu-run bind=SUPER,w,spawn,librewolf bind=SUPER,a,spawn,foot +bind=SUPER+CTRL,l,spawn,lock_computer +bind=SUPER+SHIFT+CTRL,l,spawn,sleep_computer +bind=SUPER,i,spawn,sysinfo + +# volume binds +bind=NONE,XF86AudioRaiseVolume,spawn,wpctl set-volume @DEFAULT_SINK@ 5%+ +bind=NONE,XF86AudioLowerVolume,spawn,wpctl set-volume @DEFAULT_SINK@ 5%- +bind=NONE,XF86AudioMute,spawn,wpctl set-mute @DEFAULT_SINK@ toggle +bind=SHIFT,XF86AudioMute,spawn,wpctl set-mute @DEFAULT_SOURCE@ toggle + +# brightness binds +# note: I have configured doas to allow brightnessctl. The udev rules didn't +# work for some reason +bindl=NONE,XF86MonBrightnessUp,spawn,doas brightnessctl s +5% +bindl=SHIFT,XF86MonBrightnessUp,spawn,doas brightnessctl s 100% +bindl=NONE,XF86MonBrightnessDown,spawn,doas brightnessctl s 5%- +bindl=SHIFT,XF86MonBrightnessDown,spawn,doas brightnessctl s 1% # exit bind=SUPER,m,quit @@ -175,7 +193,7 @@ bind=SUPER,v,togglefloating, bind=ALT,a,togglemaximizescreen, bind=SUPER,f,togglefullscreen, bind=ALT+SHIFT,f,togglefakefullscreen, -bind=SUPER,i,minimized, +#bind=SUPER,i,minimized, bind=SUPER,o,toggleoverlay, bind=SUPER+SHIFT,I,restore_minimized bind=ALT,z,toggle_scratchpad @@ -189,9 +207,7 @@ bind=SUPER,n,switch_layout # tag switch bind=SUPER,Left,viewtoleft,0 -bind=CTRL,Left,viewtoleft_have_client,0 bind=SUPER,Right,viewtoright,0 -bind=CTRL,Right,viewtoright_have_client,0 bind=CTRL+SUPER,Left,tagtoleft,0 bind=CTRL+SUPER,Right,tagtoright,0 @@ -244,15 +260,12 @@ bind=CTRL+ALT,Right,resizewin,+50,+0 # Mouse Button Bindings # btn_left and btn_right can't bind none mod key mousebind=SUPER,btn_left,moveresize,curmove -mousebind=NONE,btn_middle,togglemaximizescreen,0 mousebind=SUPER,btn_right,moveresize,curresize - # Axis Bindings axisbind=SUPER,UP,viewtoleft_have_client axisbind=SUPER,DOWN,viewtoright_have_client - # layer rule layerrule=animation_type_open:zoom,layer_name:rofi layerrule=animation_type_close:zoom,layer_name:rofi diff --git a/.config/swaylock/config b/.config/swaylock/config new file mode 100644 index 0000000..30d6cee --- /dev/null +++ b/.config/swaylock/config @@ -0,0 +1,31 @@ +color=000000ff + +inside-color=0000002a +inside-clear-color=0000002a +inside-caps-lock-color=0000002a +inside-ver-color=0000002a +inside-wrong-color=0000002a + +key-hl-color=ffffff +bs-hl-color=ffbaba +caps-lock-bs-hl-color=0000002a +caps-lock-key-hl-color=ffffb8 + +line-color=00000000 +line-clear-color=00000000 +line-caps-lock-color=00000000 +line-ver-color=00000000 +line-wrong-color=00000000 + +ring-color=ffffff2a +ring-clear-color=ffffb8 +ring-caps-lock-color=ffffb82a +ring-ver-color=ffffff2a +ring-wrong-color=ffbaba +separator-color=00000000 + +text-color=ffffff +text-clear-color=ffffb800 +text-caps-lock-color=ffffff6a +text-ver-color=00000000 +text-wrong-color=ffbaba00 diff --git a/scripts/graphical-startup b/scripts/graphical-startup new file mode 100755 index 0000000..877ca59 --- /dev/null +++ b/scripts/graphical-startup @@ -0,0 +1,6 @@ +#!/bin/sh +# pipewire & +dunst & +swaybg -i $HOME/dotfiles/files/wallpapers/mill.png & +swayidle timeout 300 sleep_computer & +# restartemacs >/dev/null & diff --git a/scripts/lock b/scripts/lock deleted file mode 100755 index efb238e..0000000 --- a/scripts/lock +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -swaylock -fc 000000 diff --git a/scripts/lock_computer b/scripts/lock_computer new file mode 100755 index 0000000..0abb3a2 --- /dev/null +++ b/scripts/lock_computer @@ -0,0 +1,4 @@ +#!/bin/sh +if not pgrep swaylock; then + swaylock +fi diff --git a/scripts/sleep_computer b/scripts/sleep_computer index 3dca0e3..5a62465 100755 --- a/scripts/sleep_computer +++ b/scripts/sleep_computer @@ -1,4 +1,3 @@ #!/bin/sh -echo "slept" >> $HOME/.sleeplog -lock -echo "mem" > /sys/power/state +echo "mem" | doas tee /sys/power/state +lock_computer diff --git a/scripts/startup b/scripts/startup deleted file mode 100755 index f09130e..0000000 --- a/scripts/startup +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -pipewire & -dunst & -restartemacs >/dev/null & diff --git a/scripts/sysinfo b/scripts/sysinfo index 8acc18d..5cb2d07 100755 --- a/scripts/sysinfo +++ b/scripts/sysinfo @@ -1,37 +1,37 @@ #!/bin/sh -get_network_info() { - device=$(ip a | grep "state UP" | awk -F': ' '{ printf($2) }') - case "${device}" in - wlan*) - network=$(iwctl station ${device} show | grep 'Connected network' \ - | awk -F' ' '{ printf($3) }') - echo "${device}: ${network}" - ;; - eth*) - echo "${device}: ${network}" - ;; - esac -} +get_message() { + # Date + echo "Date: $(date +"%a %b %d")" + echo "Time: $(date +"%I:%M:%S")" + + # Volume + echo "$(wpctl get-volume @DEFAULT_SINK@ | awk -F' ' '{ printf "%s %s%% %s", $1, ($2 * 100), $3; }')" -batperc=$(cat /sys/class/power_supply/BAT0/capacity) -batstate=$(cat /sys/class/power_supply/BAT0/status) -brightness=$(brightnessctl -m | cut -d, -f 4) -volume=$(wpctl get-volume @DEFAULT_SINK@ | awk -F' ' '{ printf "%s %s%% %s", $1, ($2 * 100), $3; }') -network=$(get_network_info) + # Brightness + echo "Brightness: $(brightnessctl -m | cut -d, -f 4)" + + # Battery + echo "$(cat /sys/class/power_supply/BAT0/status): $(cat /sys/class/power_supply/BAT0/capacity)%" + + # Network Info + net_device=$(ip a | grep "state UP" | awk -F': ' '{ printf($2) }') + case "${net_device}" in + wlan*) + connected_network=$(iwctl station ${net_device} show | grep 'Connected network' \ + | awk -F' ' '{ printf($3) }') + ;; + eth*) + ;; + esac + echo "${net_device}: ${connected_network}" +} -header="System Info:" -message="\ -Date: $(date +"%a %b %d") -Time: $(date "+%I:%M:%S") -${volume} -Brightness: ${brightness} -${batstate}: ${batperc}% -${network}" +message=$(get_message) if [ "$TERM" = "linux" ]; then - notify-send "$header" "$message" + notify-send "System Info" "$message" else echo "$message" fi |