vimrc with ale

wpg templates

18 files changed, 236 insertions, 639 deletions

diff --git a/.Xresources b/.Xresources
index 53c2779..a8dc5ef 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,102 +1 @@
-!! DPI
 Xft.dpi: 96
-
-!! drop in Solarized colorscheme for Xresources/Xdefaults
-
-!!SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
-!!--------- ------- ---- -------  ----------- ---------- ----------- -----------
-!!base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-!!base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-!!base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
-!!base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
-!!base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-!!base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-!!base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
-!!base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-!!yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-!!orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-!!red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-!!magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-!!violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-!!blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-!!cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-!!green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
-
-#define S_base03        #002b36
-#define S_base02        #073642
-#define S_base01        #586e75
-#define S_base00        #657b83
-#define S_base0         #839496
-#define S_base1         #93a1a1
-#define S_base2         #eee8d5
-#define S_base3         #fdf6e3
-#define S_yellow        #b58900
-#define S_orange        #cb4b16
-#define S_red           #dc322f
-#define S_magenta       #d33682
-#define S_violet        #6c71c4
-#define S_blue          #268bd2
-#define S_cyan          #2aa198
-#define S_green         #859900
-
-*background:            S_base03
-*foreground:            S_base00
-*fading:                40
-*fadeColor:             S_base03
-*cursorColor:           S_base1
-*pointerColorBackground:S_base01
-*pointerColorForeground:S_base1
-
-!! black dark/light
-*color0:                S_base02
-*color8:                S_base03
-
-!! red dark/light
-*color1:                S_red
-*color9:                S_orange
-
-!! green dark/light
-*color2:                S_green
-*color10:               S_base01
-
-!! yellow dark/light
-*color3:                S_yellow
-*color11:               S_base00
-
-!! blue dark/light
-*color4:                S_blue
-*color12:               S_base0
-
-!! magenta dark/light
-*color5:                S_magenta
-*color13:               S_violet
-
-!! cyan dark/light
-*color6:                S_cyan
-*color14:               S_base1
-
-!! white dark/light
-*color7:                S_base2
-*color15:               S_base3
-
-!! URxvt
-URxvt.font:				xft:monospace:size=13
-URxvt.letterSpace:		0
-URxvt.lineSpace:		0
-URxvt.scrollBar:		false
-URxvt.urgentOnBell:		true
-URxvt.skipBuiltinGlyphs: true
-URxvt.cursorBlink:		true
-URxvt.pointerBlank:		true
-!!URxvt.url-launcher	url_handler.sh
-URxvt.jumpScroll:		true
-!URxvt.clipboard.autocopy: true
-
-! Disable ISO 14755 unicode input so we can use Ctrl-Shift bindings
-URxvt.iso14755:        false
-URxvt.iso14755_52:     false
-
-! Bind Ctrl-Shift-c & Ctrl-Shift-v to copy and paste
-! I dont know why, but I needed to use hex keysym values to get it to work
-URxvt.keysym.C-S-0x43: eval:selection_to_clipboard
-URxvt.keysym.C-S-0x56: eval:paste_clipboard
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 248daee..1005783 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -9,31 +9,31 @@ font:
   size: 13
 colors:
   primary:
-    background: '#060A06'
-    foreground: '#faffff'
+    background: '#0f0f10'
+    foreground: '#fffffa'
   normal:
-    black:   '#060A06'
-    red:     '#876E5A'
-    green:   '#6F8A41'
-    yellow:  '#919962'
-    blue:    '#587291'
-    magenta: '#9EA09F'
-    cyan:    '#728AA5'
-    white:   '#d1d5d9'
+    black:   '#0f0f10'
+    red:     '#8F6B55'
+    green:   '#957362'
+    yellow:  '#CC9470'
+    blue:    '#A78A70'
+    magenta: '#A39991'
+    cyan:    '#CEAC91'
+    white:   '#dcd8d4'
   bright:
-    black:   '#172a17'
-    red:     '#be8d66'
-    green:   '#93c047'
-    yellow:  '#c8d76f'
-    blue:    '#6392cb'
-    magenta: '#b8e4ce'
-    cyan:    '#82b2e8'
-    white:   '#faffff'
+    black:   '#272729'
+    red:     '#c8875f'
+    green:   '#d1906f'
+    yellow:  '#ffbb7d'
+    blue:    '#ebb27f'
+    magenta: '#e7c4a8'
+    cyan:    '#ffdca5'
+    white:   '#fffffa'
 cursor:
   style: Block
   unfocused_hollow: true
-  text: '#060A06'
-  cursor: '#d1d5d9'
+  text: '#0f0f10'
+  cursor: '#dcd8d4'
 live_config_reload: true
 mouse:
   hide_when_typing: false
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 7ff37c2..4d0eb3d 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,6 +1,6 @@
-@theme "solarized"
+@theme "wpg"
 configuration {
-	modi: "combi,filebrowser";
+	modi: "combi,filebrowser,emoji";
 /*	font: "mono 12";*/
 /*	location: 0;*/
 /*	yoffset: 0;*/
diff --git a/.config/rofi/solarized.rasi b/.config/rofi/solarized.rasi
deleted file mode 100644
index 9107fa9..0000000
--- a/.config/rofi/solarized.rasi
+++ /dev/null
@@ -1,145 +0,0 @@
-/******************************************************************************
- * ROFI Color theme
- * User: Rasi
- * Copyright: Rasmus Steinke
- ******************************************************************************/
-* {
-    selected-normal-foreground:  rgba ( 129, 147, 150, 100 % );
-    foreground:                  rgba ( 129, 147, 150, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 0, 43, 55, 100 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 218, 66, 129, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 218, 66, 129, 100 % );
-    alternate-urgent-background: rgba ( 0, 43, 55, 100 % );
-    active-foreground:           rgba ( 0, 142, 212, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 0, 142, 212, 100 % );
-    alternate-active-background: rgba ( 0, 43, 55, 100 % );
-    background:                  rgba ( 0, 43, 55, 100 % );
-    bordercolor:                 rgba ( 0, 43, 55, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 0, 43, 55, 100 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 0, 54, 66, 100 % );
-    border-color:                @foreground;
-    spacing:                     2;
-    separatorcolor:              rgba ( 0, 54, 66, 100 % );
-    urgent-background:           rgba ( 0, 43, 55, 100 % );
-    selected-urgent-background:  rgba ( 0, 54, 66, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 0, 43, 55, 100 % );
-    selected-active-background:  rgba ( 0, 54, 66, 100 % );
-}
-window {
-    background-color: @background;
-    border:           1;
-    padding:          5;
-}
-mainbox {
-    border:  0;
-    padding: 0;
-}
-message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
-}
-textbox {
-    text-color: @foreground;
-}
-listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
-}
-element {
-    border:  0;
-    padding: 1px ;
-}
-element-text {
-    background-color: inherit;
-    text-color:       inherit;
-}
-element.normal.normal {
-    background-color: @normal-background;
-    text-color:       @normal-foreground;
-}
-element.normal.urgent {
-    background-color: @urgent-background;
-    text-color:       @urgent-foreground;
-}
-element.normal.active {
-    background-color: @active-background;
-    text-color:       @active-foreground;
-}
-element.selected.normal {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-element.selected.urgent {
-    background-color: @selected-urgent-background;
-    text-color:       @selected-urgent-foreground;
-}
-element.selected.active {
-    background-color: @selected-active-background;
-    text-color:       @selected-active-foreground;
-}
-element.alternate.normal {
-    background-color: @alternate-normal-background;
-    text-color:       @alternate-normal-foreground;
-}
-element.alternate.urgent {
-    background-color: @alternate-urgent-background;
-    text-color:       @alternate-urgent-foreground;
-}
-element.alternate.active {
-    background-color: @alternate-active-background;
-    text-color:       @alternate-active-foreground;
-}
-scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-width: 8px ;
-    padding:      0;
-}
-mode-switcher {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-}
-button.selected {
-    background-color: @selected-normal-background;
-    text-color:       @selected-normal-foreground;
-}
-inputbar {
-    spacing:    0;
-    text-color: @normal-foreground;
-    padding:    1px ;
-}
-case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-entry {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
-}
-inputbar {
-    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
-}
-textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3em 0em 0em ;
-    text-color: @normal-foreground;
-}
diff --git a/.config/sway/config b/.config/sway/config
index 072cd8e..a2f4b96 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -2,16 +2,14 @@
 
 ### Output configuration
 output eDP-1 {
-	background ~/pictures/wallpapers/hudson-wall-edit.jpg fill
 	resolution 1920x1080
 }
 
 output DP-3 {
-	background ~/pictures/wallpapers/hudson-wall-edit.jpg fill
 	resolution 2560x1440
 }
 
-## GENERAL 
+## GENERAL
 
 font pango:sans-serif 13
 set $term alacritty
@@ -102,10 +100,10 @@ bindsym Mod1+shift+$right move right
 bindsym Mod1+shift+$up move up
 
 # resize
-bindsym Mod1+i 				resize grow height 
-bindsym Mod1+o 				resize grow width 
-bindsym Mod1+u 				resize shrink height 
-bindsym Mod1+y				resize shrink width 
+bindsym Mod1+i 				resize grow height
+bindsym Mod1+o 				resize grow width
+bindsym Mod1+u 				resize shrink height
+bindsym Mod1+y				resize shrink width
 
 ## LAYOUT
 
@@ -124,6 +122,8 @@ bindsym Mod1+shift+c			reload
 
 bindsym Mod1+Return 			split horizontal; exec $term
 bindsym Mod1+shift+Return		split vertical; exec $term
+bindsym Mod1+control+Return		split horizontal; exec $term -e mosh dev.53hor.net
+bindsym Mod1+control+shift+Return		split vertical; exec $term -e mosh dev.53hor.net
 #bindsym Mod4+p					exec arandr
 #bindsym Mod4+l					exec xautolock -locknow
 bindsym Mod1+F1					exec rofi -show combi
@@ -145,19 +145,18 @@ bindsym XF86AudioLowerVolume	exec mixer vol -5 && $sigaudio
 bindsym XF86AudioRaiseVolume 	exec mixer vol +5 && $sigaudio
 bindsym XF86AudioMute			exec mixer vol 0 && $sigaudio
 bindsym --release Print			exec grim
-bindsym Mod1+Pause				exec swaylock --image ~/pictures/wallpapers/hudson-wall-edit.jpg ; exec doas acpiconf -s3
+bindsym Mod1+Pause				exec swaylock ; exec doas acpiconf -s3
 
 ## COLORS
 
-# class border background foreground
-client.focused #A2E5C6 #A2E5C6 #000000
-client.focused_inactive #1C433F #3F938D #ffffff
-client.unfocused #1C433F #3F938D #ffffff
+# class border background text
+client.focused #dcd8d4 #dcd8d4 #272729
+client.unfocused #8F6B55 #8F6B55 #dcd8d4
 
 ## BARS
 
 bar {
-	swaybar_command waybar 
+	swaybar_command waybar
 }
 
 ## MODES
@@ -181,8 +180,9 @@ mode $mode_modes {
 ## ASSIGNMENTS
 
 assign [class="Firefox"] $ws1
-for_window [class="Thunderbird"] floating enable
+for_window [title="Reminders*"] floating enable
 for_window [class="pwcview"] floating enable ; sticky enable
 for_window [title="wpgtk*"] floating enable
 
-include /usr/local/etc/sway/config.d/*
+## STARTUP
+exec_always sh /usr/home/atc/.config/wpg/wp-init.sh
diff --git a/.config/wpg/.current b/.config/wpg/.current
index 1af3210..2b1d35c 120000
--- a/.config/wpg/.current
+++ b/.config/wpg/.current
@@ -1 +1 @@
-/home/atc/.config/wpg/wallpapers/1aeee27d230bb230e49dbea0df799a71f96480a284753c233375da776f44ca3f.jpg
\ No newline at end of file
+/home/atc/.config/wpg/wallpapers/amy-clem-burg.jpg
\ No newline at end of file
diff --git a/.config/wpg/sequences b/.config/wpg/sequences
index 8f773ed..9d082e2 100644
--- a/.config/wpg/sequences
+++ b/.config/wpg/sequences
@@ -1 +1 @@
-]4;0;#0c0c0d\]4;1;#935944\]4;2;#6E5449\]4;3;#B78F71\]4;4;#827F7C\]4;5;#AB9F92\]4;6;#946755\]4;7;#ddd0c2\]4;8;#232327\]4;9;#cd6d4a\]4;10;#9a6853\]4;11;#ffb77f\]4;12;#b9a590\]4;13;#f2cfa9\]4;14;#cf7f5f\]4;15;#ffffee\]10;#ffffee\]11;[90]#0c0c0d\]12;#ffffee\]13;#ffffee\]17;#ffffee\]19;#0c0c0d\]4;232;#0c0c0d\]4;256;#ffffee\]708;[90]#0c0c0d\
\ No newline at end of file
+]4;0;#0f0f10\]4;1;#8F6B55\]4;2;#957362\]4;3;#CC9470\]4;4;#A78A70\]4;5;#A39991\]4;6;#CEAC91\]4;7;#dcd8d4\]4;8;#272729\]4;9;#c8875f\]4;10;#d1906f\]4;11;#ffbb7d\]4;12;#ebb27f\]4;13;#e7c4a8\]4;14;#ffdca5\]4;15;#fffffa\]10;#fffffa\]11;#0f0f10\]12;#fffffa\]13;#fffffa\]17;#fffffa\]19;#0f0f10\]4;232;#0f0f10\]4;256;#fffffa\]708;#0f0f10\
\ No newline at end of file
diff --git a/.config/wpg/templates/dunstrc b/.config/wpg/templates/dunstrc
deleted file mode 120000
index d346c86..0000000
--- a/.config/wpg/templates/dunstrc
+++ /dev/null
@@ -1 +0,0 @@
-/home/atc/.config/dunst/dunstrc
\ No newline at end of file
diff --git a/.config/wpg/templates/dunstrc.base b/.config/wpg/templates/dunstrc.base
deleted file mode 100644
index ce7e684..0000000
--- a/.config/wpg/templates/dunstrc.base
+++ /dev/null
@@ -1,92 +0,0 @@
-[colors]
-	background = "{color8}"
-	foreground = "{color15}"
-
-[global]
-    ### Display ###
-
-    monitor = 0
-    follow = mouse
-
-    geometry = "540x5-10+32"
-    indicate_hidden = yes
-    shrink = yes
-    transparency = 0
-    notification_height = 0
-    separator_height = 3
-    padding = 12
-    horizontal_padding = 12
-    frame_width = 3
-
-    frame_color = "{active}"
-    separator_color = auto
-    sort = yes
-    idle_threshold = 120
-
-    ### Text ###
-    font = sans-serif 12
-    line_height = 0
-
-    markup = full
-
-    # The format of the message.  Possible variables are:
-    #   %a  appname
-    #   %s  summary
-    #   %b  body
-    #   %i  iconname (including its path)
-    #   %I  iconname (without its path)
-    #   %p  progress value if set ([  0%] to [100%]) or nothing
-    #   %n  progress value if set without any extra characters
-    #   %%  Literal %
-    # Markup is allowed
-    format = "<b>%s </b>\n%b"
-    alignment = left
-    show_age_threshold = 60
-    word_wrap = yes
-    ellipsize = middle
-    ignore_newline = no
-    stack_duplicates = true
-    hide_duplicate_count = false
-    show_indicators = yes
-
-    ### Icons ###
-    icon_position = left
-    max_icon_size = 64
-    icon_path = .icons/flattrcolor/status/24:.icons/flattrcolor/devices/48:.icons/flattrcolor/apps/scalable:.icons/flattrcolor/actions/scalable
-
-    ### History ###
-    sticky_history = yes
-    history_length = 20
-
-    ### Misc/Advanced ###
-    dmenu = /usr/bin/rofi -show run -p dunst:
-    browser = /usr/bin/google-chrome-stable
-    always_run_script = true
-    title = Dunst
-    class = Dunst
-    startup_notification = false
-    force_xinerama = false
-
-[experimental]
-    per_monitor_dpi = false
-
-[shortcuts]
-    close = ctrl+space
-    close_all = ctrl+shift+space
-    context = ctrl+shift+period
-
-[urgency_low]
-    background = colors.background
-    foreground = colors.foreground
-    timeout = 10
-
-[urgency_normal]
-    background = colors.background
-    foreground = colors.foreground
-    timeout = 10
-
-[urgency_critical]
-    background = colors.background
-    foreground = colors.foreground
-    frame_color = "{color9}"
-    timeout = 0
diff --git a/.config/wpg/templates/i3 b/.config/wpg/templates/i3
deleted file mode 120000
index 66954d9..0000000
--- a/.config/wpg/templates/i3
+++ /dev/null
@@ -1 +0,0 @@
-/home/atc/.config/i3/config
\ No newline at end of file
diff --git a/.config/wpg/templates/i3.base b/.config/wpg/templates/i3.base
deleted file mode 100644
index 179c66a..0000000
--- a/.config/wpg/templates/i3.base
+++ /dev/null
@@ -1,224 +0,0 @@
-## i3 config file (v4)
-##
-## Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
-## GENERAL
-default_border pixel 2
-default_floating_border pixel 2
-font pango:sans-serif 13
-force_display_urgency_hint 500 ms
-hide_edge_borders smart
-set $locker xautolock -locknow
-set $mod Mod1
-set $sigaudio pkill -75 i3blocks
-title_align center
-workspace_auto_back_and_forth yes
-
-## WORKSPACES
-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 $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-bindsym $mod+Tab workspace back_and_forth
-
-# move focused container to workspace
-bindsym $mod+shift+1 move container to workspace $ws1
-bindsym $mod+shift+2 move container to workspace $ws2
-bindsym $mod+shift+3 move container to workspace $ws3
-bindsym $mod+shift+4 move container to workspace $ws4
-bindsym $mod+shift+5 move container to workspace $ws5
-bindsym $mod+shift+6 move container to workspace $ws6
-bindsym $mod+shift+7 move container to workspace $ws7
-bindsym $mod+shift+8 move container to workspace $ws8
-bindsym $mod+shift+9 move container to workspace $ws9
-bindsym $mod+shift+0 move container to workspace $ws10
-
-## COLORS
-# base colors -- set by WPG
-set $coloract "{active}"
-set $colorin "{inactive}"
-set_from_resource $color0 i3wm.color0 "{color0}"
-set_from_resource $color15 i3wm.color15 "{color15}"
-set_from_resource $color8 i3wm.color8 "{color8}"
-set_from_resource $coloru i3wm.color2 "{color2}"
-set_from_resource $split i3wm.color10 "{color10}"
-
-# class                 border    backgr    text    indicator child_border
-client.background       $color0
-client.focused          $coloract $coloract $color15 $split  $coloract
-client.focused_inactive $coloract $coloract $color15 $split  $colorin
-client.placeholder      $color0   $color8   $color15 $color0 $color8
-client.unfocused        $colorin  $colorin  $color15 $split  $colorin
-client.urgent           $coloru   $coloru   $color15 $coloru $coloru
-
-## WINDOW CONTROL
-# movement
-floating_modifier $mod
-set $down j
-set $left h
-set $right l
-set $up k
-
-# change focus
-bindsym $mod+$down focus down
-bindsym $mod+$left focus left
-bindsym $mod+$right focus right
-bindsym $mod+$up focus up
-
-# move focused window
-bindsym $mod+shift+$down move down
-bindsym $mod+shift+$left move left
-bindsym $mod+shift+$right move right
-bindsym $mod+shift+$up move up
-
-# resize
-bindsym $mod+i 				resize grow height 100 or 10
-bindsym $mod+o 				resize grow width 100 or 10
-bindsym $mod+u 				resize shrink height 100 or 10
-bindsym $mod+y				resize shrink width 100 or 10
-
-## LAYOUT
-# split direction
-bindsym $mod+q split toggle
-
-# fullscreen mode
-bindsym $mod+f fullscreen toggle
-
-# container layout
-bindsym $mod+shift+w layout toggle tabbed stacking
-bindsym $mod+shift+e layout toggle split
-
-# toggle tiling / floating / sticky
-bindsym $mod+shift+space floating toggle
-bindsym $mod+s sticky toggle
-bindsym $mod+shift+s floating toggle; sticky toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-## SHORTCUTS
-bindsym $mod+shift+F1			exec firefox /usr/local/share/doc/freebsd/handbook/book.html
-bindsym $mod+F2					exec firefox
-bindsym $mod+shift+F2			exec firefox --private-window
-bindsym $mod+F3 				exec url_handler.sh 
-bindsym $mod+F4 				exec alacritty -e zsh -i -c 'OLDPWD="$PWD" && cd ~/downloads/ && mutt && cd "$OLDPWD"' && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
-bindsym $mod+shift+F4 			exec mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
-bindsym $mod+F5 				exec alacritty -e zsh -i -c 'newsboat && pkill -78 i3blocks'
-bindsym $mod+F6 				exec --no-startup-id dict.sh
-#bindsym $mod+F7 				exec 
-#bindsym $mod+F8 				exec "killall pwcview || exec pwcview -f 30 -s sif"
-#bindsym $mod+shift+F8			exec --no-startup-id toggle-screencast.sh
-#bindsym $mod+F9					exec --no-startup-id abraham-porter.sh
-#bindsym $mod+shift+F9			exec --no-startup-id "killall picom || exec picom"
-#bindsym $mod+F10				exec xautolock -toggle
-#bindsym $mod+F11				exec dockd.sh dock
-#bindsym $mod+shift+F11			exec dockd.sh undock
-#bindsym $mod+shift+F12			exec alacritty -e zsh -i -c mixertui && pkill -75 i3blocks
-bindsym $mod+Return 			split horizontal; exec alacritty
-bindsym $mod+shift+Return		split vertical; exec alacritty
-bindsym $mod+shift+Insert		exec $locker
-bindsym $mod+a					exec rofi -show run
-bindsym $mod+shift+q			kill
-bindsym --release Print			exec import -window root ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
-bindsym --release shift+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
-bindsym --release $mod+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
-bindsym Mod4+p					exec nvidia-settings
-bindsym $mod+F10				exec --no-startup-id mixer vol 0 && $sigaudio
-bindsym $mod+F11				exec --no-startup-id mixer vol -5 && $sigaudio
-bindsym $mod+F12				exec --no-startup-id mixer vol +5 && $sigaudio
-bindsym XF86AudioLowerVolume	exec --no-startup-id mixer vol -5 && $sigaudio
-bindsym XF86AudioMute			exec --no-startup-id mixer vol 0 && $sigaudio
-bindsym XF86AudioRaiseVolume 	exec --no-startup-id mixer vol +5 && $sigaudio
-
-# scratchpad terminal
-bindsym $mod+shift+p move scratchpad
-bindsym $mod+p scratchpad show
-
-# 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
-
-set $mode_system 󰌾l  󰩈e  󰤄s  󰤁r  󰤂shift+s
-mode "$mode_system" {{
-	bindsym e exit
-	bindsym l exec --no-startup-id $locker, mode "default"
-	bindsym s exec --no-startup-id $locker ; exec --no-startup-id sleep 2 && doas acpiconf -s3, mode "default"
-	bindsym r exec doas reboot
-	bindsym shift+s exec doas poweroff
-	bindsym Return mode "default"
-	bindsym q mode "default"
-	bindsym Escape mode "default"
-}}
-
-set $mode_volume 󰝞j 󰝝k 󰸈m
-mode "$mode_volume" {{
-	bindsym j	exec mixer vol -5 && $sigaudio 
-	bindsym m	exec mixer vol 0 && $sigaudio
-	bindsym k 	exec mixer vol +5 && $sigaudio
-	bindsym Return mode "default"
-	bindsym q mode "default"
-	bindsym Escape mode "default"
-}}
-
-set $mode_help 󱊫Help/Handbook 󱊬Browser 󱊭Files 󱊮Email 󱊯News 󱊰YouTube 󱊱Dictionary 󱊲Dock/Compositor 󱊳Ports 󱊴Webcam/Screencast 󱊵AutoLock-Toggle 󱊶Mixer
-mode "$mode_help" {{
-	bindsym Return mode "default"
-	bindsym q mode "default"
-	bindsym Escape mode "default"
-}}
-
-bindsym $mod+Insert mode "$mode_system"
-#bindsym $mod+F1 mode "$mode_help"
-#bindsym $mod+F12 mode "$mode_volume"
-
-## BARS
-bar {{
-	modifier Mod1
-	strip_workspace_numbers yes
-	position bottom
-	status_command i3blocks 2>/var/log/xinit/i3blocks.log
-
-	colors {{
-		background $color8
-		statusline $color15
-		separator $colorin
-		# class border background foreground
-		focused_workspace $color15 $coloract $color15
-		active_workspace $color15 $coloract $color15
-		inactive_workspace $split $colorin $color15
-		urgent_workspace $coloru $coloru $color15
-	}}
-}}
-
-## DEFAULT PLACEMENT
-for_window [class = "Wpg"] floating enable
-for_window [title = "x64"] floating enable
-for_window [title = "Streaming from YouTube"] floating enable; sticky enable
-for_window [title = "pwcview"] border pixel 1; floating enable; sticky enable; move position 1598px 808px
-#for_window [title = "sxiv"] floating enable
-
-## STARTUP
-#exec --no-startup-id picom
-exec --no-startup-id dunst
-#exec --no-startup-id ~/.local/scripts/dockd.sh 
-exec firefox
-#exec nextcloud
diff --git a/.config/wpg/templates/rofi b/.config/wpg/templates/rofi
index 596369b..0c0c6ce 120000
--- a/.config/wpg/templates/rofi
+++ b/.config/wpg/templates/rofi
@@ -1 +1 @@
-/home/atc/.config/rofi/config
\ No newline at end of file
+/home/atc/.config/rofi/wpg.rasi
\ No newline at end of file
diff --git a/.config/wpg/templates/rofi.base b/.config/wpg/templates/rofi.base
index 74b3d09..97275f4 100644
--- a/.config/wpg/templates/rofi.base
+++ b/.config/wpg/templates/rofi.base
@@ -1,27 +1,180 @@
-rofi.modi:                           run,window,ssh
-rofi.width:                          25
-rofi.lines:                          25
-rofi.columns:                        1
-rofi.font:                           Iosevka Etoile 14
-rofi.color-normal:                   {color0}, {color15}, {color0}, {active}, {color15}
-rofi.color-urgent:                   {color0}, #d6b48d, #22231D, #d6b48d, {color15}
-rofi.color-active:                   {color0}, {color14}, {color0}, {color14}, {color0}
-rofi.color-window:                   {color0}, {active}, {inactive}
-rofi.bw:                             5
-rofi.location:                       0
-rofi.padding:                        5
-rofi.yoffset:                        0
-rofi.xoffset:                        0
-rofi.fixed-num-lines:                true
-rofi.terminal:                       rofi-sensible-terminal
-rofi.ssh-client:                     ssh
-rofi.ssh-command:                    {{terminal}} -e {{ssh-client}} {{host}}
-rofi.run-command:                    {{cmd}}
-rofi.parse-hosts:                    true
-rofi.matching:                       normal
-rofi.separator-style:                none
-rofi.scrollbar-width:                0
-rofi.kb-mode-next:                   Shift+Right,Control+Tab,Alt+l
-rofi.kb-mode-previous:               Shift+Left,Control+Shift+Tab,Alt+h
-rofi.kb-row-up:                      Up,Control+p,Shift+Tab,Shift+ISO_Left_Tab,Alt+k
-rofi.kb-row-down:                    Down,Control+n,Alt+j
+/*-*- mode: css; -*-*/
+
+* {{
+    color0:		{color0};
+    color1:		{color1};
+    color2:		{color2};
+    color3:		{color3};
+    color4:		{color4};
+    color5:		{color5};
+    color6:		{color6};
+    color7:		{color7};
+    color8:		{color8};
+    color9:		{color9};
+    color10:	{color10};
+    color11:	{color11};
+    color12:	{color12};
+    color13:	{color13};
+    color14:	{color14};
+    color15:	{color15};
+    active:		{active};
+    inactive:	{inactive};
+
+	background:						@color0;
+    foreground:						@color15;
+
+    background-color:				@background;
+    border-color:					@background;
+    separatorcolor:					@color8;
+    scrollbar-handle:				@color9;
+
+    normal-background:				@background;
+    normal-foreground:				@foreground;
+    alternate-normal-background:	@background;
+    alternate-normal-foreground:	@foreground;
+    selected-normal-background:		@active;
+    selected-normal-foreground:		@foreground;
+
+    active-background:				@inactive;
+    active-foreground:				@foreground;
+    alternate-active-background:	@active;
+    alternate-active-foreground:	@foreground;
+    selected-active-background:		@active;
+    selected-active-foreground:		@foreground;
+
+    urgent-background:				@color8;
+    urgent-foreground:				@color15;
+    alternate-urgent-background:	@color8;
+    alternate-urgent-foreground:	@color15;
+    selected-urgent-background:		@color14;
+    selected-urgent-foreground:		@foreground;
+}}
+
+
+window {{
+    background-color: @background;
+	border-color: @active;
+    border:           5;
+    padding:          0;
+}}
+
+mainbox {{
+    border:  0px;
+	border-color: @active;
+    padding: 0;
+}}
+
+message {{
+    border:       2px 0 0;
+    border-color: @separatorcolor;
+    padding:      1px;
+}}
+
+textbox {{
+    highlight:  @highlight;
+    text-color: @color15;
+}}
+
+listview {{
+    border:       2px solid 0 0;
+    padding:      2px 0 0;
+    border-color: @separatorcolor;
+    spacing:      0px;
+    scrollbar:    @scrollbar;
+}}
+
+element {{
+    border:  0;
+    padding: 3px;
+}}
+
+element.normal.normal {{
+    background-color: @normal-background;
+    text-color:       @normal-foreground;
+}}
+
+element.normal.urgent {{
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
+}}
+
+element.normal.active {{
+    background-color: @active-background;
+    text-color:       @active-foreground;
+}}
+
+element.selected.normal {{
+    background-color: @active;
+    text-color:       @color15;
+}}
+
+element.selected.urgent {{
+    background-color: @selected-urgent-background;
+    text-color:       @selected-urgent-foreground;
+}}
+
+element.selected.active {{
+    background-color: @selected-active-background;
+    text-color:       @selected-active-foreground;
+}}
+
+element.alternate.normal {{
+    background-color: @alternate-normal-background;
+    text-color:       @alternate-normal-foreground;
+}}
+
+element.alternate.urgent {{
+    background-color: @alternate-urgent-background;
+    text-color:       @alternate-urgent-foreground;
+}}
+
+element.alternate.active {{
+    background-color: @alternate-active-background;
+    text-color:       @alternate-active-foreground;
+}}
+
+scrollbar {{
+    width:        4px;
+    border:       0;
+    handle-color: @scrollbar-handle;
+    handle-width: 8px;
+    padding:      0;
+}}
+
+sidebar {{
+    border:       2px 0 0;
+    border-color: @separatorcolor;
+}}
+
+inputbar {{
+    spacing:    1;
+    text-color: @normal-foreground;
+    padding:    5px;
+    children:   [ prompt, textbox-prompt-sep, entry, case-indicator ];
+}}
+
+case-indicator,
+entry,
+prompt,
+button {{
+    spacing:    0;
+    text-color: @normal-foreground;
+}}
+
+button.selected {{
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}}
+
+textbox-prompt-sep {{
+    expand:     false;
+    str:        ":";
+    text-color: @normal-foreground;
+    margin:     0 0.3em 0 0;
+}}
+
+element-text, element-icon {{
+	text-color: @foreground;
+	background-color: transparent;
+}}
+
diff --git a/.config/wpg/wp_init.sh b/.config/wpg/wp_init.sh
index 0e90526..7051479 100755
--- a/.config/wpg/wp_init.sh
+++ b/.config/wpg/wp_init.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-wpg -rs '1aeee27d230bb230e49dbea0df799a71f96480a284753c233375da776f44ca3f.jpg' '1aeee27d230bb230e49dbea0df799a71f96480a284753c233375da776f44ca3f.jpg'
\ No newline at end of file
+wpg -rs 'amy-clem-burg.jpg' 'amy-clem-burg.jpg'
\ No newline at end of file
diff --git a/.config/wpg/wpg.conf b/.config/wpg/wpg.conf
index 0731a82..9d383f2 100644
--- a/.config/wpg/wpg.conf
+++ b/.config/wpg/wpg.conf
@@ -1,16 +1,17 @@
 [settings]
 set_wallpaper = true
 gtk = true
-active = 12
+active = 0
 light_theme = false
-editor = alacritty -e vim
-execute_cmd = false
-command = urxvt -e echo hi
+editor = vim
+execute_cmd = true
+command = magick ~/.config/wpg/.current -blur 0x8 ~/.config/wpg/.current-lock
 backend = wal
-alpha = 90
+alpha = 100
 smart_sort = true
 auto_adjust = true
 reload = true
+keywords = default
 
 [keywords]
 
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index fbf0a34..c0abba3 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -32,3 +32,4 @@ Nextcloud
 Squarespace
 carpentertutoring
 Quickstart
+Whitespace
diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index 20f309d..ac78f0b 100644
--- a/.vim/spell/en.utf-8.add.spl
+++ b/.vim/spell/en.utf-8.add.spl
diff --git a/.vimrc b/.vimrc
index bb12ac0..b84dcbe 100644
--- a/.vimrc
+++ b/.vimrc
@@ -20,7 +20,7 @@ if has("autocmd")
 	autocmd InsertEnter * :set norelativenumber
 	autocmd InsertLeave * :set relativenumber
 
-	"at startup, jump to last cursor position if valid
+	" at startup, jump to last cursor position if valid
 	augroup vimStartup
 		au!
 		autocmd BufReadPost *
@@ -56,7 +56,13 @@ set ttimeoutlen=100 			" wait up to 100ms after esc for special key
 set directory=~/.vim/swapfiles//,/tmp// " common swap directory
 
 " no bars for vertical split
-set fillchars+=vert:\ 
+set fillchars+=vert:\
 
 " switch syntax highlighting on
 syntax enable
+
+" ale
+let g:ale_fix_on_save = 1
+let g:ale_linters = { 'rust': [ 'analyzer' ] }
+let g:ale_fixers = { 'rust': [ 'rustfmt' ], '*': [ 'trim_whitespace', 'remove_trailing_lines' ] }
+let g:ale_rust_analyzer_config = { 'check': { 'command': 'clippy' } }