From afb072c0cc8dbf1383072c9de334a7e59684206c Mon Sep 17 00:00:00 2001 From: har0ke Date: Tue, 3 Oct 2023 13:56:53 +0200 Subject: [PATCH] General cleanup --- .config/Code/User/settings.json | 8 +------- .config/i3/config | 32 +++++-------------------------- .vimrc | 15 ++++----------- arch.sh | 1 + etc/acpi/toggle_mute.sh | 5 ++--- etc/acpi/volume.sh | 2 +- install_code_extensions.sh | 13 +++++++++++++ install.sh => install_dotfiles.sh | 0 install_vimplug.sh | 3 +++ scripts/clear_red | 5 +++-- scripts/i3lock_oke | 2 ++ scripts/mod_keys | 1 + 12 files changed, 36 insertions(+), 51 deletions(-) create mode 100755 install_code_extensions.sh rename install.sh => install_dotfiles.sh (100%) diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index ac42ec8..ab2c053 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -53,19 +53,13 @@ "**/*.o.cmd": true, "**/*.o.d": true }, - "workbench.editorAssociations": [ - { - "viewType": "jupyter-notebook", - "filenamePattern": "*.ipynb" - } - ], "git.confirmSync": false, "editor.rulers": [ 80, 120 ], "window.zoomLevel": 1, "C_Cpp.loggingLevel": "Information", - "editor.tabSize": 8, + "editor.tabSize": 4, "terminal.integrated.scrollback": 10000, "files.insertFinalNewline": true, } diff --git a/.config/i3/config b/.config/i3/config index fcc26a9..16a40ba 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -13,9 +13,9 @@ set $terminal xterm set $mod Mod3 set $screenlock ~/.dotfiles/scripts/i3lock_oke -exec_always --no-startup-id "bash ~/.dotfiles/scripts/mod_keys" +exec_always --no-startup-id ~/.dotfiles/scripts/mod_keys -exec --no-startup-id bash ~/.dotfiles/scripts/clear_red +exec --no-startup-id ~/.dotfiles/scripts/clear_red exec --no-startup-id xidlehook --detect-sleep --not-when-fullscreen --timer 60 'xbacklight -get > .last_backlight; xbacklight -set 1' 'xbacklight -set $(cat .last_backlight)' exec --no-startup-id xidlehook --detect-sleep --not-when-fullscreen --timer 240 '$screenlock' '' exec --no-startup-id xidlehook --detect-sleep --not-when-fullscreen --not-when-audio --timer 1200 'systemctl suspend' '' @@ -70,7 +70,8 @@ bindsym Mod4+l exec $screenlock # 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" +#bindsym $mod+space exec "rofi -modi windowcd,window -show windowcd" +bindsym $mod+space exec "rofi -show combi -modes combi,drun,run,ssh -combi-modes 'window,drun,run,ssh' -show-icons" # 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 @@ -117,7 +118,7 @@ bindsym $mod+e layout toggle split bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle +# bindsym $mod+space focus mode_toggle # focus the parent container bindsym $mod+a focus parent @@ -142,22 +143,6 @@ for_window [workspace=$ws2] layout stacked for_window [workspace=$ws8] layout stacked for_window [workspace=$ws9] layout stacked -# EDITORS - -assign [class="code"] $ws2 -assign [class="Code"] $ws2 - -# WEB -for_window [class="firefox"] move container to workspace $ws3 - -# CHAT -assign [class="TelegramDesktop"] $ws8 -assign [class="Thunderbird"] $ws8 -for_window [class="linphone"] move container to workspace $ws8 -for_window [class="Gajim"] move container to workspace $ws8 -# MEDIA -for_window [class="Spotify"] move container to workspace $ws9 - # for_window [class="Chromium"] layout stacked # for_window [class="Chromium"] move container to workspace $ws9 @@ -166,13 +151,6 @@ exec --no-startup-id i3-msg 'workspace $ws8; exec thunderbird' exec --no-startup-id protonmail-bridge --no-window exec --no-startup-id nextcloud -exec --no-startup-id i3-msg 'workspace $ws3; exec firefox' -exec --no-startup-id code - - -exec --no-startup-id spotify - - # must be last exec --no-startup-id i3-msg 'workspace $ws1; exec "xterm -e \\"$HOME/.winfo.sh; zsh\\""' diff --git a/.vimrc b/.vimrc index 99399ae..efcf003 100644 --- a/.vimrc +++ b/.vimrc @@ -1,30 +1,19 @@ au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif -if exists(':PlugInstall') - call plug#begin('~/.vim/plugged') Plug 'tpope/vim-sensible' Plug 'NLKNguyen/papercolor-theme' Plug 'vim-scripts/DfrankUtil' Plug 'vim-scripts/vimprj' - Plug 'ctrlpvim/ctrlp.vim' -Plug 'ycm-core/YouCompleteMe', { 'do': './install.py' } -Plug 'scrooloose/nerdtree' - -if system('which ctags') =~ "ctags" -Plug 'vim-scripts/indexer.tar.gz' -endif call plug#end() set background=light colorscheme PaperColor -endif - map j map k map h @@ -47,3 +36,7 @@ highlight Pmenu ctermbg=gray guibg=gray :set shiftwidth=4 :set expandtab :set smartindent + +let g:netrw_banner=0 " disable annoying banner +let g:netrw_liststyle=3 " tree view +let g:netrw_chgwin=1 diff --git a/arch.sh b/arch.sh index 06278d3..07b44b7 100755 --- a/arch.sh +++ b/arch.sh @@ -46,6 +46,7 @@ declare -ar i3_environment=( i3status-rust i3lock-color playerctl + rofi ttf-font-awesome wmctrl xidlehook pkgconf # undocumented dependency diff --git a/etc/acpi/toggle_mute.sh b/etc/acpi/toggle_mute.sh index 9e3b341..7eed730 100755 --- a/etc/acpi/toggle_mute.sh +++ b/etc/acpi/toggle_mute.sh @@ -1,3 +1,4 @@ +#!/usr/bin/bash sinks=$(pactl list sinks short | grep RUNNING | awk '{ print $1 }') if [ -z "$sinks" ]; then @@ -6,9 +7,7 @@ fi echo "$sinks" - - for SINK in $sinks do - pactl set-sink-mute $SINK toggle + pactl set-sink-mute "${SINK}" toggle done diff --git a/etc/acpi/volume.sh b/etc/acpi/volume.sh index c70238f..81f1372 100755 --- a/etc/acpi/volume.sh +++ b/etc/acpi/volume.sh @@ -1,4 +1,4 @@ - +#!/usr/bin/bash sinks=$(pactl list sinks short | grep RUNNING | awk '{ print $1 }') if [ -z "$sinks" ]; then diff --git a/install_code_extensions.sh b/install_code_extensions.sh new file mode 100755 index 0000000..9acbf6e --- /dev/null +++ b/install_code_extensions.sh @@ -0,0 +1,13 @@ +#!/usr/bin/bash +code \ + --install-extension rozbo.papercolor-vscode \ + --install-extension dcasella.i3 \ + --install-extension ms-python.python \ + --install-extension ms-python.vscode-pylance \ + --install-extension ms-vscode.cpptools \ + --install-extension ms-vscode-remote.remote-ssh \ + --install-extension ms-vscode-remote.remote-ssh-edit \ + --install-extension ms-vscode.remote-explorer \ + --install-extension timonwong.shellcheck \ + --install-extension twxs.cmake \ + --install-extension voidei.vscode-vimrc diff --git a/install.sh b/install_dotfiles.sh similarity index 100% rename from install.sh rename to install_dotfiles.sh diff --git a/install_vimplug.sh b/install_vimplug.sh index ca07ade..cf504a2 100755 --- a/install_vimplug.sh +++ b/install_vimplug.sh @@ -1,3 +1,6 @@ +#!/usr/bin/bash + curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +vim +'PlugInstall --sync' +qa diff --git a/scripts/clear_red b/scripts/clear_red index a41c580..3ba321d 100755 --- a/scripts/clear_red +++ b/scripts/clear_red @@ -1,7 +1,8 @@ #!/bin/bash -for run in {1..200}; do + +for _ in {1..200}; do sleep .001 for win in $(wmctrl -l | awk -F' ' '{print $1}'); do - wmctrl -i -r $win -b remove,demands_attention + wmctrl -i -r "${win}" -b remove,demands_attention done done diff --git a/scripts/i3lock_oke b/scripts/i3lock_oke index 9864e0f..9bd87a5 100755 --- a/scripts/i3lock_oke +++ b/scripts/i3lock_oke @@ -1,3 +1,5 @@ +#!/usr/bin/bash + i3lock \ -c003344 \ --time-color=#ffffff88 \ diff --git a/scripts/mod_keys b/scripts/mod_keys index 209aafa..fd09883 100755 --- a/scripts/mod_keys +++ b/scripts/mod_keys @@ -1,4 +1,5 @@ #!/usr/bin/bash + setxkbmap -layout de -option caps:hyper xmodmap ~/.Xmodmap