From c55571a3e2a4fe0132399593a3111adb4658bd6d Mon Sep 17 00:00:00 2001
From: spinach <19keegandeppe@gmail.com>
Date: Sun, 29 Jan 2023 22:55:53 -0500
Subject: [PATCH] broken src

---
 .gitmodules                                 |  12 --
 bin/bb                                      |   1 -
 bin/{up.sh => display_uptime}               |   0
 bin/{docker_check.sh => docker_check}       |   0
 bin/font_install.sh                         |  10 -
 bin/fzf                                     |   1 -
 bin/fzf-tmux                                |   1 -
 bin/mclinstall.sh                           |   7 -
 bin/{ssh_agent_check.sh => ssh_agent_check} |   0
 bin/timetracker                             |   1 -
 bin/tmux-mem-cpu-load                       |   1 -
 bin/water                                   |   1 -
 bin/weather                                 |   1 -
 i3/config                                   | 194 ++++++++++++++++++++
 install.conf.yaml                           |  34 ++--
 oh-my-zsh/custom/themes/powerlevel10k       |   2 +-
 src/bluebikes                               |   1 -
 src/fzf                                     |   2 +-
 src/timetracker                             |   1 -
 src/watertracker                            |   1 -
 src/weather                                 |   1 -
 tmux.conf                                   |   6 +-
 vim/pack/man/start/vim-airline              |   2 +-
 vim/pack/man/start/vimtex                   |   2 +-
 zprofile                                    |  12 ++
 zshrc                                       |  17 +-
 26 files changed, 238 insertions(+), 73 deletions(-)
 delete mode 120000 bin/bb
 rename bin/{up.sh => display_uptime} (100%)
 rename bin/{docker_check.sh => docker_check} (100%)
 delete mode 100755 bin/font_install.sh
 delete mode 120000 bin/fzf
 delete mode 120000 bin/fzf-tmux
 delete mode 100755 bin/mclinstall.sh
 rename bin/{ssh_agent_check.sh => ssh_agent_check} (100%)
 delete mode 120000 bin/timetracker
 delete mode 120000 bin/tmux-mem-cpu-load
 delete mode 120000 bin/water
 delete mode 120000 bin/weather
 create mode 100644 i3/config
 delete mode 160000 src/bluebikes
 delete mode 160000 src/timetracker
 delete mode 160000 src/watertracker
 delete mode 160000 src/weather
 create mode 100644 zprofile

diff --git a/.gitmodules b/.gitmodules
index 63a80ec..2ef501c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,18 +32,6 @@
 [submodule "vimtex"]
 	path = vim/pack/man/start/vimtex
 	url = https://github.com/lervag/vimtex.git
-[submodule "watertracker"]
-	path = src/watertracker
-	url = https://git.keegandeppe.com/kdeppe/watertracker.git
-[submodule "bluebikes"]
-	path = src/bluebikes
-	url = https://git.keegandeppe.com/kdeppe/bluebikes.git
-[submodule "timetracker"]
-	path = src/timetracker
-	url = https://git.keegandeppe.com/kdeppe/timetracker.git
-[submodule "weather"]
-	path = src/weather
-	url = https://git.keegandeppe.com/kdeppe/weather.git
 [submodule "tmux-mem-cpu-load"]
 	path = src/tmux-mem-cpu-load
 	url = https://github.com/thewtex/tmux-mem-cpu-load
diff --git a/bin/bb b/bin/bb
deleted file mode 120000
index 0d0591e..0000000
--- a/bin/bb
+++ /dev/null
@@ -1 +0,0 @@
-/home/keegan/.dotfiles/src/bluebikes/bb
\ No newline at end of file
diff --git a/bin/up.sh b/bin/display_uptime
similarity index 100%
rename from bin/up.sh
rename to bin/display_uptime
diff --git a/bin/docker_check.sh b/bin/docker_check
similarity index 100%
rename from bin/docker_check.sh
rename to bin/docker_check
diff --git a/bin/font_install.sh b/bin/font_install.sh
deleted file mode 100755
index 38e27de..0000000
--- a/bin/font_install.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-mkdir -p $HOME/.local/share/fonts/hack
-cd $HOME/.local/share/fonts/hack
-curl -fLO https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/Hack.zip
-unzip Hack.zip
-rm -rf Hack.zip
-mv 'Hack Regular Nerd Font Complete.ttf' $HOME/.local/share/fonts
-mv 'Hack Regular Nerd Font Complete Mono.ttf' $HOME/.local/share/fonts
-rm -rf $HOME/.local/share/fonts/hack
diff --git a/bin/fzf b/bin/fzf
deleted file mode 120000
index 7c89ccf..0000000
--- a/bin/fzf
+++ /dev/null
@@ -1 +0,0 @@
-/home/keegan/.dotfiles/src/fzf/bin/fzf
\ No newline at end of file
diff --git a/bin/fzf-tmux b/bin/fzf-tmux
deleted file mode 120000
index e47790f..0000000
--- a/bin/fzf-tmux
+++ /dev/null
@@ -1 +0,0 @@
-/home/keegan/.dotfiles/src/fzf/bin/fzf-tmux
\ No newline at end of file
diff --git a/bin/mclinstall.sh b/bin/mclinstall.sh
deleted file mode 100755
index 238d00b..0000000
--- a/bin/mclinstall.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-
-cd $HOME/.dotfiles/bin/tmux-mem-cpu-load
-cmake .
-make
-sudo make install
diff --git a/bin/ssh_agent_check.sh b/bin/ssh_agent_check
similarity index 100%
rename from bin/ssh_agent_check.sh
rename to bin/ssh_agent_check
diff --git a/bin/timetracker b/bin/timetracker
deleted file mode 120000
index 0e718f3..0000000
--- a/bin/timetracker
+++ /dev/null
@@ -1 +0,0 @@
-/home/keegan/.dotfiles/src/timetracker/timetracker.sh
\ No newline at end of file
diff --git a/bin/tmux-mem-cpu-load b/bin/tmux-mem-cpu-load
deleted file mode 120000
index 8d0f5be..0000000
--- a/bin/tmux-mem-cpu-load
+++ /dev/null
@@ -1 +0,0 @@
-/home/keegan/.dotfiles/src/tmux-mem-cpu-load/tmux-mem-cpu-load
\ No newline at end of file
diff --git a/bin/water b/bin/water
deleted file mode 120000
index ffc52b6..0000000
--- a/bin/water
+++ /dev/null
@@ -1 +0,0 @@
-/home/keegan/.dotfiles/src/watertracker/watertracker.sh
\ No newline at end of file
diff --git a/bin/weather b/bin/weather
deleted file mode 120000
index 4193acb..0000000
--- a/bin/weather
+++ /dev/null
@@ -1 +0,0 @@
-/home/keegan/.dotfiles/src/weather/weather.sh
\ No newline at end of file
diff --git a/i3/config b/i3/config
new file mode 100644
index 0000000..e096fd9
--- /dev/null
+++ b/i3/config
@@ -0,0 +1,194 @@
+# 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
+# is used in the bar {} block below.
+font pango:monospace 8
+
+# 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 -- i3lock --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
+
+# Use pactl to adjust volume in PulseAudio.
+set $refresh_i3status killall -SIGUSR1 i3status
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+
+# 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 i3lock-fancy-dualmonitor
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec --no-startup-id dmenu_run
+# A more modern dmenu replacement is rofi:
+# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
+# 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
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+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
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+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+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+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 number $ws1
+bindsym $mod+2 workspace number $ws2
+bindsym $mod+3 workspace number $ws3
+bindsym $mod+4 workspace number $ws4
+bindsym $mod+5 workspace number $ws5
+bindsym $mod+6 workspace number $ws6
+bindsym $mod+7 workspace number $ws7
+bindsym $mod+8 workspace number $ws8
+bindsym $mod+9 workspace number $ws9
+bindsym $mod+0 workspace number $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number $ws1
+bindsym $mod+Shift+2 move container to workspace number $ws2
+bindsym $mod+Shift+3 move container to workspace number $ws3
+bindsym $mod+Shift+4 move container to workspace number $ws4
+bindsym $mod+Shift+5 move container to workspace number $ws5
+bindsym $mod+Shift+6 move container to workspace number $ws6
+bindsym $mod+Shift+7 move container to workspace number $ws7
+bindsym $mod+Shift+8 move container to workspace number $ws8
+bindsym $mod+Shift+9 move container to workspace number $ws9
+bindsym $mod+Shift+0 move container to workspace number $ws10
+
+# 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
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # 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
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape or $mod+r
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+r mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command i3status
+}
diff --git a/install.conf.yaml b/install.conf.yaml
index b912a95..e067b3a 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -8,41 +8,49 @@
         stdout: true
         stderr: true
 
-- clean: ['~', '~/bin']
+- create:
+  - ~/.local/share
+  - ~/.local/bin
 
 - clean:
+    ~/:
     ~/.vim:
       recursive: true
     ~/.oh-my-zsh/custom:
       recursive: true
+    ~/.local/bin:
 
 - shell:
     - [bin/pre-install.sh]
-    - [git submodule update --init --recursive --remote, Installing submodules]
+    - [git submodule update --init --recursive, Installing submodules]
     - [cd src/tmux-mem-cpu-load && cmake . && make, Building tmux-mem-cpu-load]
     - [cd src/fzf && make install, Building fzf]
+    - [cd src/i3lock-blur && make install, Building i3lock]
 
 - link: 
     ~/.vim:
     ~/.vimrc:
     ~/.zshrc:
-        force: true
+    ~/.zprofile:
     ~/.tmux.conf:
     ~/.fzf: src/fzf
+    ~/.config/i3: i3
     ~/.oh-my-zsh/custom:
       path: oh-my-zsh/custom
       force: true
-    # adding bin for scripts
-    ~/bin:
     # linking scripts
-    ~/bin/bb: src/bluebikes/bb
-    ~/bin/weather: src/weather/weather.sh
-    ~/bin/water: src/watertracker/watertracker.sh
-    ~/bin/timetracker: src/timetracker/timetracker.sh
-    # tmux-mem-cpu-load
-    ~/bin/tmux-mem-cpu-load: src/tmux-mem-cpu-load/tmux-mem-cpu-load
+    ~/.local/bin/ssh_agent_check: bin/ssh_agent_check
+    ~/.local/bin/display_uptime: bin/display_uptime
+    ~/.local/bin/docker_check: bin/docker_check
+    # scripts from seperate repos
+    ~/.local/bin/timetracker: src/timetracker/timetracker
+    ~/.local/bin/watertracker: src/watertracker/watertracker
+    ~/.local/bin/weather: src/weather/weather
+    ~/.local/bin/bluebikes: src/bluebikes/bluebikes
     # fzf
-    ~/bin/fzf: src/fzf/bin/fzf
-    ~/bin/fzf-tmux: src/fzf/bin/fzf-tmux
+    ~/.local/bin/fzf: src/fzf/bin/fzf
+    ~/.local/bin/fzf-tmux: src/fzf/bin/fzf-tmux
+    # tmux mem-cpu-load
+    ~/.local/bin/tmux-mem-cpu-load: src/tmux-mem-cpu-load/tmux-mem-cpu-load
     # custom systemd for time tracking
     ~/.config/systemd/user/timesheet.service: src/timetracker/timesheet.service
diff --git a/oh-my-zsh/custom/themes/powerlevel10k b/oh-my-zsh/custom/themes/powerlevel10k
index 0adbc14..e7b2bb2 160000
--- a/oh-my-zsh/custom/themes/powerlevel10k
+++ b/oh-my-zsh/custom/themes/powerlevel10k
@@ -1 +1 @@
-Subproject commit 0adbc1415bf1bad46a7fd111b39640d995294dad
+Subproject commit e7b2bb2372c5c7060d35c0b7a710f3f01bd4593b
diff --git a/src/bluebikes b/src/bluebikes
deleted file mode 160000
index cdab40a..0000000
--- a/src/bluebikes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cdab40acf97c51502a495e7e90762fdb76ffb63a
diff --git a/src/fzf b/src/fzf
index aa73613..0f4af38 160000
--- a/src/fzf
+++ b/src/fzf
@@ -1 +1 @@
-Subproject commit aa7361337d3f78ae1e32283ba395446025323abb
+Subproject commit 0f4af384571aaf6bcf9146c345feb5c6916c6790
diff --git a/src/timetracker b/src/timetracker
deleted file mode 160000
index 9e5c0ef..0000000
--- a/src/timetracker
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9e5c0efee698b00245c9b84a36c8f2cd704662fe
diff --git a/src/watertracker b/src/watertracker
deleted file mode 160000
index 350b3f4..0000000
--- a/src/watertracker
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 350b3f4b2525185a1a2b863bd75576ef2199659c
diff --git a/src/weather b/src/weather
deleted file mode 160000
index 73f8ae2..0000000
--- a/src/weather
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73f8ae2f828566ee82d16ae39e17190b7f9e369b
diff --git a/tmux.conf b/tmux.conf
index 6560028..1f68f02 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -8,7 +8,7 @@ set -g display-panes-time 5000
 # setup automatic renaming
 set -g automatic-rename on
 
-#set -g default-command /bin/zsh
+#set -g default-shell $SHELL
 
 # keybinds
 bind-key v select-layout even-vertical
@@ -27,9 +27,9 @@ 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 "#(~/bin/docker_check.sh)| #(~/bin/ssh_agent_check.sh) | #(~/bin/tmux-mem-cpu-load -p -i 1 -a 1) | #(~/bin/up.sh) | %A, %b %d %l:%M %P "
+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-length 100
-set -g status-left " #(~/bin/weather -p) | #(~/bin/bb -pc) | #(~/bin/water -Scr) |"
+set -g status-left " #(weather -p) | #(bluebikes -pc) | #(watertracker -Scr) |"
 set -g status-left-length 100
 
 # tmux auto start
diff --git a/vim/pack/man/start/vim-airline b/vim/pack/man/start/vim-airline
index c7460aa..18b8539 160000
--- a/vim/pack/man/start/vim-airline
+++ b/vim/pack/man/start/vim-airline
@@ -1 +1 @@
-Subproject commit c7460aa8836bcb05cf32331cc751739ba9392ae7
+Subproject commit 18b85395d32e235128b85a059dd60b562f9dbfe1
diff --git a/vim/pack/man/start/vimtex b/vim/pack/man/start/vimtex
index c77ec4e..13fa591 160000
--- a/vim/pack/man/start/vimtex
+++ b/vim/pack/man/start/vimtex
@@ -1 +1 @@
-Subproject commit c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd
+Subproject commit 13fa591e82f7fe0fedbb097e9869d32f6af207fe
diff --git a/zprofile b/zprofile
new file mode 100644
index 0000000..22bef1e
--- /dev/null
+++ b/zprofile
@@ -0,0 +1,12 @@
+# go path
+export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
+
+# add local paths
+if [ -d $HOME/bin ] ; then
+    export PATH=$PATH:$HOME/bin
+fi
+
+if [ -d $HOME/.local/bin ] ; then
+    export PATH=$PATH:$HOME/.local/bin
+fi
+
diff --git a/zshrc b/zshrc
index eb27038..3ad84e8 100644
--- a/zshrc
+++ b/zshrc
@@ -25,15 +25,6 @@ plugins=(
     zsh-autosugggestions
 )
 
-# fix golang not loading properly
-# export GOROOT=/usr/local/go
-# export GOPATH=$HOME/go
-# export GOBIN=$GOROOT/bin
-export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
-
-# adding scripts to path
-export PATH=$PATH:$HOME/bin
-
 # Set name of the theme to load --- if set to "random", it will
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
@@ -147,13 +138,15 @@ alias bbrm='ssh-keygen -f "/home/kdeppe/.ssh/known_hosts" -R "192.168.7.2"'
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-export PATH=$PATH:$HOME/.local/bin
 
 # home and clear
 alias c="cd && clear"
 
 # water tracking alias
-alias nalgene="$HOME/bin/water 32"
+alias nalgene="water 32"
+alias tt="timetracker"
+alias bb="bluebikes"
+alias task="go-task"
 
 # setting up location variables
 # source "$HOME/.dotfiles/bin/weather/location.sh"
@@ -162,9 +155,7 @@ alias nalgene="$HOME/bin/water 32"
 export FZF_DEFAULT_OPTS='--layout=reverse --border'
 
 #alias bat="batcat" Only needed on ubuntu/debian
-alias tt="$HOME/bin/timetracker"
 
-alias task="go-task"
 
 # vim  wiki alias
 alias vimwiki="vim $HOME/vimwiki/index.md"