diff --git a/README.md b/README.md index dbd3700..c1d16da 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Marc's Dotfiles +# Marco's Dotfiles ![PC](screenshots/pc.png) @@ -9,13 +9,13 @@ + Notifications: dunst + Shell: zsh + Terminal: alacritty -+ WM: i3 ++ WM: i3-gaps ## Programs -+ Editor: emacs + nvim + ++ Editor: emacs (nvim as fallback) + File-Browser: ranger + Image-Viewer: sxiv -+ Info: neofetch + Launcher: dmenu + Music: spotify + Pdf-Viewer: zathura with mupdf @@ -24,22 +24,26 @@ ## Other Dependencies -+ [asetroot](https://github.com/Wilnath/asetroot) -+ [i3-swallow](https://github.com/jamesofarrell/i3-swallow) -+ [neovim-remote](https://github.com/mhinz/neovim-remote) -+ [vim-plug](https://github.com/junegunn/vim-plug) ++ [asetroot](https://github.com/Wilnath/asetroot): animated wallpaper ++ [i3-swallow](https://github.com/jamesofarrell/i3-swallow): swallow terminal ++ [neovim-remote](https://github.com/mhinz/neovim-remote): zathura integration ++ [vim-plug](https://github.com/junegunn/vim-plug): vim plugin manager + fcitx + mozc: Japanese Keyboard - [Install](https://www.youtube.com/watch?v=lJoXhS4EUJs) - fcitx-im fcitx-configtool fcitx-mozc -+ fzf -+ light -+ pactl -+ playerctl ++ fzf: fuzzy file finder ++ light: background light control ++ pactl: volume control ++ playerctl: music player control -### Nvim LSP +### emacs LSP + +Emacs should throw a warning, when it can't start the language server. +Following the help should be enough guidance. + +### Nvim LSP (currently unused) + [Python](https://github.com/palantir/python-language-server) + [Rust](https://github.com/rust-analyzer/rust-analyzer) + [TeX](https://github.com/latex-lsp/texlab) -+ [Java](https://github.com/mfussenegger/nvim-jdtls) ## Fonts + Fira Code Regular Nerd Font Complete Mono: Terminal diff --git a/files/.config/nvim/lua/marc/lsp.lua b/files/.config/nvim/lua/marc/lsp.lua index abd8ba6..1b94b70 100644 --- a/files/.config/nvim/lua/marc/lsp.lua +++ b/files/.config/nvim/lua/marc/lsp.lua @@ -36,10 +36,6 @@ if vim.api.nvim_eval("executable('texlab')") then vim.api.nvim_set_keymap("n", "gz", "ZathuraShow", { noremap = true, silent = true }) end -if vim.api.nvim_eval("isdirectory($HOME. '/.cache/nvim/lspconfig/jdtls')") then - require'lspconfig'.jdtls.setup{} -end - -- g(o) d(efinition) vim.api.nvim_set_keymap("n", "gd" , "lua vim.lsp.buf.definition()", { noremap = true, silent = true }) -- g(o) r(eference) diff --git a/files/.config/polybar/config b/files/.config/polybar/config index 1087aa8..a95962a 100644 --- a/files/.config/polybar/config +++ b/files/.config/polybar/config @@ -78,17 +78,28 @@ pin-workspaces = true wrapping-scroll = false format = -ws-icon-0 = 1;一 -ws-icon-1 = 2;二 -ws-icon-2 = 3;三 -ws-icon-3 = 4;四 -ws-icon-4 = 5;五 -ws-icon-5 = 6;六 +ws-icon-0 = 1;󰅬 +ws-icon-1 = 2;󰒋 +ws-icon-2 = 3;󰈹 +ws-icon-3 = 4;󰙯 +ws-icon-4 = 5;󰓇 +ws-icon-5 = 6;󰇮 ws-icon-6 = 7;七 ws-icon-7 = 8;八 ws-icon-8 = 9;九 ws-icon-9 = 10;十 +#ws-icon-0 = 1;一 +#ws-icon-1 = 2;二 +#ws-icon-2 = 3;三 +#ws-icon-3 = 4;四 +#ws-icon-4 = 5;五 +#ws-icon-5 = 6;六 +#ws-icon-6 = 7;七 +#ws-icon-7 = 8;八 +#ws-icon-8 = 9;九 +#ws-icon-9 = 10;十 + label-focused = "%icon%" label-focused-overline = ${colors.accent} label-focused-foreground = ${colors.foreground} diff --git a/files/init.el b/files/init.el index c4d31a8..aa7f469 100644 --- a/files/init.el +++ b/files/init.el @@ -5,7 +5,7 @@ (toggle-scroll-bar -1) ;; Or this (setq inhibit-startup-screen t) ;; Leave me alone with your tutorials (setq tramp-default-method "ssh") ;; speed up tramp mode -(set-face-attribute 'default nil :font "FiraCode Nerd Font Mono" :height 110) ;; Set font size +(set-face-attribute 'default nil :font "FiraCode Nerd Font Mono" :height 100) ;; Set font size ;; Make ESC quit prompts (global-set-key (kbd "") 'keyboard-escape-quit)