From cd9caff35616bce11e121573ed3ba620c02c15ba Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:23:56 +0100
Subject: [PATCH 1/8] Fix install script for rofi

---
 scripts/install-rofi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install-rofi b/scripts/install-rofi
index 3cba373..1914659 100755
--- a/scripts/install-rofi
+++ b/scripts/install-rofi
@@ -2,10 +2,10 @@
 
 TMP_LOCATION=/tmp/rofi
 
-cd $HOME
+git -C $TMP_LOCATION pull || git clone --depth=1 https://github.com/adi1090x/rofi.git $TMP_LOCATION
 
-git -C /tmp/rofi pull || git clone --depth=1 https://github.com/adi1090x/rofi.git $TMP_LOCATION
+cd $TMP_LOCATION
 
-chmod +x $TMP_LOCATION/setup.sh
+chmod +x setup.sh
 
-$TMP_LOCATION/setup.sh
\ No newline at end of file
+./setup.sh

From 79af7c414365cc09027a90192415565c3e55c69b Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:24:17 +0100
Subject: [PATCH 2/8] Remove chromium flags for hardware accel

---
 config/chromium/flags | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/chromium/flags b/config/chromium/flags
index 46d2f76..8a7c528 100644
--- a/config/chromium/flags
+++ b/config/chromium/flags
@@ -1,8 +1,4 @@
---enable-features=WebUIDarkMode,Commander,BackForwardCache:enable_same_site/true,ContentSettingsRedesign,FormControlsRefresh,OmniboxSuggestionButtonRow,ParallelDownloading,QuietNotificationPrompts,ReaderMode,VaapiVideoDecoder
+--enable-features=WebUIDarkMode,Commander,BackForwardCache:enable_same_site/true,ContentSettingsRedesign,FormControlsRefresh,OmniboxSuggestionButtonRow,ParallelDownloading,QuietNotificationPrompts,ReaderMode
 --force-dark-mode
 --force-device-scale-factor=1.2
---use-gl=egl
---disable-features=UseChromeOSDirectVideoDecoder
---ignore-gpu-blocklist
---enable-gpu-rasterization
 --enable-zero-copy

From 6b9446033e2f56f77a1a995180ad31046ac9471c Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:24:33 +0100
Subject: [PATCH 3/8] Improved polybar config

---
 config/polybar/modules/spotify       | 33 ----------------------------
 config/polybar/modules/status        |  4 ++--
 config/polybar/phone-is-connected.sh |  2 +-
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 config/polybar/modules/spotify

diff --git a/config/polybar/modules/spotify b/config/polybar/modules/spotify
deleted file mode 100644
index 6471e45..0000000
--- a/config/polybar/modules/spotify
+++ /dev/null
@@ -1,33 +0,0 @@
-[module/spotify]
-type = custom/script
-tail = true
-
-label-font = 3
-
-format-prefix = 
-format = <label>
-exec = ~/.config/polybar/scripts/scroll_spotify_status.sh
-
-[module/spotify-prev]
-type = custom/script
-exec = echo 
-format = <label>
-click-left = playerctl previous -p spotify
-
-[module/spotify-play-pause]
-type = custom/script
-
-exec = echo 
-; hook-1 = echo 
-
-; initial = 1
-
-format = <label>
-
-click-left = playerctl play-pause -p spotify
-
-[module/spotify-next]
-type = custom/script
-exec = echo 
-format = <label>
-click-left = playerctl next -p spotify
\ No newline at end of file
diff --git a/config/polybar/modules/status b/config/polybar/modules/status
index 0602626..72011f8 100644
--- a/config/polybar/modules/status
+++ b/config/polybar/modules/status
@@ -26,7 +26,7 @@ ramp-capacity-10 = 
 
 [module/title]
 type = internal/xwindow
-
+label-maxlen = 50
 [module/temperature]
 type = internal/temperature
 
@@ -77,7 +77,7 @@ label-disconnected =
 [module/phone-battery]
 type = custom/script
 
-exec = echo " $(mconnectctl show-battery /org/mconnect/device/0 | head -1 | awk '{print $2}')%"
+exec = echo " $(mconnectctl show-battery /org/mconnect/device/1 | head -1 | awk '{print $2}')%"
 
 exec-if = ~/.config/polybar/phone-is-connected.sh
 
diff --git a/config/polybar/phone-is-connected.sh b/config/polybar/phone-is-connected.sh
index 5fad9be..9751ddd 100755
--- a/config/polybar/phone-is-connected.sh
+++ b/config/polybar/phone-is-connected.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-connected="$(mconnectctl show-device /org/mconnect/device/0 | sed -n 9,9p | awk '{print $2}')"
+connected="$(mconnectctl show-device /org/mconnect/device/1 | sed -n 9,9p | awk '{print $2}')"
 
 if [[ $connected == "false" ]]; then
 		exit 1

From 35cb57b734249c09a3c70dbe7af7030cc6461794 Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:27:10 +0100
Subject: [PATCH 4/8] Update pacman config to allow more parallel downloads

---
 config/pacman.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/pacman.conf b/config/pacman.conf
index 365ee57..58d0a2a 100644
--- a/config/pacman.conf
+++ b/config/pacman.conf
@@ -8,7 +8,7 @@
 #
 [options]
 Architecture = auto
-ParallelDownloads = 1
+ParallelDownloads = 5
 
 Color
 ILoveCandy

From fef24cbc4a7c2da150f1177fff06ad382dd58f9d Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:28:23 +0100
Subject: [PATCH 5/8] Remove vim mode from zsh config

---
 config/.zshrc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/.zshrc b/config/.zshrc
index 1c448ab..9250a15 100644
--- a/config/.zshrc
+++ b/config/.zshrc
@@ -24,7 +24,7 @@ export PATH="$PNPM_HOME:$PYTHON_HOME:$PATH"
 source ~/.aliases
 
 # Plugins
-plugins=(git colorize docker yarn debian vscode sudo alias-finder archlinux zsh-histdb zsh-autosuggestions wakeonlan vi-mode)
+plugins=(git colorize docker yarn debian vscode sudo alias-finder archlinux zsh-histdb zsh-autosuggestions wakeonlan)
 
 # Oh-my-zsh
 source $ZSH/oh-my-zsh.sh
@@ -41,7 +41,5 @@ bindkey "^y" redo
 bindkey "^H" backward-kill-word
 bindkey "^ " autosuggest-accept
 
-eval "$(zoxide init zsh)"
-
 # Powerlevel10k
 source ~/.p10k.zsh

From 1d42994e398212d3f6765af9ca3e3ca805ba708b Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:28:29 +0100
Subject: [PATCH 6/8] Remove old vim config

---
 config/init.vim | 96 -------------------------------------------------
 1 file changed, 96 deletions(-)
 delete mode 100644 config/init.vim

diff --git a/config/init.vim b/config/init.vim
deleted file mode 100644
index 78c71b6..0000000
--- a/config/init.vim
+++ /dev/null
@@ -1,96 +0,0 @@
-command Ws w|so%
-
-let mapleader = " "
-
-" Simple keybinds
-nnoremap <silent> <C-s> :w<CR>
-nnoremap <silent> <C-q> :q<CR>
-inoremap <silent> <C-s> <ESC>:w<CR>
-
-nnoremap <silent> <S-E> :10Term<CR>
-
-nnoremap <silent> <A-Up> :m-2<CR>
-nnoremap <silent> <A-Down> :m+1<CR>
-
-" Easy split navigation
-nnoremap <C-w> <C-w>w
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-
-:set tabstop=4
-
-:set relativenumber
-
-:set timeout timeoutlen=500 ttimeoutlen=500
-
-:set clipboard=unnamedplus
-
-let s:fontsize = 12
-
-" Plugins
-call plug#begin()
-
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-Plug 'junegunn/fzf.vim'
-Plug 'itchyny/lightline.vim'
-Plug 'tpope/vim-eunuch'
-Plug 'tpope/vim-surround'
-
-" Nerd tree plugins
-Plug 'preservim/nerdtree' |
-            \ Plug 'Xuyuanp/nerdtree-git-plugin'
-Plug 'PhilRunninger/nerdtree-buffer-ops'
-Plug 'jistr/vim-nerdtree-tabs'
-Plug 'preservim/nerdcommenter'
-
-Plug 'editorconfig/editorconfig-vim'
-Plug 'airblade/vim-gitgutter'
-Plug 'tpope/vim-fugitive'
-Plug 'mattn/emmet-vim'
-"  Plug 'Valloric/YouCompleteMe'
-Plug 'mg979/vim-visual-multi'
-Plug 'prettier/vim-prettier', { 'do': 'yarn install --frozen-lockfile --production' }
-Plug 'sainnhe/sonokai'
-Plug 'ryanoasis/vim-devicons'
-Plug 'vimlab/split-term.vim'
-Plug 'sirver/UltiSnips'
-Plug 'honza/vim-snippets'
-" Plug 'thaerkh/vim-workspace'
-Plug 'Raimondi/delimitMate'
-
-call plug#end()
-
-" Fzf
-nnoremap <silent> <Leader>p :Files<CR>
-nnoremap <silent> <Leader>f :Rg<CR>
-
-" Prettier settings
-let g:prettier#autoformat = 1
-let g:prettier#autoformat_require_pragma = 0
-
-" Vim eunuch setting
-nnoremap <silent> <Leader>e :SudoEdit<CR>
-nnoremap <silent> <Leader>s :SudoWrite<CR>
-
-" Workspace settings
-" let g:workspace_autocreate = 1
-
-" Nerd tree settings
-" autocmd VimEnter * NERDTree
-
-let NERDTreeMinimalUI = 1
-let NERDTreeDirArrows = 1
-let NERDTreeShowHidden = 1
-
-nnoremap <silent> <C-t> :NERDTreeToggle<CR>
-
-nnoremap <silent> <Leader>] :tabn<CR>
-nnoremap <silent> <Leader>[ :tabp<CR>
-
-" Lightline config
-set noshowmode
-
-" Color scheme
-colorscheme sonokai

From 86dfd1e5d3561ad40572674f07b17d3cb3719969 Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:28:55 +0100
Subject: [PATCH 7/8] Remove old commands from install script

---
 install_scripts/post-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_scripts/post-install b/install_scripts/post-install
index ca4b85b..13d1f0f 100755
--- a/install_scripts/post-install
+++ b/install_scripts/post-install
@@ -4,13 +4,13 @@
 sudo systemctl enable NetworkManager --now
 
 # Flutter
-sudo gpasswd -a $USER flutterusers
+# sudo gpasswd -a $USER flutterusers
 
 # sddm
 sudo systemctl enable ly
 
 # Micro
-micro -plugin install quoter filemanager
+# micro -plugin install quoter filemanager
 
 # ZSH
 $ROOT/scripts/install-zsh

From a4bc05a905dd749ff19f4b17f8d221370552de67 Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Tue, 7 Mar 2023 00:29:33 +0100
Subject: [PATCH 8/8] Add new rofi launch command to sxhkd config

---
 config/sxhkdrc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/sxhkdrc b/config/sxhkdrc
index 7723d00..1e2e3cf 100644
--- a/config/sxhkdrc
+++ b/config/sxhkdrc
@@ -8,10 +8,7 @@ super + Return
 
 # program launcher
 super + @space
-	rofi -show combi
-
-super + l
-    kill -9 -1
+	~/.config/rofi/launchers/type-2/launcher.sh
 
 super + i
     kitty