From c2c1944b95d8c2f552040c017eb0e8222c582b2e Mon Sep 17 00:00:00 2001 From: Mitja Felicijan Date: Mon, 14 Oct 2024 00:05:03 +0200 Subject: Cleanup and added script that creates symlinks --- README.md | 16 ++-------------- alacritty.yml | 20 -------------------- gf2_config.ini | 5 ----- helix.toml | 27 --------------------------- shenanigans.sh | 31 +------------------------------ update.sh | 6 ++++++ 6 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 alacritty.yml delete mode 100644 gf2_config.ini delete mode 100644 helix.toml create mode 100644 update.sh diff --git a/README.md b/README.md index a22b201..e85bb72 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,9 @@ ![Unga Bunga](https://github.com/mitjafelicijan/dotfiles/assets/296714/2ea7852a-8297-40c4-a9b1-0f6cba6c701f) -Clone the repo first... - ```sh git clone git@github.com:mitjafelicijan/dotfiles.git ~/.dotfiles -``` -Then create symbolic links to actual config files. - -```sh -ln -s ~/.dotfiles/alacritty.yml ~/.alacritty.yml -ln -s ~/.dotfiles/shenanigans.sh ~/.shenanigans.sh -ln -s ~/.dotfiles/helix.toml ~/.config/helix/config.toml -ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf -ln -s ~/.dotfiles/vimrc ~/.vimrc -ln -s ~/.dotfiles/newsboat ~/.newsboat/config -ln -s ~/.dotfiles/urls ~/.newsboat/urls -ln -s ~/.dotfiles/gf2_config.ini ~/.config/gf2_config.ini +# Create symbolic links to actual config files. +bash update.sh ``` diff --git a/alacritty.yml b/alacritty.yml deleted file mode 100644 index cfb0914..0000000 --- a/alacritty.yml +++ /dev/null @@ -1,20 +0,0 @@ -env: - TERM: xterm-256color - -window: - dimensions: - columns: 130 - lines: 60 - -font: - size: 18 - normal: - family: Berkeley Mono - bold: - family: Berkeley Mono - italic: - family: Berkeley Mono - -colors: - primary: - background: "#111111" diff --git a/gf2_config.ini b/gf2_config.ini deleted file mode 100644 index 2759329..0000000 --- a/gf2_config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[ui] -scale=1.6 -font_size_interface=16 -font_size_code=16 - diff --git a/helix.toml b/helix.toml deleted file mode 100644 index 5f0545a..0000000 --- a/helix.toml +++ /dev/null @@ -1,27 +0,0 @@ -# https://github.com/helix-editor/helix/blob/master/runtime/themes/jellybeans.toml -# Located in ~/.congfig/helix/runtime/themes/fattybeans.toml -# inherits = "jellybeans" -# "ui.background" ={} -theme = "fattybeans" - -[editor] -line-number = "relative" -color-modes = true -true-color = true -mouse = false -middle-click-paste = true -rulers = [80, 120] -idle-timeout = 1000 - -[editor.lsp] -display-messages = true -auto-signature-help = false - -[keys.normal] -"esc" = [ "collapse_selection", "keep_primary_selection" ] -"D" = [ "ensure_selections_forward", "extend_to_line_end", "delete_selection" ] -"C-left" = [ "goto_previous_buffer" ] -"C-right" = [ "goto_next_buffer" ] -"C-up" = [ "page_cursor_half_up" ] -"C-down" = [ "page_cursor_half_down" ] -"C-b" = [ ":sh make" ] diff --git a/shenanigans.sh b/shenanigans.sh index 13e73c9..a6777ab 100755 --- a/shenanigans.sh +++ b/shenanigans.sh @@ -1,5 +1,5 @@ # Software list. -# cifs-utils treei tig hstr s3cmd xclip mc gnupg ripgrep jq xmlstarlet fzf htop nvtop newsboat tmux ctags +# cifs-utils tree hstr s3cmd xclip mc gnupg ripgrep jq xmlstarlet htop nvtop newsboat tmux ctags # Magical environment variables. @@ -36,13 +36,10 @@ alias less='less -R' alias tmux='tmux -u' alias vi='vim' alias server='python3 -m http.server 6969' -alias www='lynx -accept_all_cookies -scrollbar https://lite.duckduckgo.com' -alias st='st -g 90x40 -f "BerkeleyMono:style=Bold:size=16:antialias=true:autohint:true"' # Custom folder jump commands. alias p='cd ~/Vault/projects' -alias n='cd ~/Vault/notes' alias j='cd ~/Junk/current' alias d='cd ~/Downloads' @@ -52,14 +49,6 @@ export PATH=$HOME/Applications:$PATH export PATH=$HOME/go/bin:$PATH export PATH=/usr/local/go/bin:$PATH -# Zig paths. -export PATH=$HOME/.local/bin/zls-x86_64-linux-0.13.0:$PATH -export PATH=$HOME/.local/bin/zig-linux-x86_64-0.14.0-dev.1587+feaee2ba1:$PATH - -# FZF settings. - -export FZF_DEFAULT_COMMAND='rg --files --hidden' - # History and search. Stolen from J. HISTCONTROL=ignoreboth @@ -75,11 +64,6 @@ if [[ $- =~ .i. ]]; then bind '"\C-h": "\C-a hstr -- \C-j"'; fi # Useful function. Much wow! -wow() { - cd ~/Games/turtlewow/ - ./start.sh -} - backup() { CWD=$(pwd) VHOME=/home/$USER/Vault @@ -91,11 +75,7 @@ backup() { # Make a copy of dotfiles. cp /home/$USER/.shenanigans.sh shenanigans.sh cp /home/$USER/.bash_history_infinite bash_history_infinite - cp /home/$USER/.smbcredentials smbcredentials cp /home/$USER/.gitconfig gitconfig - cp /home/$USER/.vimrc vimrc - cp /home/$USER/.tmux.conf tmux.conf - cp /home/$USER/.config/helix/config.toml config.toml cp /home/$USER/.newsboat/urls urls cp /home/$USER/.newsboat/cache.db cache.db @@ -105,15 +85,6 @@ backup() { find /home/$USER/Videos -type f -name "*.webm" -exec cp -n {} $VHOME/videos/ \; find /home/$USER/Pictures -type f -name "*.png" -exec cp -n {} $VHOME/pictures/ \; - cp -Rf /home/$USER/Notebooks ./ - - mkdir ../twow - cp -Rf /home/$USER/Games/turtlewow/Interface ../twow - cp -Rf /home/$USER/Games/turtlewow/WTF ../twow - cp -Rf /home/$USER/Games/turtlewow/start.sh ../twow/ - cp -Rf /home/$USER/Games/turtlewow/icon.png ../twow/ - cp -Rf /home/$USER/Games/turtlewow/start.sh ../twow/ - # Sync with NAS. rsync -azv \ --exclude '.venv/' \ diff --git a/update.sh b/update.sh new file mode 100644 index 0000000..82da5bd --- /dev/null +++ b/update.sh @@ -0,0 +1,6 @@ +ln -s ~/.dotfiles/shenanigans.sh ~/.shenanigans.sh +ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf +ln -s ~/.dotfiles/vimrc ~/.vimrc +ln -s ~/.dotfiles/newsboat ~/.newsboat/config +ln -s ~/.dotfiles/urls ~/.newsboat/urls + -- cgit v1.2.3