diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 3e5f7b9..7b8af6c 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -84,7 +84,7 @@ scrolling: font: # Normal (roman) font face #normal: - family: "JetBrains Mono" + family: "Vulf Mono Code" # Font family # # Default: diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 332c572..3f72b90 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -12,11 +12,12 @@ alias git_current_branch="git branch | grep \* | cut -d ' ' -f2" alias ggpull='git pull origin (git_current_branch)' alias ggpush='git push origin (git_current_branch)' alias weather='curl wttr.in' - +alias fox='MOZ_ENABLE_WAYLAND=1 firefox-developer-edition' alias docker-composer='docker-compose' alias docker-start='systemctl start docker' alias docker-stop='systemctl stop docker' alias mux='tmuxinator' +alias rm='trash' function vpn-start sudo systemctl start openvpn-client@$argv @@ -36,7 +37,7 @@ end # my path export PATH="/home/joshfabean/.n/bin:/usr/local/bin/php:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/home/joshfabean/.cargo/bin:$PATH" -export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:/var/lib/flatpak/exports/bin:$PATH" npm set prefix ~/.npm export PATH="$HOME/.npm/bin:$PATH" diff --git a/.config/rofi/config b/.config/rofi/config index 1b44aef..39bbd00 100644 --- a/.config/rofi/config +++ b/.config/rofi/config @@ -17,5 +17,5 @@ rofi.bw: 0 rofi.terminal: alacritty rofi.glob: true rofi.tokenize: false -rofi.font: JetBrains Mono 12 +rofi.font: Vulf Mono Code 12 rofi.theme: ./flat-redux-green-window.rasi diff --git a/.config/sway/articuno-sway b/.config/sway/articuno-sway index 4b280c2..db25473 100644 --- a/.config/sway/articuno-sway +++ b/.config/sway/articuno-sway @@ -1,9 +1,10 @@ # Please see http://i3wm.org/docs/userguide.html for a complete reference! +#xwayland disable set $mod Mod4 set $alt Mod1 -font JetBrains Mono, FontAwesome 12 +font Vulf Mono, FontAwesome 12 bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbmap -option caps:escape @@ -11,7 +12,7 @@ bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbm floating_modifier $mod # start a terminal -bindsym $mod+Return exec --no-startup-id alacritty +bindsym $mod+Return exec --no-startup-id foot # kill focused window bindsym $mod+q kill @@ -19,18 +20,20 @@ bindsym $mod+q kill # lock screen bindsym $mod+$alt+s exec swaylock -exec swayidle -w \ - timeout 600 'swaylock' +#exec swayidle -w \ +# timeout 600 'swaylock' exec swayidle -w \ timeout 1200 'swaymsg "output * dpms off"'\ - resume 'swaymsg "output * dpms on"' -# before-sleep 'swaylock' + resume 'swaymsg "output * dpms on"' \ + before-sleep 'swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2' # start rofi (a program launcher) bindsym XF86LaunchA exec --no-startup-id rofi -show run bindcode 225 exec --no-startup-id rofi -show run bindsym $mod+space exec --no-startup-id rofi -show run - +for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 ppt 60 ppt, border pixel 10 +set $menu exec alacritty --class=launcher -e sway-launcher-desktop +#bindsym $mod+space exec $menu # change focus bindsym $mod+j focus left bindsym $mod+k focus down @@ -128,6 +131,24 @@ bindsym Print exec scrot -s -e 'mv $f ~/Downloads' bindsym $mod+m move scratchpad bindsym $mod+n scratchpad show bindsym $mod+Shift+s sticky toggle +bindsym $mod+Shift+alt+Control+s screenshot +bindsym alt+Shift+Control+s notify-send "test" + +# macros +bindsym Control+F4 exec /usr/local/bin/screenshot +bindsym Control+F5 exec /usr/bin/watson stop && exec notify-send "Clocked out!" +bindsym Control+F6 exec notify-send "F6" +bindsym Control+F7 exec notify-send "F7" +bindsym Control+F8 exec notify-send "F8" +bindsym Control+F9 exec notify-send "F9" +bindsym Control+F10 exec notify-send "F10" +bindsym Control+F11 exec notify-send "F11" +bindsym Control+F12 exec notify-send "F12" + +# screenshare +bindsym $mod+x exec dmenuscreenshare.sh + + #bindsym Control+k exec --no-startup-id echo "core.weechat */buffer_dmenu" >> $(find ~/.weechat -type p) # Notifications bindsym $mod+Control+Shift+space exec --no-startup-id makoctl dismiss -a @@ -136,6 +157,14 @@ bindsym $mod+Control+space exec --no-startup-id makoctl dismiss ######################### ## Floating Windows ######################### +for_window [window_role = "pop-up"] floating enable +for_window [window_role = "bubble"] floating enable +for_window [window_role = "dialog"] floating enable +for_window [window_type = "dialog"] floating enable +for_window [window_role = "task_dialog"] floating enable +for_window [window_type = "menu"] floating enable +for_window [app_id = "floating"] floating enable + for_window [class="Android SDK Manager" instance="Android SDK Manager"] floating enable for_window [class="Cb-exit" instance="cb-exit"] floating enable for_window [class="Cb-exit" instance="cb-exit"] border none @@ -147,22 +176,34 @@ for_window [class="Plexamp"] floating enable for_window [class="blueman-manager"] floating enable for_window [class="^Bluetooth Devices"] floating enable # https://github.com/ValveSoftware/steam-for-linux/issues/1040 -#for_window [class="^Steam$" title="^Friends$"] floating enable -#for_window [class="^Steam$" title="Steam - News"] floating enable -#for_window [class="^Steam$" title=".* - Chat"] floating enable -#for_window [class="^Steam$" title="^Settings$"] floating enable -#for_window [class="^Steam$" title=".* - event started"] floating enable -#for_window [class="^Steam$" title=".* CD key"] floating enable +for_window [class="^Steam$" title="^Friends$"] floating enable +for_window [class="^Steam$" title="Steam - News"] floating enable +for_window [class="^Steam$" title=".* - Chat"] floating enable +for_window [class="^Steam$" title="^Settings$"] floating enable +for_window [class="^Steam$" title=".* - event started"] floating enable +for_window [class="^Steam$" title=".* CD key"] floating enable for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable for_window [title="^Steam Keyboard$"] floating enable for_window [title="Qalculate!"] floating enable -#for_window [title="Steam"] floating enable for_window [title="Origin"] floating enable #for_window [title="Zoom"] floating enable #for_window [title="Zoom Cloud Meetings"] floating enable +# Zoom +for_window [app_id="zoom"] floating enable +for_window [app_id="zoom" title="Choose ONE of the audio conference options"] floating enable +for_window [app_id="zoom" title="zoom"] floating enable +for_window [app_id="zoom" title="Zoom Meeting"] floating disable +for_window [app_id="zoom" title="Zoom - Free Account"] floating disable + +# Tag xwayland windows with [X] +for_window [shell="xwayland"] title_format "[X] %title悜" + +for_window [app_id = "avizo-service"] border pixel 0, sticky toggle +no_focus [app_id="avizo-service"] + ########################### ## Assign Workspaces ########################## @@ -176,8 +217,8 @@ assign [class="Plexamp"] 3 default_border pixel 0 #Hide border if 1 window hide_edge_borders both -set $default_gaps_inner 5 -set $default_gaps_outer 5 +set $default_gaps_inner 15 +set $default_gaps_outer 15 gaps inner $default_gaps_inner gaps outer $default_gaps_outer smart_gaps on @@ -258,27 +299,35 @@ output HDMI-A-1 pos 0 0 res 3440x1440 output DP-1 pos 0 1440 res 3440x1440 # background images #output * bg ~/Pictures/Wallpapers/calvin-hobbes-stars.jpg fill -output * bg ~/Pictures/Wallpapers/scenic-view-of-forest-during-night-time-1252869.jpg fill +output * bg ~/Pictures/Wallpapers/phin-swing.jpg fill bindsym $mod+Shift+m exec --no-startup-id "sway output output DP-1 pos 2880 0 res 1920x1080 && sway ouput DP-2 res 1920x1080" ############################## ## Startup Things ############################## -exec --no-startup-id pcmanfm -d +#exec --no-startup-id pcmanfm -d #exec --no-startup-id xset r rate 250 25 #exec --no-startup-id xset b off #exec --no-startup-id setxkbmap -option caps:escape #exec --no-startup-id nightshift -l 39.0315533:-94.4954291 -d #exec --no-startup-id setxkbmap -model apple_laptop -layout us -variant dvp exec --no-startup-id mako +exec --no-startup-id blueman-applet exec autotiling +exec udiskie +exec wl-paste -t text --watch clipman store +exec avizo-service ############################# ## Media Keys ############################# -bindsym XF86AudioLowerVolume exec --no-startup-id "pulseaudio-ctl down ; pkill -RTMIN+1 i3blocks" -bindsym XF86AudioRaiseVolume exec --no-startup-id "pulseaudio-ctl up ; pkill -RTMIN+1 i3blocks" -bindsym XF86AudioMute exec --no-startup-id "pulseaudio-ctl mute ; pkill -RTMIN+1 i3blocks" +#bindsym XF86AudioLowerVolume exec --no-startup-id "pulseaudio-ctl down ; pkill -RTMIN+1 i3blocks" +#bindsym XF86AudioRaiseVolume exec --no-startup-id "pulseaudio-ctl up ; pkill -RTMIN+1 i3blocks" +#bindsym XF86AudioMute exec --no-startup-id "pulseaudio-ctl mute ; pkill -RTMIN+1 i3blocks" + +bindsym XF86AudioRaiseVolume exec volumectl raise +bindsym XF86AudioLowerVolume exec volumectl lower +bindsym XF86AudioMute exec volumectl mute # bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause # bindsym XF86AudioPause exec --no-startup-id playerctl play-pause # bindsym XF86AudioPlayPause exec --no-startup-id playerctl play-pause @@ -293,3 +342,9 @@ exec_always { gsettings set $gnome-schema icon-theme 'Flat-Remix-Green-Dark' } +# fix slow launch: exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK +exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK +exec hash dbus-update-activation-environment 2>/dev/null && \ + dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK + +include /etc/sway/config.d/* diff --git a/.config/tmuxinator/daily.yml b/.config/tmuxinator/daily.yml index 984962c..3e1e2fd 100644 --- a/.config/tmuxinator/daily.yml +++ b/.config/tmuxinator/daily.yml @@ -49,6 +49,5 @@ windows: layout: main-vertical panes: - aerc - - tuijam - Servers: - Console: diff --git a/.config/waybar/config b/.config/waybar/config index 825e9af..fbc6267 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -17,7 +17,7 @@ "custom/calc", "idle_inhibitor", "pulseaudio", - "network", + // "network", "cpu", "memory", "custom/temperature",