created base i3 config and custom profiles

bin/ssh_agent_check

@@ -1,14 +1,26 @@
 #!/usr/bin/env bash
 # checks for agent status and echos to status bar
 
-if [ -S ~/.ssh/ssh_auth_sock ] ; then
-    # agent active
-    clr='#[fg=color34]' # green
-    symb=$(echo -e '\uf00c')
+
+#ICON=$(echo -e '\Uf08c0')
+
+if [[ -S ~/.ssh/ssh_auth_sock ]] ; then
+    ICON=$(echo -e '\uf00c')
+    if [[ "$1" == "-t" ]] ; then
+        DEFAULT=' #[default]'
+        clr='#[fg=color34]'
+    else
+        clr='%{F#0F0}'
+    fi
 else
     # agent not active
-    clr='#[fg=color1]' # red
-    symb=$(echo -e '\uf00d')
+    ICON=$(echo -e '\uf00d')
+    if [[ "$1" == "-t" ]] ; then
+        DEFAULT=' #[default]'
+        clr='#[fg=color1]'
+    else
+        clr='%{F#F00}'
+    fi
 fi
 
-printf 'Agent %s%s #[default]' $clr $symb
+printf 'Agent %s%s%s' $clr $ICON "$DEFAULT"

bin/todo_display.sh

@@ -11,18 +11,20 @@ fi
 
 source "$calindx"
 
+# increment
 if [[ "$1" == "inc" ]] ; then
     ((INDEX+=1))
-    if [[ $INDEX -ge ${#todolist[@]} ]] ; then
-        INDEX=0 # loops
-    fi
+elif [[ "$1" == "dec" ]] ; then
+    ((INDEX-=1))
 fi
 
-if [[ "$1" == "dec" ]] ; then
-    ((INDEX-=1))
-    if [[ $INDEX -lt 0 ]] ; then
-        INDEX=$((${#todolist[@]}-1))
-    fi
+# perform checks on the index. Adjusts to dynamic lists
+if [[ $INDEX -ge ${#todolist[@]} ]] ; then
+    INDEX=0 # loops
+elif [[ $INDEX -lt 0 ]] ; then
+    INDEX=$((${#todolist[@]}-1))
 fi
+
+# saves index
 echo "INDEX=$INDEX" > "$calindx"
 printf '%s (%d/%d)\n' "${todolist[$INDEX]}" $(($INDEX+1)) ${#todolist[@]}

editors/vim/vimrc

@@ -18,7 +18,7 @@ set background=dark
 syntax enable
 colorscheme hybrid
 
-" syntax highlighting
+" syntax highlighting for go
 let g:go_highlight_types=1
 let g:go_highlight_fields=1
 let g:go_highlight_functions=1
@@ -30,6 +30,7 @@ let g:go_highlight_extra_types=1
 let g:vim_markdown_folding_disabled = 1
 let g:vim_markdown_math = 1
 let g:vim_markdown_strikethrough = 1
+
 " use md for vim wiki and disable global linking
 let g:vimwiki_list = [{'path': '~/vimwiki/',
             \ 'syntax': 'markdown', 'ext': '.md'}]
@@ -44,6 +45,7 @@ let g:airline_powerline_fonts = 1
 if !exists('g:airline_symbols')
   let g:airline_symbols = {}
 endif
+
 " setting nf symbols
 let g:airline_symbols.linenr = ''
 let g:airline_symbols.maxlinenr = ''

gui/i3-thinkpad/wallpaper.jpg

@@ -1 +0,0 @@
-/home/spinach/.dotfiles/gui/wallpapers/pine_tree.jpg

gui/i3/base.conf

@@ -1,14 +1,3 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
 set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
@@ -23,21 +12,20 @@ smart_gaps on
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
 #font pango:DejaVu Sans Mono 8
-
 # Start XDG autostart .desktop files using dex. See also
 # https://wiki.archlinux.org/index.php/XDG_Autostart
 exec --no-startup-id dex --autostart --environment i3
 
-# The combination of xss-lock, nm-applet and pactl is a popular choice, so
-# they are included here as an example. Modify as you see fit.
-
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- ~/.local/bin/i3lock-blur --nofork
+exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock-blur --nofork
 
-# NetworkManager is the most popular way to manage wireless networks on Linux,
-# and nm-applet is a desktop environment-independent system tray GUI for it.
-#exec --no-startup-id nm-applet
+# auto starting default applications
+assign [class="st-256color"] 1
+assign [class="Brave-browser"] 2
+
+exec --no-startup-id st -e tmux
+exec --no-startup-id brave
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
@@ -49,32 +37,31 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# move tiling windows via drag & drop by left-clicking into the title bar,
-# or left-clicking anywhere into the window while holding the floating modifier.
-#set tiling_drag modifier titlebar
-
 # start a terminal
 bindsym $mod+Return exec st
 
 # lock the screen
-bindsym $mod+q exec ~/.local/bin/i3lock-blur
+bindsym $mod+q exec xset s activate
 
 # kill focused window
 bindsym $mod+Shift+q kill
 
-# start rofi
+# start dmenu (a program launcher)
 bindsym $mod+d exec --no-startup-id rofi-launcher
 
-
-# There also is i3-dmenu-desktop which only displays applications shipping a
-# .desktop file. It is a wrapper around dmenu, so you need that installed.
-# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
+# setting up a vimscratch pad to use vimwiki
+for_window [instance="todo"] move window to scratchpad
+for_window [instance="cal"] move window to scratchpad
+exec --no-startup-id st -n todo -e vim ~/vimwiki/todo/index.md
+exec --no-startup-id st -n cal -e calcurse
+bindsym $mod+s [instance="todo"] scratchpad show
+bindsym $mod+c [instance="cal"] scratchpad show
 
 # change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -83,10 +70,10 @@ 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+semicolon move right
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
@@ -95,16 +82,16 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+h split h
+#bindsym $mod+h split h
 
 # split in vertical orientation
-bindsym $mod+v split v
+#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+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
@@ -172,10 +159,10 @@ mode "resize" {
         # 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 semicolon resize grow width 10 px or 10 ppt
+        bindsym h resize shrink width 10 px or 10 ppt
+        bindsym j resize grow height 10 px or 10 ppt
+        bindsym k resize shrink height 10 px or 10 ppt
+        bindsym l 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
@@ -191,15 +178,7 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-# bar {
-        #status_command 
-# }
-
-exec_always --no-startup-id picom-launch.sh
+exec --no-startup-id picom-launch.sh
 
 # background
-exec_always --no-startup-id feh --bg-scale ~/.config/i3/wallpaper.jpg
-# poly bar
-exec_always --no-startup-id polybar-launch.sh thinkpad-bar
+exec --no-startup-id feh --bg-scale ~/.config/i3/wallpaper.jpg

gui/i3/desktop.conf

@@ -0,0 +1,8 @@
+include base.conf
+
+# binding workspaces
+workspace 1 output DP-2
+workspace 2 output DP-0
+
+# poly bar
+exec_always --no-startup-id polybar-launch.sh desktop-bar

gui/i3/thinkpad.conf

@@ -0,0 +1,3 @@
+include base.conf
+# poly bar
+exec_always --no-startup-id polybar-launch.sh thinkpad-bar

gui/polybar/config.ini

@@ -115,7 +115,7 @@ type = internal/memory
 interval = 2
 format-prefix = "RAM "
 format-prefix-foreground = ${colors.primary}
-label = %percentage_used%%
+label = %used%
 format = <label>
 
 [module/battery]
@@ -157,8 +157,10 @@ label = %temperature-c%
 [network-base]
 type = internal/network
 interval = 5
+format-connected-prefix = "NET "
+format-connected-prefix-foreground = ${colors.primary}
 format-connected = <label-connected>
-format-connected-foreground = ${colors.primary}
+;format-connected-foreground = ${colors.primary}
 format-disconnected = <label-disconnected>
 format-disconnected-foreground = ${colors.disabled}
 
@@ -170,7 +172,7 @@ label-connected = %ifname%
 [module/eth]
 inherit = network-base
 interface-type = wired
-label-connected = %ifname% %linkspeed%
+label-connected = %linkspeed%
 
 [module/date]
 type = internal/date

gui/sway-desktop/config

@@ -8,7 +8,6 @@
 # i3 config file (v4)
 #
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
 set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
@@ -61,7 +60,7 @@ floating_modifier $mod
 bindsym $mod+Return exec st
 
 # lock the screen
-bindsym $mod+q exec i3lock-blur
+bindsym $mod+q exec swaylock
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -209,9 +208,9 @@ bindsym $mod+r mode "resize"
         #status_command 
 # }
 
-exec --no-startup-id picom-launch.sh
+#exec --no-startup-id picom-launch.sh
 
 # background
-exec --no-startup-id feh --bg-scale ~/.config/i3/wallpaper.jpg
+output "*" bg ~/.config/i3/wallpaper.jpg fill
 # poly bar
 exec_always --no-startup-id polybar-launch.sh desktop-bar

meta/configs/i3.desktop.yaml

@@ -1,6 +1,9 @@
 - shell:
   - [cd src/i3lock-blur && make install, Building i3lock]
 
+- clean:
+    ~/.config/i3:
+
 - link:
-    ~/.config/i3: gui/i3-desktop
+    ~/.config/i3/config: gui/i3/desktop.conf
     ~/.config/i3/wallpaper.jpg: gui/wallpapers/pine_tree.jpg

meta/configs/i3.thinkpad.yaml

@@ -1,6 +1,9 @@
 - shell:
   - [cd src/i3lock-blur && make install, Building i3lock]
 
+- clean:
+    ~/.config/i3:
+
 - link:
-    ~/.config/i3: gui/i3-thinkpad
+    ~/.config/i3/config: gui/i3/thinkpad.conf
     ~/.config/i3/wallpaper.jpg: gui/wallpapers/pine_tree.jpg

meta/configs/sway.desktop.yaml

@@ -0,0 +1,3 @@
+- link:
+    ~/.config/sway: gui/sway-desktop
+    ~/.config/sway/wallpaper.jpg: gui/wallpapers/pine_tree.jpg

meta/profiles/arch.desktop

@@ -9,6 +9,7 @@ fzf
 tmux.sparse
 st.desktop
 i3.desktop
+sway.desktop
 polybar
 picom
 rofi

terminals/tmux/tmux.full.conf

@@ -28,7 +28,7 @@ set -g clock-mode-colour white
 # status config
 set -g status-interval 10
 set -g status-style "bg=black, fg=brightWhite"
-set -g status-right "#(docker_check)| #(ssh_agent_check) | #(tmux-mem-cpu-load -p -i 1 -a 1) | #(display_uptime) | %A, %b %d %l:%M %P "
+set -g status-right "#(docker_check)| #(ssh_agent_check -t) | #(tmux-mem-cpu-load -p -i 1 -a 1) | #(display_uptime) | %A, %b %d %l:%M %P "
 set -g status-right-length 100
 set -g status-left " #(weather -p) | #(bluebikes -pc) | #(watertracker -Scr) |"
 set -g status-left-length 100

terminals/tmux/tmux.sparse.conf

@@ -27,7 +27,7 @@ set -g clock-mode-colour white
 # status config
 set -g status-interval 10
 set -g status-style "bg=black, fg=brightWhite"
-set -g status-right "#(docker_check)| #(ssh_agent_check) | #(tmux-mem-cpu-load -p -i 1 -a 1) | #(display_uptime) | %A, %b %d %l:%M %P "
+set -g status-right "#(docker_check)| #(display_uptime) | %A, %b %d %l:%M %P "
 set -g status-right-length 100
 set -g status-left " #(bluebikes -pc) | #(watertracker -Scr) |"
 set -g status-left-length 100