From ce3e8ddf1aa7992a1a3eb82cd8c97c9e415e835c Mon Sep 17 00:00:00 2001 From: Cian Bagshaw Date: Thu, 29 Jun 2023 23:57:36 +0100 Subject: [PATCH] Tidied .config Removed redundencies, such as folders with only one file, or "rc" and "conf" suffixes. --- .../{alacritty/alacritty.yml => alacritty} | 0 .config/{i3/config => i3} | 8 +-- .config/{i3blocks/config => i3blocks} | 0 .config/{npmrc => npm} | 0 .config/{picom.conf => picom} | 0 .config/{pythonrc.py => python} | 3 + .config/{vim/vimrc => vim} | 2 +- .config/vim/.gitignore | 1 - .config/vim/colors/slate_mod.vim | 56 ------------------- .config/{wgetrc => wget} | 0 .config/x11 | 23 ++++++++ .config/xinitrc | 23 -------- .profile | 14 ++--- 13 files changed, 38 insertions(+), 92 deletions(-) rename .config/{alacritty/alacritty.yml => alacritty} (100%) rename .config/{i3/config => i3} (94%) rename .config/{i3blocks/config => i3blocks} (100%) rename .config/{npmrc => npm} (100%) rename .config/{picom.conf => picom} (100%) rename .config/{pythonrc.py => python} (59%) rename .config/{vim/vimrc => vim} (95%) delete mode 100644 .config/vim/.gitignore delete mode 100644 .config/vim/colors/slate_mod.vim rename .config/{wgetrc => wget} (100%) create mode 100755 .config/x11 delete mode 100755 .config/xinitrc diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty similarity index 100% rename from .config/alacritty/alacritty.yml rename to .config/alacritty diff --git a/.config/i3/config b/.config/i3 similarity index 94% rename from .config/i3/config rename to .config/i3 index ec57a2a..29915bf 100755 --- a/.config/i3/config +++ b/.config/i3 @@ -13,8 +13,8 @@ bindsym $mod+Shift+minus exec notify-send " $(vol Capture 5%-) (-5%)" bindsym $mod+Shift+backslash exec notify-send " $(vol Capture toggle)" # start a terminal -bindsym $mod+Return exec alacritty -bindsym $mod+Shift+Return exec alacritty --class "floatTerm" +bindsym $mod+Return exec alacritty --config-file "$XDG_CONFIG_HOME/alacritty" +bindsym $mod+Shift+Return exec alacritty --config-file "$XDG_CONFIG_HOME/alacritty" --class "floatTerm" # kill focused window bindsym $mod+Shift+q kill @@ -138,7 +138,7 @@ bar { # commands i3bar_command i3bar --transparency - status_command i3blocks + status_command i3blocks -c "$XDG_CONFIG_HOME/i3blocks" # styling height 25 @@ -160,7 +160,7 @@ bar { } # keybinds -bindsym $mod+x exec i3lock -i ~/.config/wall.png -t +bindsym $mod+x exec i3lock -tefi "$XDG_DATA_HOME/wall.png" bindsym $mod+c exec maim -s ~/capture-$(date +%s).png bindsym $mod+y exec mpv /dev/video0 --no-cache --profile=low-latency --untimed --no-osc --x11-name=webcam bindsym $mod+m exec mpv $(xclip -o) --cache=yes diff --git a/.config/i3blocks/config b/.config/i3blocks similarity index 100% rename from .config/i3blocks/config rename to .config/i3blocks diff --git a/.config/npmrc b/.config/npm similarity index 100% rename from .config/npmrc rename to .config/npm diff --git a/.config/picom.conf b/.config/picom similarity index 100% rename from .config/picom.conf rename to .config/picom diff --git a/.config/pythonrc.py b/.config/python similarity index 59% rename from .config/pythonrc.py rename to .config/python index 97f1642..e026454 100644 --- a/.config/pythonrc.py +++ b/.config/python @@ -1,3 +1,6 @@ +#!/usr/bin/python +# run on each Python shell + # disable history import readline readline.set_auto_history(False) diff --git a/.config/vim/vimrc b/.config/vim similarity index 95% rename from .config/vim/vimrc rename to .config/vim index 2ab79e4..bdfc211 100644 --- a/.config/vim/vimrc +++ b/.config/vim @@ -1,6 +1,6 @@ " use ~/.config/vim, see https://vi.stackexchange.com/a/20067 set viminfofile=NONE -set runtimepath+=$XDG_CONFIG_HOME/vim +set runtimepath+=$XDG_DATA_HOME/vim " double-tap 'j' to enter normal mode inoremap jj diff --git a/.config/vim/.gitignore b/.config/vim/.gitignore deleted file mode 100644 index ea547e8..0000000 --- a/.config/vim/.gitignore +++ /dev/null @@ -1 +0,0 @@ -viminfo* diff --git a/.config/vim/colors/slate_mod.vim b/.config/vim/colors/slate_mod.vim deleted file mode 100644 index 821c904..0000000 --- a/.config/vim/colors/slate_mod.vim +++ /dev/null @@ -1,56 +0,0 @@ -"%% SiSU Vim color file -" Slate Maintainer: Ralph Amissah -" (originally looked at desert Hans Fugal http://hans.fugal.net/vim/colors/desert.vim (2003/05/06) -:set background=dark -:highlight clear -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let colors_name = "slate_mod" -:hi Normal guifg=White guibg=grey15 -:hi Cursor guibg=khaki guifg=slategrey -:hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse -:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey -:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7 -:hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green -:hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown -:hi MoreMsg guifg=SeaGreen ctermfg=darkgreen -:hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue -:hi Question guifg=springgreen ctermfg=green -:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue -:hi SpecialKey guifg=yellowgreen ctermfg=darkgreen -:hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse -:hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse -:hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow -:hi Statement guifg=CornflowerBlue ctermfg=lightblue -:hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse -:hi WarningMsg guifg=salmon ctermfg=1 -:hi String guifg=SkyBlue ctermfg=darkcyan -:hi Comment term=bold ctermfg=11 guifg=grey40 -:hi Constant guifg=#ffa0a0 ctermfg=brown -:hi Special guifg=darkkhaki ctermfg=brown -:hi Identifier guifg=salmon ctermfg=red -:hi Include guifg=red ctermfg=red -:hi PreProc guifg=red guibg=white ctermfg=red -:hi Operator guifg=Red ctermfg=Red -:hi Define guifg=gold gui=bold ctermfg=yellow -:hi Type guifg=CornflowerBlue ctermfg=2 -:hi Function guifg=navajowhite ctermfg=brown -:hi Structure guifg=green ctermfg=green -:hi LineNr guifg=grey50 ctermfg=3 -:hi Ignore guifg=grey40 cterm=bold ctermfg=7 -:hi Todo guifg=orangered guibg=yellow2 -:hi Directory ctermfg=darkcyan -:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1 -:hi VisualNOS cterm=bold,underline -:hi WildMenu ctermfg=0 ctermbg=3 -:hi DiffAdd ctermbg=4 -:hi DiffChange ctermbg=5 -:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 -:hi DiffText cterm=bold ctermbg=1 -:hi Underlined cterm=underline ctermfg=5 -:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1 -:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1 diff --git a/.config/wgetrc b/.config/wget similarity index 100% rename from .config/wgetrc rename to .config/wget diff --git a/.config/x11 b/.config/x11 new file mode 100755 index 0000000..b34e924 --- /dev/null +++ b/.config/x11 @@ -0,0 +1,23 @@ +#!/bin/sh +# ~/.config/x11 - run on startx + +# error file +ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors" + +# daemons +picom --config "$XDG_CONFIG_HOME/picom" & +dunst -conf "$XDG_CONFIG_HOME/dunst" & +nm-applet & +redshift-gtk -c "$XDG_CONFIG_HOME/redshift" & + +# wallpaper +xwallpaper --zoom "$XDG_DATA_HOME/wall.png" + +# pywal theme +wal -Rn & + +# auto-repeat +xset r rate 300 50 + +# start i3wm +i3 -c "$XDG_CONFIG_HOME/i3" diff --git a/.config/xinitrc b/.config/xinitrc deleted file mode 100755 index 984818c..0000000 --- a/.config/xinitrc +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# ~/.config/xinitrc - run on startx - -# error file -ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors" - -# daemons -picom & -dunst & -nm-applet & -redshift-gtk & - -# wallpaper -xwallpaper --zoom ~/.config/wall.png - -# pywal theme -wal -Rn & - -# auto-repeat -xset r rate 300 50 - -# start i3wm -i3 diff --git a/.profile b/.profile index 3dc79d0..ae63c74 100644 --- a/.profile +++ b/.profile @@ -22,15 +22,15 @@ export XDG_STATE_HOME="$HOME/.local/state" export XDG_RUNTIME_DIR="/run/user/$UID" # config file locations -export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" -export XINITRC="$XDG_CONFIG_HOME/xinitrc" +export VIMINIT="source $XDG_CONFIG_HOME/vim" +export XINITRC="$XDG_CONFIG_HOME/x11" export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch" -export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtkrc" -export PYTHONSTARTUP="$XDG_CONFIG_HOME/pythonrc.py" -export WGETRC="$XDG_CONFIG_HOME/wgetrc" -export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config" +export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk" +export PYTHONSTARTUP="$XDG_CONFIG_HOME/python" +export WGETRC="$XDG_CONFIG_HOME/wget" +export MBSYNCRC="$XDG_CONFIG_HOME/mbsync" export W3M_DIR="$XDG_CONFIG_HOME/w3m" -export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npmrc" +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm" # local library locations export GROFF_TMAC_PATH="$HOME/.local/lib/groff" -- 2.20.1