From aef9e91a570f25a935e5027626a0269686e41e62 Mon Sep 17 00:00:00 2001 From: The-Repo-Club Date: Mon, 16 Jan 2023 17:52:07 +0000 Subject: [PATCH] Updated DotFiles --- btop/.config/btop/btop.conf | 6 +- ckb-next/.config/ckb-next/ckb-next.conf | 16 +-- dconf/.config/dconf/user | Bin 21318 -> 24595 bytes fish/.config/fish/conf.d/00_profile.fish | 10 +- fish/.config/fish/conf.d/02_paths.fish | 7 ++ fish/.config/fish/functions/99_git.fish | 10 ++ .../plugins/__fish_command_not_found.fish | 20 ++-- i3/.config/i3/config | 12 +-- .../005_autoload_programs_on_login.conf | 3 +- localbin/.local/bin/autostart | 36 ++++--- nemo/.config/nemo-compare.conf | 8 +- nemo/.config/nemo/desktop-metadata | 4 + nvim/.config/nvim/init.lua | 10 ++ nvim/.config/nvim/lua/user/commands.lua | 5 +- nvim/.config/nvim/lua/user/lsp/configs.lua | 62 ++++++++--- nvim/.config/nvim/lua/user/nvim-tree.lua | 1 - nvim/.config/nvim/lua/user/plugins.lua | 100 +++++++++++------- nvim/.config/nvim/plugin/packer_compiled.lua | 54 +++++++++- package-list/.config/package-list | 2 +- pkgbrowser/.config/pkgbrowser/pkgbrowser.conf | 2 +- .../polybar/monitor_0/config_bottom.ini | 2 +- .../.config/polybar/monitor_0/config_top.ini | 2 +- .../polybar/monitor_1/config_bottom.ini | 2 +- .../.config/polybar/monitor_1/config_top.ini | 2 +- rofi/.local/bin/rofi/music | 17 ++- rofi/.local/bin/rofi/powermenu | 6 +- rofi/.local/bin/rofi/wifimanager | 7 +- 27 files changed, 269 insertions(+), 137 deletions(-) create mode 100644 nemo/.config/nemo/desktop-metadata diff --git a/btop/.config/btop/btop.conf b/btop/.config/btop/btop.conf index ef3ea7002..0269bec33 100644 --- a/btop/.config/btop/btop.conf +++ b/btop/.config/btop/btop.conf @@ -1,4 +1,4 @@ -#? Config file for btop v. 1.2.12 +#? Config file for btop v. 1.2.13 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" @@ -16,7 +16,7 @@ force_tty = False #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box. -#* Use withespace " " as separator between different presets. +#* Use whitespace " " as separator between different presets. #* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty" presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty" @@ -47,7 +47,7 @@ graph_symbol_net = "default" graph_symbol_proc = "default" #* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace. -shown_boxes = "net cpu mem proc" +shown_boxes = "cpu mem net" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. update_ms = 2000 diff --git a/ckb-next/.config/ckb-next/ckb-next.conf b/ckb-next/.config/ckb-next/ckb-next.conf index 5ed3da132..0f96c4db2 100644 --- a/ckb-next/.config/ckb-next/ckb-next.conf +++ b/ckb-next/.config/ckb-next/ckb-next.conf @@ -197,7 +197,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\y=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\z=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Modified=585c8586 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Modified=df90c6c0 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Name=Rainbow 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Performance\DPI\0=@Point(400 400) @@ -425,7 +425,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\Keys\y=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\Keys\z=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Modified=5afc4a5 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Modified=b2bd76c7 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Name=Breathing 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Performance\DPI\0=@Point(400 400) @@ -675,7 +675,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\y=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\z=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Modified=156302a5 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Modified=6e6d8bc3 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Name=Trippy 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Performance\DPI\0=@Point(400 400) @@ -733,7 +733,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\CurrentMode={51EB6E3A-27A0-4AD6-A35C-6B67E0329A3D} 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\HwModified=7ffd 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\ModeCount=3 -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Modified=6c382f5a +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Modified=33b04fba 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Name=Multi 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Binding\KeyMap=K68 GB 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Binding\UseRealNames=true @@ -929,7 +929,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\Keys\y=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\Keys\z=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Modified=ea77ab97 +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Modified=8107766b 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Name=Rainbow 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Performance\DPI\0=@Point(400 400) @@ -1157,7 +1157,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\Keys\y=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\Keys\z=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Modified=3c4363fb +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Modified=6d7231e5 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Name=Breathing 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Performance\DPI\0=@Point(400 400) @@ -1407,7 +1407,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\Keys\y=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\Keys\z=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Modified=66ce12b7 +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Modified=6878b687 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Name=Trippy 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Performance\DPI\0=@Point(400 400) @@ -1465,7 +1465,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\CurrentMode={11C11AE3-3195-4DFC-B8AC-2FEA703414E5} 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\HwModified=40b6f054 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\ModeCount=3 -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Modified=ae89ede4 +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Modified=c6e64f8c 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Name=Demo [Popups] diff --git a/dconf/.config/dconf/user b/dconf/.config/dconf/user index 8896b98c7c2c20ef70b6e75b4d9e735898e0c99f..5cb1f6f426f05e79f08aba5b74d5f5c5b884edfa 100644 GIT binary patch literal 24595 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 literal 21318 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⁡jx=oBx|F~l93%f)z!RX3#Ftu=PmO*YO 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 diff --git a/fish/.config/fish/conf.d/00_profile.fish b/fish/.config/fish/conf.d/00_profile.fish index ae5519f36..c76d91c36 100644 --- a/fish/.config/fish/conf.d/00_profile.fish +++ b/fish/.config/fish/conf.d/00_profile.fish @@ -4,12 +4,12 @@ setxkbmap -layout gb setxkbmap -option caps:super set -gx LC_ALL "en_GB.UTF-8" -set -gx PAGER "more" -set -gx AUR_PAGER "more" -set -gx EDITOR "vim" +set -gx PAGER more +set -gx AUR_PAGER more +set -gx EDITOR vim #QT and GTK Variables -set -gx QT_QPA_PLATFORMTHEME "qt5ct" +set -gx QT_QPA_PLATFORMTHEME qt5ct set -gx QT_AUTO_SCREEN_SCALE_FACTOR 0 set -gx TDESKTOP_USE_GTK_FILE_DIALOG 1 -set -gx GOPATH $HOME/.cache/go +set -gx GOPATH $HOME/.cache/go \ No newline at end of file diff --git a/fish/.config/fish/conf.d/02_paths.fish b/fish/.config/fish/conf.d/02_paths.fish index d7ff9b4a5..a2fca4c57 100644 --- a/fish/.config/fish/conf.d/02_paths.fish +++ b/fish/.config/fish/conf.d/02_paths.fish @@ -6,6 +6,13 @@ if test -d "$HOME/.config/composer/vendor/bin" set PATH "$HOME/.config/composer/vendor/bin:$PATH" end +# Adds `~/.local/share/gem/ruby/3.0.0/bin` to $PATH +# set PATH so it includes user's private bin if it exists +if test -d "$HOME/.local/share/gem/ruby/3.0.0/bin" + set GEM_HOME "$HOME/.local/share/gem/ruby/3.0.0" + set PATH "$HOME/.local/share/gem/ruby/3.0.0/bin:$PATH" +end + # Adds `~/.cargo/bin` to $PATH # set PATH so it includes user's private bin if it exists if test -d "$HOME/.cargo/bin" diff --git a/fish/.config/fish/functions/99_git.fish b/fish/.config/fish/functions/99_git.fish index de9b3b07f..10d02820b 100644 --- a/fish/.config/fish/functions/99_git.fish +++ b/fish/.config/fish/functions/99_git.fish @@ -83,6 +83,16 @@ function greset git reset -- $argv end +function gbackup + git reset --soft HEAD~1 +end + +function gcleanup + git fetch --prune --prune-tags origin + git remote prune origin + git pull +end + function gshow git show $argv end diff --git a/fish/.config/fish/plugins/__fish_command_not_found.fish b/fish/.config/fish/plugins/__fish_command_not_found.fish index 8c40513e5..601c3a833 100644 --- a/fish/.config/fish/plugins/__fish_command_not_found.fish +++ b/fish/.config/fish/plugins/__fish_command_not_found.fish @@ -12,16 +12,16 @@ function fish_command_not_found # Pacman only prints the path, so we still need to print the error. pacman -F $paths - while true - read -l -P "Would you like to install $pkgs[1]? [Y/n] " confirm + # while true + # read -l -P "Would you like to install $pkgs[1]? [Y/n] " confirm - switch $confirm - case Y y - pacman -S $pkgs[1] - return - case N n - return - end - end + # switch $confirm + # case Y y + # pacman -S $pkgs[1] + # return + # case N n + # return + # end + # end end end diff --git a/i3/.config/i3/config b/i3/.config/i3/config index a7b951c18..7aa3d24f9 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -139,7 +139,7 @@ $super_b+m \ ## Category: Menus; # Description: Start Music Menu; -$super_b+F6 \ +$super_b+F4 \ $exe music ## Category: Menus; @@ -149,7 +149,7 @@ $super_b+p \ ## Category: Menus; # Description: Start Youtube Menu; -$super_b+s \ +$super_b+F5 \ $exe youtube_subs # }}} Menus @@ -409,7 +409,7 @@ font pango:Noto Mono Regular 13 assign [class="(?i)Alacritty|Kitty"] → $ws1 # Workspace $ws2 -assign [class="(?i)Emacs|Jetbrains"] → $ws2 +assign [class="(?i)Emacs"] → $ws2 assign [class="(?i)Code|Nvim"] → $ws2 # Workspace $ws3 @@ -442,6 +442,7 @@ assign [class="(?i)Virt*|LazyGit"] assign [class="(?i)Dconf-editor|Piper*"] → $ws0 assign [class="(?i)Actions|Btop"] → $ws0 assign [class="(?i)PkgBrowser"] → $ws0 +assign [class="(?i)Jetbrains"] → $ws0 # }}} Assign Applications @@ -642,9 +643,8 @@ for_window [class="(?i)PassMenu"] floating enable, resize set 350 700, move posi for_window [class="(?i)MusicMenu"] floating enable, resize set 550 500, move position center for_window [class="(?i)YoutubeMenu"] floating enable, resize set 700 750, move position center -for_window [title="Copying"] floating enable -for_window [title="Deleting"] floating enable -for_window [title="Moving"] floating enable +for_window [title="(?i)Copying|Deleting|Moving"] floating enable, move position center +for_window [window_role="(?i)Organizer|Floating"] floating enable, resize set 640 480, move position center # fullscreen enabled from some programs - find with xprop diff --git a/i3/.config/i3/config.d/005_autoload_programs_on_login.conf b/i3/.config/i3/config.d/005_autoload_programs_on_login.conf index 2ab6c5549..ff906d1ed 100644 --- a/i3/.config/i3/config.d/005_autoload_programs_on_login.conf +++ b/i3/.config/i3/config.d/005_autoload_programs_on_login.conf @@ -1,4 +1,5 @@ $exe $TerminalEmulator $exe $FileManager $exe $TextEditor -$exe $WebBrowserF \ No newline at end of file +$exe $WebBrowserF +$exe 'studio' \ No newline at end of file diff --git a/localbin/.local/bin/autostart b/localbin/.local/bin/autostart index 131de4736..6d66c73f5 100755 --- a/localbin/.local/bin/autostart +++ b/localbin/.local/bin/autostart @@ -12,7 +12,7 @@ #Created: # Mon 22 November 2021, 03:15:54 PM [GMT+1] #Modified: -# Thu 17 November 2022, 03:44:58 PM [GMT] +# Mon 16 January 2023, 05:16:24 PM [GMT] # #Description: # @@ -187,27 +187,29 @@ fi ## Auto Lock ## ############### -if command -v xidlehook &>/dev/null; then +if command -v xautolock &>/dev/null; then # shellcheck disable=SC2155 - export PRIMARY_DISPLAY="$(xrandr | awk '/ primary/{print $1}')" - if ! pgrep -x "xidlehook" >/dev/null; then + if ! pgrep -x "xautolock" >/dev/null; then ( sleep 2s - xidlehook \ - --not-when-fullscreen \ - --not-when-audio \ - --timer 300 \ - "xrandr --output $PRIMARY_DISPLAY --brightness .1" \ - "xrandr --output $PRIMARY_DISPLAY --brightness 1" \ - --timer 30 \ - "xrandr --output $PRIMARY_DISPLAY --brightness 1; multimonitorlock -l -- --time-str=%I:%M:%S %p" \ - "" \ - --timer 3600 \ - "systemctl suspend" \ - "" + xautolock \ + -time 15 -locker "multimonitorlock -l -- --time-str=%I:%M:%S %p" \ + -detectsleep ) & else - echo "xidlehook already Running" + echo "xautolock already Running" + fi +fi + +if command -v xss-lock &>/dev/null; then + # shellcheck disable=SC2155 + if ! pgrep -x "xss-lock" >/dev/null; then + ( + sleep 2s + xss-lock -- multimonitorlock -l -- --time-str="%I:%M:%S %p" + ) & + else + echo "xautolock already Running" fi fi diff --git a/nemo/.config/nemo-compare.conf b/nemo/.config/nemo-compare.conf index 2b9ca67f4..6f4edef8e 100644 --- a/nemo/.config/nemo-compare.conf +++ b/nemo/.config/nemo-compare.conf @@ -5,8 +5,8 @@ diff_engine_path_multi = defined_comparators = meld [Settings] -diff_engine_path = -diff_engine_path_3way = -diff_engine_path_multi = -defined_comparators = +diff_engine_path = meld +diff_engine_path_3way = meld +diff_engine_path_multi = meld +defined_comparators = meld diff --git a/nemo/.config/nemo/desktop-metadata b/nemo/.config/nemo/desktop-metadata new file mode 100644 index 000000000..6bd299951 --- /dev/null +++ b/nemo/.config/nemo/desktop-metadata @@ -0,0 +1,4 @@ +[desktop-monitor-0] +nemo-icon-view-keep-aligned=true +nemo-icon-view-auto-layout=true +nemo-icon-view-layout-timestamp=1673798224 diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 01d47c07f..b6a832c92 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -22,3 +22,13 @@ require "user.whichkey" require "user.autocommands" require "user.header" require "user.trim" + + +if is_bootstrap then + print '==================================' + print ' Plugins are being installed' + print ' Wait until Packer completes,' + print ' then restart nvim' + print '==================================' + return +end \ No newline at end of file diff --git a/nvim/.config/nvim/lua/user/commands.lua b/nvim/.config/nvim/lua/user/commands.lua index ac03ae332..49b803b53 100644 --- a/nvim/.config/nvim/lua/user/commands.lua +++ b/nvim/.config/nvim/lua/user/commands.lua @@ -1 +1,4 @@ -vim.api.nvim_create_user_command("EditConfiguration", function() require("core.functions").edit_config() end, {}) \ No newline at end of file +vim.api.nvim_create_user_command("EditConfiguration", +function() + require("core.functions").edit_config() +end, {}) \ No newline at end of file diff --git a/nvim/.config/nvim/lua/user/lsp/configs.lua b/nvim/.config/nvim/lua/user/lsp/configs.lua index 95bfcea9a..316ed994b 100644 --- a/nvim/.config/nvim/lua/user/lsp/configs.lua +++ b/nvim/.config/nvim/lua/user/lsp/configs.lua @@ -1,24 +1,54 @@ -local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer") +local status_ok, lsp_installer = pcall(require, "mason-lspconfig") if not status_ok then return end -local lspconfig = require("lspconfig") +-- Setup mason so it can manage external tooling +require('mason').setup() -local servers = { "jsonls", "sumneko_lua" } +-- Enable the following language servers +-- Feel free to add/remove any LSPs that you want here. They will automatically be installed +local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'gopls' } -lsp_installer.setup({ - ensure_installed = servers, -}) +-- Ensure the servers above are installed +require('mason-lspconfig').setup { + ensure_installed = servers, +} -for _, server in pairs(servers) do - local opts = { - on_attach = require("user.lsp.handlers").on_attach, - capabilities = require("user.lsp.handlers").capabilities, - } - local has_custom_opts, server_custom_opts = pcall(require, "user.lsp.settings." .. server) - if has_custom_opts then - opts = vim.tbl_deep_extend("force", opts, server_custom_opts) - end - lspconfig[server].setup(opts) +-- nvim-cmp supports additional completion capabilities +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) + +for _, lsp in ipairs(servers) do + require('lspconfig')[lsp].setup { + on_attach = on_attach, + capabilities = capabilities, + } end + +require('fidget').setup() + +local runtime_path = vim.split(package.path, ';') +table.insert(runtime_path, 'lua/?.lua') +table.insert(runtime_path, 'lua/?/init.lua') + +require('lspconfig').sumneko_lua.setup { + on_attach = on_attach, + capabilities = capabilities, + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT) + version = 'LuaJIT', + -- Setup your lua path + path = runtime_path, + }, + diagnostics = { + globals = { 'vim' }, + }, + workspace = { library = vim.api.nvim_get_runtime_file('', true) }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { enable = false }, + }, + }, +} diff --git a/nvim/.config/nvim/lua/user/nvim-tree.lua b/nvim/.config/nvim/lua/user/nvim-tree.lua index c17a80532..e568db6f6 100644 --- a/nvim/.config/nvim/lua/user/nvim-tree.lua +++ b/nvim/.config/nvim/lua/user/nvim-tree.lua @@ -55,7 +55,6 @@ nvim_tree.setup({ }, view = { width = 40, - height = 30, side = "left", mappings = { list = { diff --git a/nvim/.config/nvim/lua/user/plugins.lua b/nvim/.config/nvim/lua/user/plugins.lua index b60e4979d..0019ab3a2 100644 --- a/nvim/.config/nvim/lua/user/plugins.lua +++ b/nvim/.config/nvim/lua/user/plugins.lua @@ -1,18 +1,12 @@ local fn = vim.fn --- Automatically install packer -local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" -if fn.empty(fn.glob(install_path)) > 0 then - PACKER_BOOTSTRAP = fn.system({ - "git", - "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - install_path, - }) - print("Installing packer close and reopen Neovim...") - vim.cmd([[packadd packer.nvim]]) +-- Install packer +local install_path = vim.fn.stdpath 'data' .. '/site/pack/packer/start/packer.nvim' +local is_bootstrap = false +if vim.fn.empty(vim.fn.glob(install_path)) > 0 then + is_bootstrap = true + vim.fn.execute('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path) + vim.cmd [[packadd packer.nvim]] end -- Autocommand that reloads neovim whenever you save the plugins.lua file @@ -45,7 +39,6 @@ return packer.startup(function(use) -- My plugins here use({ "wbthomason/packer.nvim" }) -- Have packer manage itself - use({ "nvim-lua/plenary.nvim" }) -- Useful lua functions used by lots of plugins use({ "windwp/nvim-autopairs" }) -- Autopairs, integrates with both cmp and treesitter use({ "numToStr/Comment.nvim" }) use({ "JoosepAlviste/nvim-ts-context-commentstring" }) @@ -65,38 +58,66 @@ return packer.startup(function(use) use({ "folke/tokyonight.nvim" }) use({ "Minimal-Mistakes/minimalmistakes-nvim" }) - -- cmp plugins - use({ "hrsh7th/nvim-cmp" }) -- The completion plugin - use({ "hrsh7th/cmp-buffer" }) -- buffer completions - use({ "hrsh7th/cmp-cmdline" }) -- cmdline completions - use({ "hrsh7th/cmp-path" }) -- path completions - use({ "saadparwaiz1/cmp_luasnip" }) -- snippet completions - use({ "hrsh7th/cmp-nvim-lsp" }) - use({ "hrsh7th/cmp-nvim-lua" }) - - -- snippets - use({ "L3MON4D3/LuaSnip" }) -- snippet engine - use({ "rafamadriz/friendly-snippets" }) -- a bunch of snippets to use + -- CMP plugins + use { -- Autocompletion + 'hrsh7th/nvim-cmp', + requires = { + 'hrsh7th/cmp-buffer', -- buffer completions + 'hrsh7th/cmp-cmdline', -- cmdline completions + 'hrsh7th/cmp-path', -- path completions + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-nvim-lua', + 'L3MON4D3/LuaSnip', -- snippet engine + 'rafamadriz/friendly-snippets', -- a bunch of snippets to use + 'saadparwaiz1/cmp_luasnip' + }, + } -- LSP - use({ "neovim/nvim-lspconfig" }) -- enable LSP - use({ "williamboman/nvim-lsp-installer" }) -- simple to use language server installer + use({ -- LSP Configuration & Plugins + "neovim/nvim-lspconfig", + requires = { + -- Automatically install LSPs to stdpath for neovim + 'williamboman/mason.nvim', + 'williamboman/mason-lspconfig.nvim', + + -- Useful status updates for LSP + 'j-hui/fidget.nvim', + }, + }) -- enable LSP use({ "jose-elias-alvarez/null-ls.nvim" }) -- for formatters and linters - -- Telescope - use({ "nvim-telescope/telescope.nvim" }) + -- Telescope Fuzzy Finder (files, lsp, etc) + use({ "nvim-telescope/telescope.nvim", + requires = { + 'nvim-lua/plenary.nvim' } + }) + + -- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available + use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', cond = vim.fn.executable 'make' == 1 } -- Treesitter - use({ "nvim-treesitter/nvim-treesitter" }) + use { -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + run = function() + pcall(require('nvim-treesitter.install').update { with_sync = true }) + end, + } + + use { -- Additional text objects via treesitter + 'nvim-treesitter/nvim-treesitter-textobjects', + after = 'nvim-treesitter', + } -- Git + use({ "tpope/vim-fugitive" }) + use({ "tpope/vim-rhubarb" }) use({ "lewis6991/gitsigns.nvim" }) -- Custom use({ "wesleimp/stylua.nvim" }) use({ "cappyzawa/trim.nvim" }) use({ "ap/vim-css-color" }) - use({ "tpope/vim-fugitive" }) use({ "airblade/vim-gitgutter" }) use({ "ctrlpvim/ctrlp.vim" }) use({ "lyuts/vim-rtags" }) @@ -106,10 +127,13 @@ return packer.startup(function(use) use({ "The-Repo-Club/Vim_Keys" }) use({ "Thyrum/vim-stabs" }) use({ "mbbill/undotree" }) + use({ "tpope/vim-sleuth" }) -- Detect tabstop and shiftwidth automatically - -- Automatically set up your configuration after cloning packer.nvim - -- Put this at the end after all plugins - if PACKER_BOOTSTRAP then - require("packer").sync() - end -end) + -- When we are bootstrapping a configuration, it doesn't + -- make sense to execute the rest of the init.lua. + + -- You'll need to restart nvim, and then it will work. + if is_bootstrap then + require("packer").sync() + end +end) \ No newline at end of file diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua index c76025871..d1bd4f25e 100644 --- a/nvim/.config/nvim/plugin/packer_compiled.lua +++ b/nvim/.config/nvim/plugin/packer_compiled.lua @@ -134,6 +134,11 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/ctrlp.vim", url = "https://github.com/ctrlpvim/ctrlp.vim" }, + ["fidget.nvim"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/fidget.nvim", + url = "https://github.com/j-hui/fidget.nvim" + }, ["friendly-snippets"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/friendly-snippets", @@ -169,6 +174,16 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, ["minimalmistakes-nvim"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/minimalmistakes-nvim", @@ -189,11 +204,6 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, - ["nvim-lsp-installer"] = { - loaded = true, - path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", - url = "https://github.com/williamboman/nvim-lsp-installer" - }, ["nvim-lspconfig"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", @@ -209,6 +219,13 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, + ["nvim-treesitter-textobjects"] = { + load_after = {}, + loaded = true, + needs_bufread = false, + path = "/home/repo/.local/share/nvim/site/pack/packer/opt/nvim-treesitter-textobjects", + url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects" + }, ["nvim-ts-context-commentstring"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring", @@ -239,6 +256,14 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/stylua.nvim", url = "https://github.com/wesleimp/stylua.nvim" }, + ["telescope-fzf-native.nvim"] = { + cond = { true }, + loaded = false, + needs_bufread = false, + only_cond = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/opt/telescope-fzf-native.nvim", + url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim" + }, ["telescope.nvim"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/telescope.nvim", @@ -284,11 +309,21 @@ _G.packer_plugins = { path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-gitgutter", url = "https://github.com/airblade/vim-gitgutter" }, + ["vim-rhubarb"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-rhubarb", + url = "https://github.com/tpope/vim-rhubarb" + }, ["vim-rtags"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-rtags", url = "https://github.com/lyuts/vim-rtags" }, + ["vim-sleuth"] = { + loaded = true, + path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-sleuth", + url = "https://github.com/tpope/vim-sleuth" + }, ["vim-stabs"] = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-stabs", @@ -307,6 +342,15 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) +-- Conditional loads +time([[Conditional loading of telescope-fzf-native.nvim]], true) + require("packer.load")({"telescope-fzf-native.nvim"}, {}, _G.packer_plugins) +time([[Conditional loading of telescope-fzf-native.nvim]], false) +-- Load plugins in order defined by `after` +time([[Sequenced loading]], true) +vim.cmd [[ packadd nvim-treesitter ]] +vim.cmd [[ packadd nvim-treesitter-textobjects ]] +time([[Sequenced loading]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/package-list/.config/package-list b/package-list/.config/package-list index 4749efba4..7d3c47d76 100644 --- a/package-list/.config/package-list +++ b/package-list/.config/package-list @@ -1,6 +1,7 @@ aic94xx-firmware ansiweather anymeal +ast-firmware aura auracle aurutils @@ -83,7 +84,6 @@ upd72020x-fw w3m-imgcat wd719x-firmware win-shot -xidlehook xmenu xroot xtitle diff --git a/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf b/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf index 517544780..93794e968 100644 --- a/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf +++ b/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf @@ -12,6 +12,6 @@ strings=pkgbrowser, ly, zap, i3-gaps, microsoft edge, python3, python, pamac, on [window] central-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1\0\0\0\x1>\0\xff\xff\xff\xff\x1\0\0\0\x1\0) -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\vB\0\0\0 \0\0\xe\xf9\0\0\x4\x17\0\0\vC\0\0\0!\0\0\xe\xf8\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\vC\0\0\0!\0\0\xe\xf8\0\0\x4\x16) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\vB\0\0\0!\0\0\xe\xf8\0\0\x4\x16\0\0\vC\0\0\0\"\0\0\xe\xf7\0\0\x4\x15\0\0\0\x1\0\0\0\0\a\x80\0\0\vC\0\0\0\"\0\0\xe\xf7\0\0\x4\x15) left-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\x1\f\0\xff\xff\xff\xff\x1\0\0\0\x2\0) right-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\0\xee\0\xff\xff\xff\xff\x1\0\0\0\x2\0) diff --git a/polybar/.config/polybar/monitor_0/config_bottom.ini b/polybar/.config/polybar/monitor_0/config_bottom.ini index 8941cc9d2..9359f3b5c 100644 --- a/polybar/.config/polybar/monitor_0/config_bottom.ini +++ b/polybar/.config/polybar/monitor_0/config_bottom.ini @@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2" font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2" font-3 = "MaterialIcons:antialias=true:size=12;2" font-4 = "xos4 Terminus:antialias=true:size=12;2" -font-5 = "Noto Sans CJK JP:antialias=true:size=12;2" +font-5 = "Noto Sans CJK JP:antialias=true:size=7;2" font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2" ; Modules are added to one of the available blocks diff --git a/polybar/.config/polybar/monitor_0/config_top.ini b/polybar/.config/polybar/monitor_0/config_top.ini index 9263485ea..bbd21e9fe 100644 --- a/polybar/.config/polybar/monitor_0/config_top.ini +++ b/polybar/.config/polybar/monitor_0/config_top.ini @@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2" font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2" font-3 = "MaterialIcons:antialias=true:size=12;2" font-4 = "xos4 Terminus:antialias=true:size=12;2" -font-5 = "Noto Sans CJK JP:antialias=true:size=12;2" +font-5 = "Noto Sans CJK JP:antialias=true:size=7;2" font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2" ; Modules are added to one of the available blocks diff --git a/polybar/.config/polybar/monitor_1/config_bottom.ini b/polybar/.config/polybar/monitor_1/config_bottom.ini index 8941cc9d2..9359f3b5c 100644 --- a/polybar/.config/polybar/monitor_1/config_bottom.ini +++ b/polybar/.config/polybar/monitor_1/config_bottom.ini @@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2" font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2" font-3 = "MaterialIcons:antialias=true:size=12;2" font-4 = "xos4 Terminus:antialias=true:size=12;2" -font-5 = "Noto Sans CJK JP:antialias=true:size=12;2" +font-5 = "Noto Sans CJK JP:antialias=true:size=7;2" font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2" ; Modules are added to one of the available blocks diff --git a/polybar/.config/polybar/monitor_1/config_top.ini b/polybar/.config/polybar/monitor_1/config_top.ini index f191e74fd..08390d1ba 100644 --- a/polybar/.config/polybar/monitor_1/config_top.ini +++ b/polybar/.config/polybar/monitor_1/config_top.ini @@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2" font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2" font-3 = "MaterialIcons:antialias=true:size=12;2" font-4 = "xos4 Terminus:antialias=true:size=12;2" -font-5 = "Noto Sans CJK JP:antialias=true:size=12;2" +font-5 = "Noto Sans CJK JP:antialias=true:size=7;2" font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2" ; Modules are added to one of the available blocks diff --git a/rofi/.local/bin/rofi/music b/rofi/.local/bin/rofi/music index fd516b622..45871bdb2 100755 --- a/rofi/.local/bin/rofi/music +++ b/rofi/.local/bin/rofi/music @@ -3,7 +3,7 @@ # Auto updated? # Yes #File : -# repomenue_music +# music #Author: # The-Repo-Club [wayne6324@gmail.com] #Github: @@ -12,15 +12,16 @@ # Created: # Wed 10 March 2021, 12:34:47 PM [GMT] # Modified: -# Wed 07 December 2022, 11:01:08 PM [GMT] +# Mon 16 January 2023, 05:51:30 PM [GMT] # # Description: # # # shellcheck disable=all -MUSICPLAYER="ffplay -nodisp" -PLAYING_MSG=" Currently Playing :: " +MUSICPLAYER="mplayer" +CURRENT_SONG=$(lsof -c "$MUSICPLAYER" | grep -F ".mp3" | awk -F"/" '{ print $NF; }' | cut -d'.' -f1) +PLAYING_MSG="Currently Playing :: ${CURRENT_SONG}" for Song in "$HOME/Music/"*; do if [ -f "$Song" ]; then @@ -43,6 +44,7 @@ if [[ $ret -eq 0 ]]; then case $CHOICE in *.mp3 | *.flac | *.wav | *.ogg) folder=$HOME/Music + pkill "$MUSICPLAYER" $MUSICPLAYER "$folder/$CHOICE" & ;; *) @@ -51,11 +53,6 @@ if [[ $ret -eq 0 ]]; then esac elif [[ $ret -gt 1 ]]; then if [[ $ret -eq 10 ]]; then - echo "Option selected (stdout): $CHOICE" - echo "Return code: $ret" - elif [[ $ret -eq 11 ]]; then - echo "Option selected (stdout): $CHOICE" - echo "Return code: $ret" + pkill "$MUSICPLAYER" fi - exit $ret fi \ No newline at end of file diff --git a/rofi/.local/bin/rofi/powermenu b/rofi/.local/bin/rofi/powermenu index 2a9d0b87e..0a2d1e568 100755 --- a/rofi/.local/bin/rofi/powermenu +++ b/rofi/.local/bin/rofi/powermenu @@ -12,7 +12,7 @@ #Created: # Wed 07 December 2022, 11:01:52 PM [GMT] #Modified: -# Wed 07 December 2022, 11:02:38 PM [GMT] +# Mon 16 January 2023, 05:21:19 PM [GMT] # #Description: # This script defines just a mode for rofi instead of being a self-contained @@ -62,7 +62,7 @@ icons[shutdown]="\uf011" icons[cancel]="\u00d7" declare -A actions -actions[lockscreen]="multimonitorlock -l -- --time-str=\"%I:%M:%S %p\"" +actions[lockscreen]="loginctl lock-session" actions[logout]="pkill -KILL -u ${USER}" actions[suspend]="systemctl suspend" actions[hibernate]="systemctl hibernate" @@ -243,7 +243,7 @@ if [ -z "${selection+x}" ] then getuptime echo -e "\0prompt\x1fPower Menu" - echo -en "\0message\x1f\tUptime :: ${state^}\n" + echo -en "\0message\x1fUptime :: ${state^}\n" for entry in "${show[@]}" do echo -e "${messages[$entry]}\0icon\x1f${icons[$entry]}" diff --git a/rofi/.local/bin/rofi/wifimanager b/rofi/.local/bin/rofi/wifimanager index 79bdfcdb9..bf80ce445 100755 --- a/rofi/.local/bin/rofi/wifimanager +++ b/rofi/.local/bin/rofi/wifimanager @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #-*-coding:utf-8 -*- #Auto updated? # Yes @@ -12,7 +12,7 @@ #Created: # Wed 07 December 2022, 11:01:26 PM [GMT] #Modified: -# Wed 07 December 2022, 11:01:44 PM [GMT] +# Mon 16 January 2023, 05:33:28 PM [GMT] # #Description: # @@ -46,6 +46,7 @@ function network_options() { if [ -z "$connection" ]; then echo "-=|> Connect to a Network" echo "-=|> Connect to a Hidden Network" + connection="N/A" elif [ ! -z "$connection" ]; then echo "-=|> Connect to a Network" echo "-=|> Connect to a Hidden Network" @@ -62,7 +63,7 @@ function main_scrn() { # Main window to be displayed on start network_status network_options echo -en "\x00prompt\x1fWifi\n" - echo -en "\0message\x1f\tWIFI Status :: ${state^}\t\tConnected to :: ${connection}\n" + echo -en "\0message\x1fWIFI Status :: ${state^}\t\tConnected to :: ${connection}\n" echo -en "-=|> Delete existing connections\n" echo -en "-=|> Refresh\n" }