From 769dc7acd40f53057c4fbb4b40480f494947d8b4 Mon Sep 17 00:00:00 2001 From: Felix Wittwer Date: Mon, 25 Jul 2022 22:15:53 +0200 Subject: [PATCH] Update dotfiles --- .gitmodules | 6 ++++++ tycho/.gitconfig | 2 +- tycho/.vimrc | 26 ++++++++++++++++++++------ tycho/create_home.sh | 24 +++++++++++++----------- tycho/terminal/alacritty.yml | 25 ++++++++++++++----------- tycho/terminal/config.fish | 11 +++-------- 6 files changed, 57 insertions(+), 37 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3a5b571..45b4e91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,9 @@ [submodule "entropy/mail/neomutt/themes/dracula"] path = entropy/mail/neomutt/themes/dracula url = https://github.com/dracula/mutt.git +[submodule "tycho/mail/themes/powerline"] + path = tycho/mail/themes/powerline + url = git@github.com:sheoak/neomutt-powerline-nerdfonts.git +[submodule "tycho/mail/neomutt/themes"] + path = tycho/mail/neomutt/themes + url = git@github.com:sheoak/neomutt-powerline-nerdfonts.git diff --git a/tycho/.gitconfig b/tycho/.gitconfig index 5f14643..49fbbb0 100644 --- a/tycho/.gitconfig +++ b/tycho/.gitconfig @@ -1,7 +1,7 @@ [user] name = Felix Wittwer email = dev@felixwittwer.de - signingkey = EA0E8A99 + signingkey = F8634A1CFF7D61608503A70B24363525EA0E8A99 [push] default = simple [commit] diff --git a/tycho/.vimrc b/tycho/.vimrc index 636d9d8..a2c4a29 100644 --- a/tycho/.vimrc +++ b/tycho/.vimrc @@ -4,7 +4,8 @@ syntax on " enable autocompletion of ale let g:ale_completion_enabled = 1 " disable latex linting from ale as i've got my own plugin for that -let g:ale_linters = { 'tex': []} +let g:ale_linters = {'rust': ['analyzer'], 'tex': []} +let g:ale_fixers = {'c': ['clang-format']} " Initialize plugin system @@ -32,6 +33,7 @@ Plug 'justinmk/vim-sneak' Plug 'lervag/vimtex' Plug 'editorconfig/editorconfig-vim' Plug 'LnL7/vim-nix' +Plug 'xevz/vim-squirrel' Plug 'preservim/nerdtree' " Plugin outside ~/.vim/plugged with post-update hook @@ -50,7 +52,20 @@ call plug#end() set laststatus=2 let g:airline#extensions#tabline#enabled = 1 -let g:airline_powerline_fonts = 1 +"let g:airline_powerline_fonts = 1 + +" window switching by # +let g:airline_section_c = '[%{winnr()}] %t' +nnoremap 1 1w +nnoremap 2 2w +nnoremap 3 3w +nnoremap 4 4w +nnoremap 5 5w +nnoremap 6 6w +nnoremap 7 7w +nnoremap 8 8w +nnoremap 9 9w +nnoremap 0 10w " possible setting as alternative for easymotion " let g:sneak#label = 1 @@ -60,10 +75,6 @@ set backspace=indent,eol,start " map the leader key to , let mapleader="," -" set filetypes -au BufRead,BufNewFile *.ohuac setfiletype rust -au BufRead,BufNewFile *.ohuao setfiletype json - " Cycling through windows and tabs -- made by Pius :D " nnoremap j " nnoremap k @@ -104,6 +115,9 @@ set tabstop=4 set shiftwidth=4 set expandtab +" keep 5 lines of context above/below the cursor (if possible) +set scrolloff=5 + " Search set hlsearch " Highlight all search results set smartcase " Enable smart-case search diff --git a/tycho/create_home.sh b/tycho/create_home.sh index feaeebf..8bcc1c1 100755 --- a/tycho/create_home.sh +++ b/tycho/create_home.sh @@ -49,7 +49,7 @@ sudo defaults write /Library/Preferences/SystemConfiguration/com.apple.smb.serve printf "\033[33m[info] Linking config files\033[39m" -ln -s $pwd/.gitconfig ~/.gitconfig +ln -s $PWD/.gitconfig ~/.gitconfig ln -s $PWD/.global_gitignore ~/.global_gitignore ln -s $PWD/git-commit-template.txt ~/.gitcommit_template @@ -74,30 +74,32 @@ if test ! $(which nix-env); then curl -L https://nixos.org/nix/install | sh fi +# TODO: Need to source? +nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs +nix-channel --update printf "\033[33m[info] Installing some basic binaries\033[39m" brew install fish +sudo echo "/usr/local/bin/fish" >> /etc/shells chsh -s /usr/local/bin/fish binaries=( pass - python git + keepingyouawake + alacritty + starship + lsd + bat + homebrew/cask-fonts/font-hack-nerd-font + homebrew/cask-versions/firefox-nightly ) brew install ${binaries[@]} -apps=( - kitty - font-hack-nerd-font - keepingyouawake -) - -brew cask install ${apps[@]} - printf "\033[33m[info] Cloning password store\033[39m" -git clone felix@decima:~/pass-backup ~/.password_store +git clone felix@decima:~/pass-backup ~/.password-store printf "\033[33m[info] Setting up neomutt\033[39m" diff --git a/tycho/terminal/alacritty.yml b/tycho/terminal/alacritty.yml index 7f0309e..c9242e5 100644 --- a/tycho/terminal/alacritty.yml +++ b/tycho/terminal/alacritty.yml @@ -21,6 +21,13 @@ window: columns: 0 lines: 0 + # Background opacity + # + # Window opacity as a floating point number from `0.0` to `1.0`. + # The value `0.0` is completely transparent and `1.0` is opaque. + opacity: 1.0 + + # Window position (changes require restart) # # Specified in number of pixels. @@ -34,8 +41,8 @@ window: # Blank space added around the window in pixels. This padding is scaled # by DPI and the specified value is always added at both opposing sides. padding: - x: 10 - y: 10 + x: 0 + y: 0 # Spread additional padding evenly around the terminal content. dynamic_padding: false @@ -49,7 +56,7 @@ window: # Values for `decorations` (macOS only): # - transparent: Title bar, transparent background and title bar buttons # - buttonless: Title bar, transparent background, but no title bar buttons - decorations: none + decorations: full # Startup Mode (changes require restart) # @@ -98,7 +105,9 @@ font: # - (macOS) Menlo # - (Linux) monospace # - (Windows) Consolas - family: "Hack Nerd Font" + family: "Iosevka Term Medium" + #family: "Hack Nerd Font" + #family: "Menlo" # The `style` can be specified to pick a specific face. #style: Regular @@ -137,7 +146,7 @@ font: #style: Bold Italic # Point size - size: 11.0 + size: 12.0 # Offset is the extra space around each character. `offset.y` can be thought of # as modifying the line spacing, and `offset.x` as modifying the letter spacing. @@ -275,12 +284,6 @@ bell: duration: 0 color: '0xffffff' -# Background opacity -# -# Window opacity as a floating point number from `0.0` to `1.0`. -# The value `0.0` is completely transparent and `1.0` is opaque. -background_opacity: 1.0 - selection: semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" diff --git a/tycho/terminal/config.fish b/tycho/terminal/config.fish index c657c22..7676580 100644 --- a/tycho/terminal/config.fish +++ b/tycho/terminal/config.fish @@ -11,13 +11,8 @@ export LC_ALL="en_GB.UTF-8" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/Library/TeX/texbin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/Library/Python/3.8/bin" -export GOPATH="/Users/felix/.gostuff" - -# FUCK configuration -thefuck --alias | source - # kitty terminal emulator auto completion -kitty + complete setup fish | source +# kitty + complete setup fish | source # fancier ls alias ls="lsd" @@ -29,7 +24,7 @@ alias code="codium" alias fsrpass="env PASSWORD_STORE_DIR=/Users/felix/fsr/passwords pass" ## some aliases taken from old zshrc -alias full-update="brew update; brew upgrade; brew cleanup; apm update --confirm false; rustup self update; rustup update" +alias full-update="brew update; brew upgrade; brew cleanup; rustup self update; rustup update" alias l="lsd -la" alias calculator="python3 -i -c 'from math import *'" alias music="screen -dR music cmus" @@ -66,4 +61,4 @@ end set fish_function_path $fish_function_path $HOME/.config/fish/plugin-foreign-env/functions # initialize nix -fenv source '$HOME/.nix-profile/etc/profile.d/nix.sh' +fenv source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'