diff --git a/README.md b/README.md index ed7c00c5..ccfd2f7a 100644 --- a/README.md +++ b/README.md @@ -7,21 +7,10 @@ This is a collection of my dotfiles. ``` git clone git://github.com/webgefrickel/dotfiles ~/dotfiles cd ~/dotfiles -./install/_install.sh +./install/install.sh ``` -If you are having problems with khd/kwm, run this command and reboot: - -``` -sudo launchctl config user path $PATH -``` - -This will add your path variable for all services and fixes an issue -where khd could not find the kwmc executable. - - -Now change the file `.gitconfig.user` in your home-folder and -provide your git credentials, such as: +Now change the file `.gitconfig.user` in your home-folder and provide your git credentials, such as: ``` [user] @@ -32,16 +21,7 @@ provide your git credentials, such as: token = 1235687641287364 ``` -Finally restart your terminal and vim again, and you are ready to go. - ## Additional stuff -There are additional installation script for commonly used -CLI-tools and software (mainly macOS specific) and some color -schemes for different terminal emulators, see the folders -install/, alfred/ and other/. - -## Vim +There are additional installation script for commonly used CLI-tools and software (mainly macOS specific) and config for mutt/neovim, see the folders install/, alfred/ and other/. -I use neovim as a default, with some selected plugins. Those -plugins are managed with dein, see nvim/bundles.vim. diff --git a/install/cli-tools.sh b/install/cli-tools.sh index 98c23174..8e037a45 100755 --- a/install/cli-tools.sh +++ b/install/cli-tools.sh @@ -10,18 +10,21 @@ brew install git-ftp brew install httpd brew install imagemagick brew install mariadb -brew install mkcert +brew install mkcert brew install nss brew install openssl -brew install php +brew install php@7.3 brew install ripgrep brew install youtube-dl +read -p "Press any key to continue... " -n1 -s # dnsmasq echo 'address=/.localhost/127.0.0.1' > /usr/local/etc/dnsmasq.conf sudo brew services start dnsmasq sudo mkdir -v /etc/resolver sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/localhost' +read -p "Press any key to continue... " -n1 -s # php sudo pecl install imagick +read -p "Press any key to continue... " -n1 -s diff --git a/install/install.sh b/install/install.sh index ff1a22d7..13c62238 100755 --- a/install/install.sh +++ b/install/install.sh @@ -72,6 +72,7 @@ read -p "Press any key to continue... " -n1 -s # set terminal to xterm-256color! # now restart your terminal and hope for the best +read -p "Now set terminal to xterm-256color, restart and hope for the best..." -n1 -s # set zsh to the default sudo vim /etc/shells diff --git a/install/node.sh b/install/node.sh index 17a47948..dc8ec345 100755 --- a/install/node.sh +++ b/install/node.sh @@ -6,6 +6,8 @@ npm update -g npm install -g diff-so-fancy npm install -g eslint + +# Do we need this config globally?! npm install -g eslint-config-xo-space npm install -g fkill-cli npm install -g htmlhint @@ -14,6 +16,8 @@ npm install -g neovim npm install -g npm-check-updates npm install -g prettier npm install -g pure-prompt + +# REPLACE with stylelint npm install -g sass-lint npm install -g trash-cli npm install -g yarn diff --git a/install/office.sh b/install/office.sh index b7af9bf1..8d8887e7 100755 --- a/install/office.sh +++ b/install/office.sh @@ -10,6 +10,7 @@ brew install neomutt/neomutt/neomutt --with-gpgme brew install ripmime brew install w3m brew install vdirsyncer +read -p "Press any key to continue... " -n1 -s # python dependencies (for mutt) sudo pip3 install -I urlscan @@ -19,10 +20,9 @@ mkdir ~/Contacts mkdir ~/Mail mkdir ~/Mail/mailbox mkdir ~/Mail/viu -mkdir ~/Mail/mf -mkdir ~/Mail/kfi ln -s ~/dotfiles/office/mutt ~/.mutt ln -s ~/dotfiles/office/mbsyncrc ~/.mbsyncrc ln -s ~/dotfiles/office/msmtprc ~/.msmtprc ln -s ~/dotfiles/office/khard ~/.config/khard ln -s ~/dotfiles/office/vdirsyncer ~/.vdirsyncer +read -p "Press any key to continue... " -n1 -s diff --git a/install/osx.sh b/install/osx.sh deleted file mode 100755 index 5bec83a6..00000000 --- a/install/osx.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env zsh -# -# Thanks a lot to http://mths.be/osx -# This is just a minimal fork of stuff I always need -# -# Ask for the administrator password upfront -sudo -v - -# Keep-alive: update existing `sudo` time stamp until `.osx` has finished -while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & - -# Set computer name (as done via System Preferences → Sharing) -sudo scutil --set ComputerName "langohr" -sudo scutil --set HostName "langohr" -sudo scutil --set LocalHostName "langohr" -sudo defaults write /Library/Preferences/SystemConfiguration/com.apple.smb.server NetBIOSName -string "langohr" - -# Finder: show hidden files by default -defaults write com.apple.finder AppleShowAllFiles -bool true - -# UTF-8 all the things -# Only use UTF-8 in Terminal.app -defaults write com.apple.terminal StringEncodings -array 4 -# Open and save files as UTF-8 in TextEdit -defaults write com.apple.TextEdit PlainTextEncoding -int 4 -defaults write com.apple.TextEdit PlainTextEncodingForWrite -int 4 - -# Expand save panel by default -defaults write NSGlobalDomain NSNavPanelExpandedStateForSaveMode -bool true -defaults write NSGlobalDomain NSNavPanelExpandedStateForSaveMode2 -bool true - -# Expand print panel by default -defaults write NSGlobalDomain PMPrintingExpandedStateForPrint -bool true -defaults write NSGlobalDomain PMPrintingExpandedStateForPrint2 -bool true - -# Save to disk (not to iCloud) by default -defaults write NSGlobalDomain NSDocumentSaveNewDocumentsToCloud -bool false - -# Automatically quit printer app once the print jobs complete -defaults write com.apple.print.PrintingPrefs "Quit When Finished" -bool true - -# Disable Resume system-wide -defaults write com.apple.systempreferences NSQuitAlwaysKeepsWindows -bool false - -# Disable smart quotes as they’re annoying when typing code -defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -bool false - -# Disable smart dashes as they’re annoying when typing code -defaults write NSGlobalDomain NSAutomaticDashSubstitutionEnabled -bool false - -# Trackpad: disable tap to click for this user and for the login screen, the new macbooks touchpad is so sensitive -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool false -defaults -currentHost write NSGlobalDomain com.apple.mouse.tapBehavior -int 0 -defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 0 - -# Enable full keyboard access for all controls -# (e.g. enable Tab in modal dialogs) -defaults write NSGlobalDomain AppleKeyboardUIMode -int 3 - -# Wipe all (default) app icons from the Dock -defaults write com.apple.dock persistent-apps -array - -# Dont Show indicator lights for open applications in the Dock -defaults write com.apple.dock show-process-indicators -bool false - -# Disable Dashboard -defaults write com.apple.dashboard mcx-disabled -bool true - -# Don’t show Dashboard as a Space -defaults write com.apple.dock dashboard-in-overlay -bool true - -# Remove the auto-hiding Dock delay -defaults write com.apple.dock autohide-delay -float 0 -# Remove the animation when hiding/showing the Dock -defaults write com.apple.dock autohide-time-modifier -float 0 - -# Automatically hide and show the Dock -defaults write com.apple.dock autohide -bool true - -# showing and hiding Mission Control, command+numbers -defaults write com.apple.dock expose-animation-duration -float 0 - -# showing and hiding Launchpad -defaults write com.apple.dock springboard-show-duration -float 0 -defaults write com.apple.dock springboard-hide-duration -float 0 -# opening and closing windows and popovers -defaults write -g NSAutomaticWindowAnimationsEnabled -bool false - -# smooth scrolling -defaults write -g NSScrollAnimationEnabled -bool false - -# showing and hiding sheets, resizing preference windows, zooming windows -# float 0 doesn't work -defaults write -g NSWindowResizeTime -float 0.001 - -# opening and closing Quick Look windows -defaults write -g QLPanelAnimationDuration -float 0 - -# deactivate stupid chrome mouse gestures -defaults write com.google.Chrome AppleEnableSwipeNavigateWithScrolls -bool FALSE - -# dont show suggestions when typing l etc. multiple times -defaults write -g ApplePressAndHoldEnabled -bool false - -# Fix forklift selection colors -# defaults write com.binarynights.ForkLift-3 VividSelectionColors true - diff --git a/install/software.sh b/install/software.sh index c30b75de..c8a2d3f2 100755 --- a/install/software.sh +++ b/install/software.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash brew tap buo/cask-upgrade brew tap homebrew/cask-drivers +read -p "Press any key to continue... " -n1 -s # brew cask and install software brew cask install 1password @@ -15,7 +16,6 @@ brew cask install imagealpha brew cask install imageoptim brew cask install kap brew cask install karabiner-elements -brew cask install libreoffice brew cask install ngrok brew cask install qlcolorcode brew cask install qlstephen @@ -24,9 +24,9 @@ brew cask install sketch brew cask install skype brew cask install spotify brew cask install telegram -brew cask install transmission brew cask install vlc brew cask install vmware-fusion +read -p "Press any key to continue... " -n1 -s # Drivers and other software brew cask install ubiquiti-unifi-controller diff --git a/karabiner/automatic_backups/karabiner_20190909.json b/karabiner/automatic_backups/karabiner_20190909.json deleted file mode 100644 index f4051713..00000000 --- a/karabiner/automatic_backups/karabiner_20190909.json +++ /dev/null @@ -1,232 +0,0 @@ -{ - "global": { - "check_for_updates_on_startup": true, - "show_in_menu_bar": false, - "show_profile_name_in_menu_bar": false - }, - "profiles": [ - { - "complex_modifications": { - "parameters": { - "basic.simultaneous_threshold_milliseconds": 50, - "basic.to_delayed_action_delay_milliseconds": 500, - "basic.to_if_alone_timeout_milliseconds": 1000, - "basic.to_if_held_down_threshold_milliseconds": 500 - }, - "rules": [ - { - "manipulators": [ - { - "description": "Change right option to hyper/esc", - "from": { - "key_code": "right_option", - "modifiers": { - "optional": [ - "any" - ] - } - }, - "to": [ - { - "key_code": "left_control", - "modifiers": [ - "left_command", - "left_option", - "left_shift" - ] - } - ], - "to_if_alone": [ - { - "key_code": "escape" - } - ], - "type": "basic" - }, - { - "description": "Change caps lock to control/escape", - "from": { - "key_code": "caps_lock", - "modifiers": { - "optional": [ - "any" - ] - } - }, - "to": [ - { - "key_code": "left_control", - "modifiers": [] - } - ], - "to_if_alone": [ - { - "key_code": "escape" - } - ], - "type": "basic" - }, - { - "description": "Change left control lock to control/escape", - "from": { - "key_code": "left_control", - "modifiers": { - "optional": [ - "any" - ] - } - }, - "to": [ - { - "key_code": "left_control", - "modifiers": [] - } - ], - "to_if_alone": [ - { - "key_code": "escape" - } - ], - "type": "basic" - } - ] - } - ] - }, - "devices": [ - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": true, - "is_pointing_device": false, - "product_id": 34304, - "vendor_id": 1452 - }, - "ignore": true, - "manipulate_caps_lock_led": true, - "simple_modifications": [] - }, - { - "disable_built_in_keyboard_if_exists": true, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": true, - "is_pointing_device": false, - "product_id": 256, - "vendor_id": 2131 - }, - "ignore": false, - "manipulate_caps_lock_led": false, - "simple_modifications": [] - } - ], - "fn_function_keys": [ - { - "from": { - "key_code": "f1" - }, - "to": { - "key_code": "display_brightness_decrement" - } - }, - { - "from": { - "key_code": "f2" - }, - "to": { - "key_code": "display_brightness_increment" - } - }, - { - "from": { - "key_code": "f3" - }, - "to": { - "key_code": "mission_control" - } - }, - { - "from": { - "key_code": "f4" - }, - "to": { - "key_code": "launchpad" - } - }, - { - "from": { - "key_code": "f5" - }, - "to": { - "key_code": "illumination_decrement" - } - }, - { - "from": { - "key_code": "f6" - }, - "to": { - "key_code": "illumination_increment" - } - }, - { - "from": { - "key_code": "f7" - }, - "to": { - "key_code": "rewind" - } - }, - { - "from": { - "key_code": "f8" - }, - "to": { - "key_code": "play_or_pause" - } - }, - { - "from": { - "key_code": "f9" - }, - "to": { - "key_code": "fastforward" - } - }, - { - "from": { - "key_code": "f10" - }, - "to": { - "key_code": "mute" - } - }, - { - "from": { - "key_code": "f11" - }, - "to": { - "key_code": "volume_decrement" - } - }, - { - "from": { - "key_code": "f12" - }, - "to": { - "key_code": "volume_increment" - } - } - ], - "name": "Default profile", - "selected": true, - "simple_modifications": [], - "virtual_hid_keyboard": { - "caps_lock_delay_milliseconds": 0, - "country_code": 0, - "keyboard_type": "ansi" - } - } - ] -} \ No newline at end of file diff --git a/nvim/leaderkeys.vim b/nvim/leaderkeys.vim index 17194093..1f3ce47e 100644 --- a/nvim/leaderkeys.vim +++ b/nvim/leaderkeys.vim @@ -32,8 +32,8 @@ command! TogglePrettier call s:TogglePrettier() nnoremap z :ToggleZoom " ale -nnoremap f :TogglePrettier nnoremap e :ALENext +nnoremap f :TogglePrettier " open new vertical split and change to split nnoremap \ vl diff --git a/office/mbsyncrc b/office/mbsyncrc index ae2bb500..311ddb57 100644 --- a/office/mbsyncrc +++ b/office/mbsyncrc @@ -128,133 +128,3 @@ Channel viu-sent Channel viu-trash Channel viu-junk -################################# -######## Account mf ############# -################################# - -IMAPAccount mf -Host tobaco.kasserver.com -User s.rademacker@medienfreunde.com -PassCmd "security find-internet-password -s 'tobaco.kasserver.com' -a 's.rademacker@medienfreunde.com' -w" -SSLType IMAPS -SSLVersions TLSv1.2 -CertificateFile ~/dotfiles/office/certificates.crt - -# Remote storage -IMAPStore mf-remote -Account mf - -# Local storage -MaildirStore mf-local -Path ~/Mail/mf/ -Inbox ~/Mail/mf/INBOX - -Channel mf-inbox -Master :mf-remote:"INBOX" -Slave :mf-local:INBOX -Create Both -Expunge Both - -Channel mf-archive -Master :mf-remote:"Archiv" -Slave :mf-local:archive -Create Both -Expunge Both - -Channel mf-drafts -Master :mf-remote:"Entw&APw-rfe" -Slave :mf-local:drafts -Create Both -Expunge Both - -Channel mf-sent -Master :mf-remote:"Gesendet" -Slave :mf-local:sent -Create Both -Expunge Both - -Channel mf-trash -Master :mf-remote:"Papierkorb" -Slave :mf-local:trash -Create Both -Expunge Both - -Channel mf-junk -Master :mf-remote:"Spam" -Slave :mf-local:junk -Create Both -Expunge Both - -Group mf -Channel mf-inbox -Channel mf-archive -Channel mf-drafts -Channel mf-sent -Channel mf-trash -Channel mf-junk - -################################# -######## Account kfi ############ -################################# - -IMAPAccount kfi -Host mx.kf-interactive.com -User steffen.rademacker@kf-interactive.com -PassCmd "security find-internet-password -s 'mx.kf-interactive.com' -a 'steffen.rademacker@kf-interactive.com' -w" -SSLType IMAPS -SSLVersions TLSv1.2 -CertificateFile ~/dotfiles/office/certificates.crt - -# Remote storage -IMAPStore kfi-remote -Account kfi - -# Local storage -MaildirStore kfi-local -Path ~/Mail/kfi/ -Inbox ~/Mail/kfi/INBOX - -Channel kfi-inbox -Master :kfi-remote:"INBOX" -Slave :kfi-local:INBOX -Create Both -Expunge Both - -Channel kfi-archive -Master :kfi-remote:"Archives" -Slave :kfi-local:archive -Create Both -Expunge Both - -Channel kfi-drafts -Master :kfi-remote:"Drafts" -Slave :kfi-local:drafts -Create Both -Expunge Both - -Channel kfi-sent -Master :kfi-remote:"Sent Messages" -Slave :kfi-local:sent -Create Both -Expunge Both - -Channel kfi-trash -Master :kfi-remote:"Deleted Messages" -Slave :kfi-local:trash -Create Both -Expunge Both - -Channel kfi-junk -Master :kfi-remote:"Junk" -Slave :kfi-local:junk -Create Both -Expunge Both - -Group kfi -Channel kfi-inbox -Channel kfi-archive -Channel kfi-drafts -Channel kfi-sent -Channel kfi-trash -Channel kfi-junk - diff --git a/office/msmtprc b/office/msmtprc index f0fa61e2..d1f8f23d 100644 --- a/office/msmtprc +++ b/office/msmtprc @@ -9,28 +9,6 @@ tls on tls_starttls off tls_trust_file ~/dotfiles/office/certificates.crt -account kfi -host mx.kf-interactive.com -port 465 -protocol smtp -auth on -user steffen.rademacker@kf-interactive.com -from steffen.rademacker@kf-interactive.com -tls on -tls_starttls off -tls_trust_file ~/dotfiles/office/certificates.crt - -account mf -host tobaco.kasserver.com -port 465 -protocol smtp -auth on -user s.rademacker@medienfreunde.com -from s.rademacker@medienfreunde.com -tls on -tls_starttls off -tls_trust_file ~/dotfiles/office/certificates.crt - account viu host smtp.office365.com port 587 diff --git a/office/mutt/accounts/kfi b/office/mutt/accounts/kfi deleted file mode 100644 index 18f0d554..00000000 --- a/office/mutt/accounts/kfi +++ /dev/null @@ -1,33 +0,0 @@ -set from = "steffen.rademacker@kf-interactive.com" -set sendmail = "/usr/local/bin/msmtp -a kfi" - -# Set folders -set spoolfile = "+kfi/INBOX" -set mbox = "+kfi/archive" -set postponed = "+kfi/drafts" -set record = "+kfi/sent" -set trash = "+kfi/trash" - -# Alternate email addresses. -alternates ^steffen.rademacker@kf-interactive.com$ - -# custom signaure -set signature = ~/.mutt/signatures/default - -color status green default - -macro index o "mbsync kfi" "run mbsync to sync mail for this account" - -macro index,pager J \ - "set my_old_resolve=\$resolve noresolve\ - nset resolve=\$my_old_resolve\ - +kfi/junk" \ - "mark as read and move to junk folder" - -macro index,pager A \ - "+kfi/archive" \ - "move message to the archive" - -macro index,pager I \ - "+kfi/INBOX" \ - "move message to the inbox" diff --git a/office/mutt/accounts/mf b/office/mutt/accounts/mf deleted file mode 100644 index 19aee433..00000000 --- a/office/mutt/accounts/mf +++ /dev/null @@ -1,33 +0,0 @@ -set from = "s.rademacker@medienfreunde.com" -set sendmail = "/usr/local/bin/msmtp -a mf" - -# Set folders -set spoolfile = "+mf/INBOX" -set mbox = "+mf/archive" -set postponed = "+mf/drafts" -set record = "+mf/sent" -set trash = "+mf/trash" - -# Alternate email addresses. -alternates ^s.rademacker@medienfreunde.com$ - -# custom signaure -set signature = ~/.mutt/signatures/default - -color status blue default - -macro index o "mbsync mf" "run mbsync to sync mail for this account" - -macro index,pager J \ - "set my_old_resolve=\$resolve noresolve\ - nset resolve=\$my_old_resolve\ - +mf/junk" \ - "mark as read and move to junk folder" - -macro index,pager A \ - "+mf/archive" \ - "move message to the archive" - -macro index,pager I \ - "+mf/INBOX" \ - "move message to the inbox" diff --git a/office/mutt/muttrc b/office/mutt/muttrc index 9dcae1fc..d1e05957 100644 --- a/office/mutt/muttrc +++ b/office/mutt/muttrc @@ -90,17 +90,12 @@ set sidebar_indent_string = ' '' set sidebar_format = "%B %* [%?N?%N / ?%S]" # Mailboxes to show in the sidebar. -mailboxes =ALL-INBOXES -mailboxes =mailbox/INBOX =viu/INBOX =mf/INBOX =kfi/INBOX mailboxes ="===================" mailboxes =mailbox -mailboxes =mailbox/archive =mailbox/sent =mailbox/drafts =mailbox/junk =mailbox/trash +mailboxes =mailbox/INBOX =mailbox/archive =mailbox/sent =mailbox/drafts =mailbox/junk =mailbox/trash +mailboxes ="===================" mailboxes =viu -mailboxes =viu/archive =viu/sent =viu/drafts =viu/junk =viu/trash -mailboxes =mf -mailboxes =mf/archive =mf/sent =mf/drafts =mf/junk =mf/trash -mailboxes =kfi -mailboxes =kfi/archive =kfi/sent =kfi/drafts =kfi/junk =kfi/trash +mailboxes =viu/INBOX =viu/archive =viu/sent =viu/drafts =viu/junk =viu/trash # source colors and keybindings # keeping those in one place makes it easier for my brain @@ -117,6 +112,4 @@ source ~/.mutt/accounts/mailbox # when changing into other mailboxes, use different adresses etc. folder-hook mailbox/* source ~/.mutt/accounts/mailbox -folder-hook kfi/* source ~/.mutt/accounts/kfi folder-hook viu/* source ~/.mutt/accounts/viu -folder-hook mf/* source ~/.mutt/accounts/mf diff --git a/office/mutt/signatures/hsv b/office/mutt/signatures/hsv deleted file mode 100644 index db0815b6..00000000 --- a/office/mutt/signatures/hsv +++ /dev/null @@ -1,7 +0,0 @@ - --- -Steffen Rademacker -Hörspielsommer e.V. -s.rademacker@hoerspielsommer.de -https://hoerspielsommer.de - diff --git a/other/scans.txt b/other/scans.txt deleted file mode 100644 index 6b6350ac..00000000 --- a/other/scans.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Thanks to Tobias Baldauf! -# Interleaved DC scan fro Y,Cb,Cr: -0,1,2: 0-0, 0, 1; - -# AC Scans: -0: 1-27, 0, 0; -2: 1-63, 0, 0; -1: 1-63, 0, 0; - -# Remaining Y coefficients -0: 28-63, 0, 0; diff --git a/zsh/aliases b/zsh/aliases index 99b2f1ae..6ae59d37 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -63,6 +63,9 @@ alias ns="npm start" alias nb="npm run build" alias np="npm run production" alias npmre='rm -f package-lock.json && rm -rf node_modules && npm install' +alias ys='yarn start' +alias yb='yarn build' +alias yp='yarn production' alias yre='rm -f yarn.lock && rm -rf node_modules && yarn' # often used folder shortcuts