1
0
mirror of https://github.com/alrayyes/dotfiles/ synced 2023-11-14 15:56:30 +00:00

Got rid of haskell & added Golang / Rust

This commit is contained in:
Ryan Kes 2020-06-07 20:17:21 +02:00
parent e1464e60f0
commit 9eeb2f7389
8 changed files with 54 additions and 27 deletions

View File

@ -107,7 +107,7 @@
- Show images in buffers as default - Show images in buffers as default
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(setq org-directory "~/Documents/org" (setq org-directory "~/Documents/org"
org-agenda-files '("~/Documents/org" "~/Documents/org/freelance") org-agenda-files (directory-files-recursively "~/Documents/org/" "\.org$")
org-log-done 'note org-log-done 'note
org-startup-with-inline-images t) org-startup-with-inline-images t)
#+END_SRC #+END_SRC

View File

@ -76,8 +76,6 @@
+lsp) +lsp)
ledger ; an accounting system in Emacs ledger ; an accounting system in Emacs
markdown ; writing docs for people to ignore markdown ; writing docs for people to ignore
(haskell ; Haskell support
+ lsp)
(org ; organize your plain life in plain text (org ; organize your plain life in plain text
+roam +roam
+dragndrop ; drag & drop files/images into org buffers +dragndrop ; drag & drop files/images into org buffers
@ -87,6 +85,8 @@
+lsp) ; perl's insecure younger brother +lsp) ; perl's insecure younger brother
(python (python
+lsp) ; beautiful is better than ugly +lsp) ; beautiful is better than ugly
(rust
+lsp) ; rust support
(sh (sh
+lsp) ; she sells {ba,z,fi}sh shells on the C xor +lsp) ; she sells {ba,z,fi}sh shells on the C xor
(web (web

View File

@ -33,7 +33,8 @@ end
path_if_exists ~/.config/yarn/global/node_modules/.bin path_if_exists ~/.config/yarn/global/node_modules/.bin
path_if_exists ~/.local/bin path_if_exists ~/.local/bin
path_if_exists ~/.emacs.d/bin path_if_exists ~/.emacs.d/bin
path_if_exists ~/go/bin path_if_exists ~/.local/share/go/bin
path_if_exists ~/.local/share/cargo/bin
# Set GPG TTY # Set GPG TTY
set GPG_TTY (tty) set GPG_TTY (tty)
@ -70,12 +71,6 @@ set -xg MU_HOME ~/.cache/mu
# Load xinit from the proper directory # Load xinit from the proper directory
set -xgg XINITRC ~/.config/X11/xinitrc set -xgg XINITRC ~/.config/X11/xinitrc
# Make sure rust uses the proper directory
set -xg RUSTUP_HOME ~/.local/share/rustup
# Set custom nprmrc path
set -xg NPM_CONFIG_USERCONFIG ~/.config/npm/npmrc
# bobthefish # bobthefish
set -xg theme_nerd_fonts yes set -xg theme_nerd_fonts yes
set -xg theme_color_scheme gruvbox set -xg theme_color_scheme gruvbox
@ -86,8 +81,12 @@ set -xg sudope_sequence \e\e
# Set tmux tmpdir to proper directory # Set tmux tmpdir to proper directory
set -xg TMUX_TMPDIR "$XDG_RUNTIME_DIR" set -xg TMUX_TMPDIR "$XDG_RUNTIME_DIR"
# Haskell # Rust
set -xg STACK_ROOT ~/.local/share/stack set -xg CARGO_HOME ~/.local/share/cargo
set -xg RUSTUP_HOME ~/.local/share/rustup
# Golang
set -xg GOPATH ~/.local/share/go
# nvim alias # nvim alias
alias v="nvim" alias v="nvim"

23
install
View File

@ -1,11 +1,12 @@
#!/usr/bin/env fish #!/usr/bin/env fish
# Prerequisite & inistalled apps # Prerequisite & inistalled apps
set prerequisiteApps bat broot brave caffeine-ng exa fslint fzf go graphviz isync imagemagick lightdm-gtk-greeter mailcap deadd-notification-center-bin npm pamixer pfetch playerctl pulseaudio pulsemixer python pywal stack stow sxiv tldr trayer udisks2 xwallpaper yarn zathura set prerequisiteApps bat broot brave caffeine-ng exa fslint fzf graphviz isync imagemagick lightdm-gtk-greeter mailcap deadd-notification-center-bin npm pamixer pfetch playerctl pulseaudio pulsemixer python pywal stow sxiv tldr trayer udisks2 xwallpaper yarn zathura
set prerequisiteFonts otf-nerd-fonts-fira-code noto-fonts ttf-unifont set prerequisiteFonts otf-nerd-fonts-fira-code noto-fonts ttf-unifont
set prerequisiteLsp bash-language-server ccls haskell-ide-engine php-language-server python-language-server typescript-language-server vscode-css-languageserver vscode-html-languageserver nodejs-intelephense set prerequisiteLsp bash-language-server ccls php-language-server python-language-server typescript-language-server-bin vscode-css-languageserver-bin vscode-html-languageserver-bin nodejs-intelephense
set configuredApps alacritty bspwm castero emacs firejail git gnupg gtk lf deadd-notification-center-bin mpd mpv mpv-mpris ncmpcpp neomutt neovim picom redshift spotifyd-dbus-mpris sxhkd tmux tuir weechat xmobar xmonad xmonad-contrib set configuredApps alacritty bspwm castero emacs firejail git gnupg gtk lf deadd-notification-center-bin mpd mpv mpv-mpris ncmpcpp neomutt neovim picom redshift spotifyd-dbus-mpris sxhkd tmux tuir weechat
set locales aspell-en hunspell-en_GB hunspell-en_US hunspell-nl set locales aspell-en hunspell-en_GB hunspell-en_US hunspell-nl
set golang go golangci-lint-bin
function mkdir_if_not_exist function mkdir_if_not_exist
if [ ! -d "$argv" ] if [ ! -d "$argv" ]
@ -21,10 +22,10 @@ function install_omf_package_if_not_exist
end end
end end
function install_npm_package_if_not_exist function install_yarn_package_if_not_exist
if ! npm -g list --depth 1 lighthouse >/dev/null 2>&1 if ! yarn global list lighthouse >/dev/null 2>&1
echo "Installing npm package $argv" echo "Installing yarn package $argv"
sudo npm install -g "$argv" yarn global add "$argv"
end end
end end
@ -55,6 +56,10 @@ for locale in $locales
install_app_if_not_exist "$locale" install_app_if_not_exist "$locale"
end end
for go in $golang
install_app_if_not_exist "$go"
end
# Create directories that need to exist # Create directories that need to exist
mkdir_if_not_exist ~/.cache/mpd mkdir_if_not_exist ~/.cache/mpd
mkdir_if_not_exist ~/.config/alacritty mkdir_if_not_exist ~/.config/alacritty
@ -127,8 +132,8 @@ nvim +PlugInstall +qall
# Install Neovim coc extensions # Install Neovim coc extensions
yarn --cwd ~/.config/coc/extensions install yarn --cwd ~/.config/coc/extensions install
# Install npm packages # Install yarn packages
install_npm_package_if_not_exist lighthouse install_yarn_package_if_not_exist lighthouse
# Setup broot if not done already # Setup broot if not done already
if [ ! -d ~/.local/share/broot ] if [ ! -d ~/.local/share/broot ]

View File

@ -1,14 +1,15 @@
{ {
"dependencies": { "dependencies": {
"coc-css": ">=1.2.3", "coc-css": ">=1.2.3",
"coc-eslint": ">=1.2.7", "coc-eslint": "^1.2.7",
"coc-html": ">=1.2.4", "coc-html": ">=1.2.4",
"coc-jest": ">=1.0.3", "coc-jest": ">=1.0.3",
"coc-json": ">=1.2.6", "coc-json": ">=1.2.6",
"coc-pairs": ">=1.2.21", "coc-pairs": ">=1.2.21",
"coc-prettier": ">=1.1.14", "coc-prettier": ">=1.1.14",
"coc-python": ">=1.2.12", "coc-python": ">=1.2.12",
"coc-rls": ">=1.1.6",
"coc-tsserver": ">=1.5.1", "coc-tsserver": ">=1.5.1",
"coc-yaml": ">=1.0.4" "coc-yaml": ">=1.0.4"
} }
} }

View File

@ -1,3 +1,16 @@
{ {
"coc.preferences.formatOnSaveFiletypes": ["css", "markdown", "javascript", "javascriptreact", "typescript", "typescriptreact", "json", "yaml", "html", "graphql", "mdx"], "coc.preferences.formatOnSaveFiletypes": [
"css",
"markdown",
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"json",
"yaml",
"html",
"graphql",
"mdx",
"rust"
]
} }

View File

@ -179,5 +179,9 @@
" Init jest in current cwd, require global jest command exists " Init jest in current cwd, require global jest command exists
command! JestInit :call CocAction('runCommand', 'jest.init') command! JestInit :call CocAction('runCommand', 'jest.init')
" use <Tab> and <S_tab> to navigate completion list
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
" } " }
" } " }

View File

@ -11,7 +11,8 @@ TERM="xterm-256color"
path_if_exists ~/.config/yarn/global/node_modules/.bin path_if_exists ~/.config/yarn/global/node_modules/.bin
path_if_exists ~/.local/bin path_if_exists ~/.local/bin
path_if_exists ~/.emacs.d/bin path_if_exists ~/.emacs.d/bin
path_if_exists ~/go/bin path_if_exists ~/.local/share/go/bin
path_if_exists ~/.local/share/cargo/bin
# Set GPG TTY # Set GPG TTY
export GPG_TTY="$(tty)" export GPG_TTY="$(tty)"
@ -51,8 +52,12 @@ export XINITRC=~/.config/X11/xinitrc
# This needs to be set for bspwm to see config # This needs to be set for bspwm to see config
export XDG_CONFIG_HOME="$HOME/.config" export XDG_CONFIG_HOME="$HOME/.config"
# Haskell # Rust
export STACK_ROOT=~/.local/share/stack export CARGO_HOME=~/.local/share/cargo
export RUSTUP_HOME=~/.local/share/rustup
# Golang
export GOPATH=~/.local/share/go
# Enable icons in lf # Enable icons in lf
export LF_ICONS="\ export LF_ICONS="\