From 7341aaee8865d6b87a3437a2f7107bdcb064f453 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Fri, 17 Dec 2021 23:14:15 -0500 Subject: [PATCH] Initial commit --- Xresources | 38 -------------------------------------- bashrc | 1 - config/bspwm/bspwmrc | 32 -------------------------------- config/nvim/init.vim | 16 ++++++++++++++-- config/polybar/config.ini | 6 ------ config/polybar/modules.ini | 1 - config/rofi/config.rasi | 7 +++++++ config/sxhkd/sxhkdrc | 11 ----------- install.sh | 28 ---------------------------- 9 files changed, 21 insertions(+), 119 deletions(-) create mode 100644 config/rofi/config.rasi diff --git a/Xresources b/Xresources index 6d59971..ae9cde9 100644 --- a/Xresources +++ b/Xresources @@ -1,14 +1,8 @@ ! ----------------------------------------------------------------------------- -<<<<<<< HEAD ! Colors: gruvbox-dark, forest night, zenburn ! Source: https://github.com/morhetz/gruvbox-generalized ! https://github.com/jef/forest-night-xresources ! https://github.com/jnurmine/Zenburn -======= -! Based on: gruvbox-dark.xresources -! Description: Retro groove colorscheme generalized -! Source: https://github.com/morhetz/gruvbox-generalized ->>>>>>> 3b76aa3 (Fix rebase conflicts) ! ----------------------------------------------------------------------------- ! Laptop screen DPI @@ -21,7 +15,6 @@ Xft.hinting: 1 Xft.antialias: 1 Xft.rgba: rgb -<<<<<<< HEAD !---------! ! Gruvbox ! ! --------! @@ -119,37 +112,6 @@ Xft.rgba: rgb ! ! LightGrey + White ! *color7: #dcdccc ! *color15: #ffffff -======= -! hard contrast: *background: #1d2021 -! medium contrast: *background: #282828 -! soft contrast: *background: #32302f -*background: #1d2021 -*foreground: #ebdbb2 -! Black + DarkGrey -*color0: #282828 -*color8: #928374 -! DarkRed + Red -*color1: #cc241d -*color9: #fb4934 -! DarkGreen + Green -*color2: #98971a -*color10: #b8bb26 -! DarkYellow + Yellow -*color3: #d79921 -*color11: #fabd2f -! DarkBlue + Blue -*color4: #458588 -*color12: #83a598 -! DarkMagenta + Magenta -*color5: #b16286 -*color13: #d3869b -! DarkCyan + Cyan -*color6: #689d6a -*color14: #8ec07c -! LightGrey + White -*color7: #a89984 -*color15: #ebdbb2 ->>>>>>> 3b76aa3 (Fix rebase conflicts) !!! urxvt URxvt.perl-ext-common: default,matcher diff --git a/bashrc b/bashrc index 91e264d..6c11fd5 100644 --- a/bashrc +++ b/bashrc @@ -15,4 +15,3 @@ alias kssh="/usr/bin/kitty +kitten ssh" neofetch [ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh - diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index c6bbbaa..93fbfb3 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -15,49 +15,27 @@ bspc rule -a vlc state=floating bspc rule -a Blueman-manager state=floating bspc rule -a Bitwarden state=floating bspc rule -a Leafpad state=floating -<<<<<<< HEAD bspc rule -a KeePassXC state=floating bspc rule -a firefox desktop='^1' follow=on -======= - -bspc rule -a firefox desktop='^1' follow=on -bspc rule -a Brave-browser desktop='^2' follow=on ->>>>>>> 3b76aa3 (Fix rebase conflicts) bspc rule -a Chromium desktop='^2' follow=on bspc rule -a Evince desktop='4' follow=on bspc rule -a Soffice desktop='^4' follow=on bspc rule -a Xsane desktop='^4' follow=on state=floating bspc rule -a kitty desktop='^6' follow=on -<<<<<<< HEAD bspc rule -a URxvt desktop='^6' follow=on bspc rule -a URxvt:Ranger desktop='^3' follow=on -======= -bspc rule -a Konsole desktop='^6' follow=on -bspc rule -a URxvt desktop='^6' follow=on -bspc rule -a Eclipse desktop='^6' follow=on -bspc rule -a Ranger desktop='^3' follow=on ->>>>>>> 3b76aa3 (Fix rebase conflicts) bspc rule -a Thunar desktop='3' follow=on bspc rule -a Steam desktop='^5' follow=on state=floating bspc rule -a Lutris desktop='^5' follow=on state=floating bspc rule -a origin.exe desktop='^5' state=floating bspc rule -a Emacs desktop='^7' follow=on state=tiled -<<<<<<< HEAD bspc rule -a discord desktop='^8' bspc rule -a Element desktop='^8' bspc rule -a Slack desktop='^9' bspc rule -a teams-for-linux desktop='^9' bspc rule -a Evolution desktop='^10' bspc rule -a Thunderbird desktop='^10' -======= -bspc rule -a jetbrains-pycharm-ce desktop='^7' follow=on -bspc rule -a Clementine desktop='^8' follow=on -bspc rule -a Spotify desktop='^8' follow=on -bspc rule -a Element desktop='^9' -bspc rule -a Mattermost desktop='9' -bspc rule -a Slack desktop='^9' ->>>>>>> 3b76aa3 (Fix rebase conflicts) bspc rule -a tutanota-desktop desktop='^10' ### Focus on 1st workspace by default @@ -65,7 +43,6 @@ bspc desktop -f 1 ### Autostart grep -x sxhkd > /dev/null || sxhkd & -<<<<<<< HEAD /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock & xidlehook --not-when-audio --not-when-fullscreen --timer 120 "xrandr --output eDP-1 --brightness .1" "xrandr --output eDP-1 --brightness 1" --timer 480 "xset s activate" "xrandr --output eDP-1 --brightness 1" & @@ -74,12 +51,3 @@ $HOME/.local/bin/single-polybar-launcher & /usr/bin/dunst & dex -ae bspwm & /usr/bin/birdtray & -======= -/usr/bin/dunst & -/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & -xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock & -xidlehook --not-when-audio --not-when-fullscreen --timer 120 "xrandr --output eDP-1 --brightness .1" "xrandr --output eDP-1 --brightness 1" --timer 480 "xset s activate" "xrandr --output eDP-1 --brightness 1" & -$HOME/.local/bin/single-polybar-launcher & -sh ~/.fehbg & -dex -ae bspwm & ->>>>>>> 3b76aa3 (Fix rebase conflicts) diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 78d7564..ce69d99 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -86,8 +86,8 @@ endif " Set contrast. " This configuration option should be placed before `colorscheme everforest`. " Available values: 'hard', 'medium'(default), 'soft' -let g:everforest_background = 'medium' -" For better performance +let g:everforest_background = 'soft' +" For better performanc let g:everforest_better_performance = 1 colorscheme everforest @@ -99,3 +99,15 @@ colorscheme everforest " NERDTree Toggle nmap k :NERDTreeToggle + +" CoC completion +inoremap + \ pumvisible() ? "\" : + \ CheckBackspace() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! CheckBackspace() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction diff --git a/config/polybar/config.ini b/config/polybar/config.ini index 0690272..c31d47e 100644 --- a/config/polybar/config.ini +++ b/config/polybar/config.ini @@ -36,15 +36,9 @@ dim-value = 1.0 locale = en_US.UTF-8 font-0 = Hack:size=10;3 -<<<<<<< HEAD font-1 = Font Awesome 6 Free:style=Solid:size=12;3 font-2 = Font Awesome 6 Free:style=Regular:size=12;3 font-3 = Font Awesome 6 Brands:style=Regular:size=12;3 -======= -font-1 = Font Awesome 5 Free:style=Solid:size=12;3 -font-2 = Font Awesome 5 Free:style=Regular:size=12;3 -font-3 = Font Awesome 5 Brands:style=Regular:size=12;3 ->>>>>>> 3b76aa3 (Fix rebase conflicts) modules-left = workspaces sep title modules-center = spotify diff --git a/config/polybar/modules.ini b/config/polybar/modules.ini index 33b8f0b..89d5be0 100644 --- a/config/polybar/modules.ini +++ b/config/polybar/modules.ini @@ -895,4 +895,3 @@ label-active-padding = 1 label-urgent-padding = 1 label-occupied-padding = 1 label-empty-padding = 1 - diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi new file mode 100644 index 0000000..0cc3812 --- /dev/null +++ b/config/rofi/config.rasi @@ -0,0 +1,7 @@ +/** Basic config file **/ + +configuration { + show-icons: true; + icon-theme: "Papirus"; +} +@import "/usr/share/rofi/themes/gruvbox-dark-hard.rasi" diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 0b1bec7..c9e5fd7 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -8,11 +8,7 @@ super + Return # program launcher super + @space -<<<<<<< HEAD rofi -dpi 240 -modi drun, run -show drun -show-icons -======= - rofi -dpi 240 -modi drun, run -show drun ->>>>>>> 3b76aa3 (Fix rebase conflicts) # power menu super + @End @@ -160,17 +156,10 @@ XF86AudioMicMute pactl set-source-mute @DEFAULT_SOURCE@ toggle XF86MonBrightnessDown -<<<<<<< HEAD xbacklight -dec 2 XF86MonBrightnessUp xbacklight -inc 2 -======= - xbacklight -dec 5 - -XF86MonBrightnessUp - xbacklight -inc 5 ->>>>>>> 3b76aa3 (Fix rebase conflicts) XF86Display mirror-outputs diff --git a/install.sh b/install.sh index fc3c4e8..47ca93e 100755 --- a/install.sh +++ b/install.sh @@ -25,10 +25,6 @@ cp -a $config_dir/dunst $backup/ cp -a $config_dir/kitty $backup/ cp -a $config_dir/nvim $backup/ cp -a $config_dir/polybar $backup/ -<<<<<<< HEAD -======= -cp -a $config_dir/ranger $backup/ ->>>>>>> 3b76aa3 (Fix rebase conflicts) cp -a $bin_dir $backup/ # Delete current files and folders @@ -43,10 +39,6 @@ rm -rf $config_dir/dunst rm -rf $config_dir/kitty rm -rf $config_dir/nvim rm -rf $config_dir/polybar -<<<<<<< HEAD -======= -rm -rf $config_dir/ranger/ ->>>>>>> 3b76aa3 (Fix rebase conflicts) rm -rf $bin_dir # Create HOME symlinks @@ -59,37 +51,20 @@ ln -sf $dotfiles_dir/vimrc ~/.vimrc ln -sf $dotfiles_dir/Xresources ~/.Xresources # Create $config_dir, sub-directories, and symlinks -<<<<<<< HEAD mkdir -p $config_dir/{bspwm,dunst,kitty,nvim,polybar,rofi,sxhkd} ln -sf $dotfiles_dir/config/bspwm/bspwmrc $config_dir/bspwm/bspwmrc ln -sf $dotfiles_dir/config/dunst/dunstrc $config_dir/dunst/dunstrc ln -sf $dotfiles_dir/config/kitty/kitty.conf $config_dir/kitty/kitty.conf #ln -sf $dotfiles_dir/config/kitty/gruvbox.conf $config_dir/kitty/gruvbox.conf ln -sf $dotfiles_dir/config/kitty/zenburn.conf $config_dir/kitty/zenburn.conf -======= -mkdir -p $config_dir/{bspwm,dunst,kitty,nvim,polybar,ranger,rofi,sxhkd} -ln -sf $dotfiles_dir/config/bspwm/bspwmrc $config_dir/bspwm/bspwmrc -ln -sf $dotfiles_dir/config/dunst/dunstrc $config_dir/dunst/dunstrc -ln -sf $dotfiles_dir/config/kitty/kitty.conf $config_dir/kitty/kitty.conf -ln -sf $dotfiles_dir/config/kitty/gruvbox.conf $config_dir/kitty/gruvbox.conf ->>>>>>> 3b76aa3 (Fix rebase conflicts) ln -sf $dotfiles_dir/config/nvim/init.vim $config_dir/nvim/init.vim ln -sf $dotfiles_dir/config/polybar/config.ini $config_dir/polybar/config.ini ln -sf $dotfiles_dir/config/polybar/colors.ini $config_dir/polybar/colors.ini ln -sf $dotfiles_dir/config/polybar/modules.ini $config_dir/polybar/modules.ini ln -sf $dotfiles_dir/config/polybar/custom_modules.ini $config_dir/polybar/custom_modules.ini -<<<<<<< HEAD ln -sf $dotfiles_dir/config/rofi/config.everforest.rasi $config_dir/rofi/config.rasi #ln -sf $dotfiles_dir/config/rofi/config.gruvbox.rasi $config_dir/rofi/config.rasi #ln -sf $dotfiles_dir/config/rofi/config.zenburn.rasi $config_dir/rofi/config.rasi -======= -ln -sf $dotfiles_dir/config/ranger/commands_full.py $config_dir/ranger/commands_full.py -ln -sf $dotfiles_dir/config/ranger/commands.py $config_dir/ranger/commands.py -ln -sf $dotfiles_dir/config/ranger/rc.conf $config_dir/ranger/rc.conf -ln -sf $dotfiles_dir/config/ranger/rifle.conf $config_dir/ranger/rifle.conf -ln -sf $dotfiles_dir/config/ranger/scope.sh $config_dir/ranger/scope.sh -ln -sf $dotfiles_dir/config/rofi/config.rasi $config_dir/rofi/config.rasi ->>>>>>> 3b76aa3 (Fix rebase conflicts) ln -sf $dotfiles_dir/config/sxhkd/sxhkdrc $config_dir/sxhkd/sxhkdrc # Create $bin_dir and symlinks @@ -101,8 +76,5 @@ ln -sf $dotfiles_dir/bin/toggle-wifi $bin_dir # Finishing up source ~/.bashrc source ~/.bash_profile -<<<<<<< HEAD source ~/.profile -======= ->>>>>>> 3b76aa3 (Fix rebase conflicts) xrdb ~/.Xresources