diff --git a/.config/ncmpcpp/error.log b/.config/ncmpcpp/error.log deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md index e12b84f..80a514c 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ My dotfiles. ## Installation -Copy all the folders in here (including hidden ones like .config) to your home directory. -You don't need .git, and you probably don't need my scripts in .local/bin. +Symlink all the files in src/ to your home directory using the provided dotinstall.sh script, or manually. +Otherwise, copy them manually to your home directory. After, install the programs that I have dots for. A list is provided in the programs file. diff --git a/dotinstall.sh b/dotinstall.sh new file mode 100755 index 0000000..5f5161b --- /dev/null +++ b/dotinstall.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +cd src + +echo Making directories +for f in $(find -type d); do + DIR=$HOME$(echo $f | cut -c 2-) + echo $DIR + mkdir $DIR +done + +echo Symlinking dotfiles +for f in $(find -type f); do + DEST=$HOME$(echo $f | cut -c 2-) + SRC=$PWD$(echo $f | cut -c 2-) + echo $SRC $DEST + ln -s $SRC $DEST +done diff --git a/.Xresources b/src/.Xresources similarity index 100% rename from .Xresources rename to src/.Xresources diff --git a/.config/dunst/dunstrc b/src/.config/dunst/dunstrc similarity index 99% rename from .config/dunst/dunstrc rename to src/.config/dunst/dunstrc index 4570253..50ec9cb 100644 --- a/.config/dunst/dunstrc +++ b/src/.config/dunst/dunstrc @@ -62,7 +62,7 @@ # The transparency of the window. range: [0; 100] # This option will only work if a compositing windowmanager is present (e.g. xcompmgr, compiz, etc..) - transparency = 0 + transparency = 50 # Don't remove messages, if the user is idle (no mouse or keyboard input) # for longer than idle_threshold seconds. diff --git a/src/.config/ncmpcpp/bindings b/src/.config/ncmpcpp/bindings new file mode 100644 index 0000000..6d6034d --- /dev/null +++ b/src/.config/ncmpcpp/bindings @@ -0,0 +1,40 @@ +def_key "t" + find +def_key "t" + find_item_forward + +def_key "+" + show_clock +def_key "=" + volume_up + +def_key "j" + scroll_down +def_key "k" + scroll_up + +def_key "ctrl-u" + page_up +#push_characters "kkkkkkkkkkkkkkk" +def_key "ctrl-d" + page_down +#push_characters "jjjjjjjjjjjjjjj" + +def_key "h" + previous_column +def_key "l" + next_column + +def_key "." + show_lyrics + +def_key "n" + next_found_item +def_key "N" + previous_found_item + +# not used but bound +def_key "J" + move_sort_order_down +def_key "K" + move_sort_order_up diff --git a/.config/ncmpcpp/config b/src/.config/ncmpcpp/config similarity index 93% rename from .config/ncmpcpp/config rename to src/.config/ncmpcpp/config index 3044152..682fefd 100644 --- a/.config/ncmpcpp/config +++ b/src/.config/ncmpcpp/config @@ -1,12 +1,12 @@ ## # Files - mpd_music_dir = "~/Music" - lyrics_directory = ~/.ncmpcpp/lyrics - ncmpcpp_directory = ~/.ncmpcpp + mpd_music_dir = "~/med/mus" + lyrics_directory = ~/.cache/lyrics + ncmpcpp_directory = ~/.config/ncmpcpp mpd_host = "localhost" mpd_port = "6600" mpd_connection_timeout = "5" - mpd_crossfade_time = "5" + mpd_crossfade_time = "2" # Playlist playlist_disable_highlight_delay = "0" @@ -47,7 +47,7 @@ visualizer_color = white #visualizer_type = "wave" (spectrum/wave) visualizer_type = "wave_filled" (spectrum/wave) visualizer_in_stereo = "yes" -visualizer_look = "●▮" +visualizer_look = ".." ## Navigation ## diff --git a/.config/nvim/init.vim b/src/.config/nvim/init.vim similarity index 64% rename from .config/nvim/init.vim rename to src/.config/nvim/init.vim index f74e15b..2072a0c 100755 --- a/.config/nvim/init.vim +++ b/src/.config/nvim/init.vim @@ -1,5 +1,4 @@ -set tabstop=4 shiftwidth=4 noexpandtab relativenumber ai nu rnu nosmd noruler -set guifont=JetBrains\ Mono:h16 +set tabstop=4 shiftwidth=4 noexpandtab relativenumber ai nu rnu nosmd hi Search cterm=NONE ctermfg=white ctermbg=blue hi StatusLine ctermbg=NONE cterm=italic @@ -7,17 +6,9 @@ hi StatusLine ctermbg=NONE cterm=italic autocmd InsertEnter * hi StatusLine cterm=bold autocmd InsertLeave * hi StatusLine cterm=italic -let g:neovide_cursor_animation_length=0.13 - highlight LineNr ctermfg=grey highlight EndOfBuffer ctermfg=black ctermbg=black -map :FloatermToggle -tnoremap :FloatermToggle - call plug#begin() -Plug 'voldikss/vim-floaterm' Plug 'ycm-core/youcompleteme' call plug#end() - -tnoremap diff --git a/.config/picom/picom.conf b/src/.config/picom/picom.conf similarity index 64% rename from .config/picom/picom.conf rename to src/.config/picom/picom.conf index 057c61e..09a5701 100644 --- a/.config/picom/picom.conf +++ b/src/.config/picom/picom.conf @@ -1,25 +1,30 @@ -inactive-opacity = .7; -active-opacity = .725; +inactive-opacity = .6; +active-opacity = .625; shadow = true; +vsync = true; + opacity-rule = [ "100:class_g = 'Gimp'", "100:class_g = 'Sxiv'", "100:class_g = 'mpv'", - "100:class_g = 'feh'", + "100:class_g = 'obs'", "100:class_g = 'Blender'", + "100:class_g = 'st-256color'", "100:class_g = 'org.remmina.Remmina'", "100:class_g = 'LibreWolf'", "100:class_g = 'xonotic-sdl'", + "100:class_g = 'DarkPlaces'", + "100:class_g = 'Qemu-system-x86_64'", + "100:class_g = 'Element'", + "100:class_g = 'eDEX-UI'", "60:class_g = 'qutebrowser'", "1:id = 0x1e00001", - "100:class_g = 'VirtualBox Machine'" ]; blur-background-exclude = [ "class_g = 'conky'", - "class_g = 'GLava'", "class_g = 'dwm'" ] @@ -31,5 +36,5 @@ fade-delta = 5; blur: { method = "dual_kawase"; - strength = 10; + strength = 12; }; diff --git a/.config/qutebrowser/config.py b/src/.config/qutebrowser/config.py similarity index 95% rename from .config/qutebrowser/config.py rename to src/.config/qutebrowser/config.py index c3860bd..c171bce 100644 --- a/.config/qutebrowser/config.py +++ b/src/.config/qutebrowser/config.py @@ -20,7 +20,11 @@ c.window.transparent = True c.scrolling.smooth = True c.url.default_page = "about:blank" c.url.start_pages = "about:blank" -c.url.searchengines = {"DEFAULT":"https://search.disroot.org/search?q={}"} +c.url.searchengines = {"DEFAULT":"https://searx.be/search?q={}"} + +# Downloads + +c.downloads.remove_finished = 1000 # Bar settings diff --git a/.config/wall.png b/src/.config/wall.png similarity index 100% rename from .config/wall.png rename to src/.config/wall.png diff --git a/.config/zathura/zathurarc b/src/.config/zathura/zathurarc similarity index 100% rename from .config/zathura/zathurarc rename to src/.config/zathura/zathurarc diff --git a/.config/zsh/.zshrc b/src/.config/zsh/.zshrc similarity index 100% rename from .config/zsh/.zshrc rename to src/.config/zsh/.zshrc diff --git a/.config/zsh/aliases.zsh b/src/.config/zsh/aliases.zsh similarity index 82% rename from .config/zsh/aliases.zsh rename to src/.config/zsh/aliases.zsh index f8167e3..a730e1d 100644 --- a/.config/zsh/aliases.zsh +++ b/src/.config/zsh/aliases.zsh @@ -1,9 +1,11 @@ # Color ls alias ls='ls --color=auto' -# Limit mpv to 1080p so it doesn't buffer +# Limit mpv and youtube-dl to 1080p so it doesn't use too much bandwidth alias mpv='mpv --ytdl-format="bestvideo[ext=mp4][height<=?1080]+bestaudio[ext=m4a]"' +alias youtube-dl='youtube-dl -f "bestvideo[ext=mp4][height<=?1080]+bestaudio[ext=m4a]"' + # Set gpg tty so curses pinentry works alias gpgt='export GPG_TTY=$(tty)' diff --git a/.local/bin/cleanup b/src/.local/bin/cleanup similarity index 100% rename from .local/bin/cleanup rename to src/.local/bin/cleanup diff --git a/.local/bin/kcon b/src/.local/bin/kcon similarity index 100% rename from .local/bin/kcon rename to src/.local/bin/kcon diff --git a/src/.local/bin/mon-on.example b/src/.local/bin/mon-on.example new file mode 100755 index 0000000..488d9b9 --- /dev/null +++ b/src/.local/bin/mon-on.example @@ -0,0 +1,5 @@ +#!/bin/sh + +# Example of per host xrandr script + +xrandr --output eDP-1 --mode 1920x1080 --right-of DP-1 --output DP-2-1 --primary --mode 2560x1440 --left-of DP-1 --output DP-1 --mode 2560x1440 diff --git a/.local/bin/notification-sound.sh b/src/.local/bin/notification-sound.sh similarity index 100% rename from .local/bin/notification-sound.sh rename to src/.local/bin/notification-sound.sh diff --git a/.local/bin/s.sh b/src/.local/bin/s.sh similarity index 100% rename from .local/bin/s.sh rename to src/.local/bin/s.sh diff --git a/.local/bin/sedi b/src/.local/bin/sedi similarity index 100% rename from .local/bin/sedi rename to src/.local/bin/sedi diff --git a/.local/bin/ss.sh b/src/.local/bin/ss.sh similarity index 100% rename from .local/bin/ss.sh rename to src/.local/bin/ss.sh diff --git a/.local/bin/update-grub b/src/.local/bin/update-grub similarity index 100% rename from .local/bin/update-grub rename to src/.local/bin/update-grub diff --git a/.local/bin/upkern b/src/.local/bin/upkern similarity index 88% rename from .local/bin/upkern rename to src/.local/bin/upkern index 4658908..abbe36c 100755 --- a/.local/bin/upkern +++ b/src/.local/bin/upkern @@ -10,6 +10,7 @@ cd /usr/src/linux # Store config in /usr/src/.config cp .config ../.config +cp .config /home/dogeystamp/dox/bak/kernelconf # Switch to new kernel eselect kernel set $1 diff --git a/src/.local/bin/wallpaper.example b/src/.local/bin/wallpaper.example new file mode 100644 index 0000000..5c63a06 --- /dev/null +++ b/src/.local/bin/wallpaper.example @@ -0,0 +1,5 @@ +#!/bin/sh + +# Per host wallpaper configuration example + +xwallpaper --output DP-2-1 --center med/pix/dow/ml.png --output DP-1 --center med/pix/dow/mr.png --output eDP-1 --center med/pix/dow/m.png diff --git a/.xinitrc b/src/.xinitrc similarity index 67% rename from .xinitrc rename to src/.xinitrc index 14d4b23..d0ed722 100755 --- a/.xinitrc +++ b/src/.xinitrc @@ -5,8 +5,8 @@ xset r rate 300 50 mon-on picom --experimental-backends --backend glx & xwallpaper --center .config/wall.png -# For use on my machines -#xwallpaper --output DP-2-1 --center med/pix/dow/ml.png --output DP-1 --center med/pix/dow/mr.png --output eDP-1 --center med/pix/dow/m.png +# Host specific wallpapers +wallpaper xss-lock -- slock & dunst & xrdb .Xresources diff --git a/.zshenv b/src/.zshenv similarity index 100% rename from .zshenv rename to src/.zshenv