update neovim theme + fixes

config/.aliases.sh

@@ -2,6 +2,7 @@
 alias d="docker"
 alias dc="docker compose up -d"
 alias dcd="docker compose down --remove-orphans"
+alias dcl="docker compose logs"
 
 # NGINX
 alias nce="$EDITOR ~/containers/nginx/config/config.js"

config/bspwmrc

@@ -6,7 +6,7 @@ xsetroot -cursor_name left_ptr
 setxkbmap -option compose:rctrl
 
 # Polybar
-~/.config/polybar/launch.sh
+~/.config/polybar/launch.sh > /dev/null
 
 # Picom
 picom --config ~/.config/picom/picom.conf --backend xrender &
@@ -14,6 +14,8 @@ picom --config ~/.config/picom/picom.conf --backend xrender &
 # Wallpaper
 feh --bg-center ~/dotfiles/wallpaper.jpg
 
+pgrep -x mconnect > /dev/null || mconnect -d > /dev/null &
+
 # Kill sxhkd & start a new instance
 pgrep -x sxhkd > /dev/null || sxhkd &
 
@@ -27,11 +29,13 @@ bspc config split_ratio          0.52
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
-bspc rule -a android-studio state=floating border=off follow=on
+bspc rule -a SchildiChat desktop=^5
-bspc rule -a librewolf desktop=^3
+bspc rule -a jetbrains-studio state=floating border=off follow=on
+bspc rule -a LibreWolf desktop=^3
 bspc rule -a Chromium desktop=^3
 bspc rule -a VSCodium desktop=^4
 bspc rule -a Spotify desktop=^2
 bspc rule -a discord desktop=^1
 bspc rule -a Psst desktop=^2
 bspc rule -a WebCord desktop=^1
+bspc rule -a Pavucontrol state=floating

config/flameshot.ini

@@ -1,6 +1,6 @@
 [General]
 buttons=@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\v\0\0\0\0\0\0\0\x12\0\0\0\a\0\0\0\b\0\0\0\t\0\0\0\x10\0\0\0\n\0\0\0\v\0\0\0\r\0\0\0\x17\0\0\0\f)
 contrastOpacity=188
-drawColor=#000000
+drawColor=#ff0006
-savePath=/home/guus/Pictures/Screenshots
+savePath=/home/guus/Pictures
 uiColor=#0081a8

config/neovim/init.lua

@@ -2,5 +2,5 @@ require("user.settings")
 require("user.keybinds")
 require("user.plugins")
 
-vim.cmd.colorscheme('gruvbox-material')
+vim.cmd.colorscheme('sonokai')
 

config/neovim/lazy-lock.json

@@ -18,6 +18,7 @@
   "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" },
   "onedark.vim": { "branch": "main", "commit": "b6b5ffe31a195a3077338d7a506b905e4a51590f" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
+  "sonokai": { "branch": "master", "commit": "296f7fa3432f7d9b55b27ad0023f8824701cfec4" },
   "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
   "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" },

config/neovim/lua/plugins/colorschemes.lua

@@ -2,7 +2,8 @@ local Plugins = {
 	{'sainnhe/gruvbox-material'},
 	{'morhetz/gruvbox'},
 	{'joshdick/onedark.vim'},
-	{'tlhr/anderson.vim'}
+	{'tlhr/anderson.vim'},
+	{'sainnhe/sonokai'}
 }
 
 return Plugins

config/polybar/modules/status

@@ -77,7 +77,7 @@ label-disconnected =
 [module/phone-battery]
 type = custom/script
 
-exec = echo " $(mconnectctl show-battery /org/mconnect/device/1 | head -1 | awk '{print $2}')%"
+exec = echo " $(mconnectctl show-battery /org/mconnect/device/2 | head -1 | awk '{print $2}')%"
 
 exec-if = ~/.config/polybar/phone-is-connected.sh
 

config/polybar/phone-is-connected.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-connected="$(mconnectctl show-device /org/mconnect/device/1 | sed -n 9,9p | awk '{print $2}')"
+connected="$(mconnectctl show-device /org/mconnect/device/2 | sed -n 9,9p | awk '{print $2}')"
 
 if [[ $connected == "false" ]]; then
 		exit 1

config/ssh

@@ -16,11 +16,27 @@ Host gitlab.com
     PreferredAuthentications publickey
     IdentityFile ~/.ssh/gitlab
 
+Host gitlab.socsci.ru.nl
+    User git
+	HostName gitlab.socsci.ru.nl
+	PreferredAuthentications publickey
+	IdentityFile ~/.ssh/radboud-git
+
+Host 78.141.218.172
+    User git
+	HostName 78.141.218.172
+	IdentityFile ~/.ssh/gitea
+
 Host raspberry
-    HostName 192.168.2.28
+    HostName 192.168.0.228
     IdentityFile ~/.ssh/raspberry
 	User guus
 
+Host sunflower
+    HostName 192.168.2.119
+	IdentityFile ~/.ssh/sunflower
+	User guus
+
 Host aur.archlinux.org
     IdentityFile ~/.ssh/aur
     User aur
@@ -30,16 +46,21 @@ Host rose
     HostName rose
     IdentityFile ~/.ssh/rose
 
-Host sunflower
-    User guus
-    HostName 81.206.144.139
-    IdentityFile ~/.ssh/sunflower
-
 Host azalea
     User ubuntu
     HostName azalea
     IdentityFile ~/.ssh/azalea
 
+Host helenium
+    User guus
+	HostName 78.141.218.172
+	IdentityFile ~/.ssh/helenium
+
+Host cosmos
+    User guus
+	HostName 217.69.6.236
+	IdentityFile ~/.ssh/cosmos
+
 Host crocus
     User ubuntu
 	HostName crocus

config/vscodium.json

@@ -1,5 +1,4 @@
 {
-  "window.zoomLevel": 2,
   "editor.codeLensFontFamily": "'Fira Code'",
   "editor.fontFamily": "'Fira Code', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'",
   "editor.inlayHints.fontFamily": "'Fira Code'",
@@ -8,15 +7,14 @@
   "editor.fontLigatures": true,
   "editor.formatOnSave": true,
   "security.workspace.trust.enabled": false,
-  "workbench.colorTheme": "Super One Dark",
-  "workbench.iconTheme": "material-icon-theme",
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "explorer.confirmDelete": false,
   "files.associations": {
     "sxhkdrc": "sxhkdrc",
-    "*.rasi": "rasi"
+    "*.rasi": "rasi",
+    ".versionrc": "json"
   },
   "atomKeymap.promptV3Features": true,
   "editor.multiCursorModifier": "ctrlCmd",
@@ -56,5 +54,25 @@
   },
   "[java]": {
     "editor.defaultFormatter": "redhat.java"
-  }
+  },
+  "[scss]": {
+    "editor.defaultFormatter": "vscode.css-language-features"
+  },
+  "window.zoomLevel": 2,
+  "editor.inlayHints.enabled": "offUnlessPressed",
+  "editor.minimap.showSlider": "always",
+  "git.openRepositoryInParentFolders": "always",
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.python"
+  },
+  "workbench.iconTheme": "material-icon-theme",
+  "omnisharp.useModernNet": false,
+  "omnisharp.useGlobalMono": "always",
+  "workbench.colorTheme": "Super One Dark",
+  "[rust]": {
+    "editor.defaultFormatter": "rust-lang.rust-analyzer"
+  },
+  "editor.detectIndentation": false,
+  "editor.indentSize": "tabSize",
+  "editor.insertSpaces": false
 }