From a54384fa2b27345b7eda837f998daf2c69aeb0e5 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Sun, 23 May 2021 15:16:47 +0200 Subject: [PATCH] --- nixpkgs/.config/nixpkgs/modules/term/zsh/default.nix | 3 +++ nvim/.config/nvim/fnl/dots/keybinds.fnl | 1 + nvim/.config/nvim/fnl/dots/plugins.fnl | 1 + nvim/.config/nvim/fnl/dots/plugins/lsp.fnl | 7 ++++++- xmonad/.xmonad/lib/Config.hs | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/nixpkgs/.config/nixpkgs/modules/term/zsh/default.nix b/nixpkgs/.config/nixpkgs/modules/term/zsh/default.nix index 31d831b..7cb2ba6 100644 --- a/nixpkgs/.config/nixpkgs/modules/term/zsh/default.nix +++ b/nixpkgs/.config/nixpkgs/modules/term/zsh/default.nix @@ -153,9 +153,12 @@ in initExtra = '' eval $(opam env) + eval $(luarocks path --lua-version=5.4) + export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=2" +"set statusline=\ %t"' export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0"' + setopt nobeep setopt HIST_IGNORE_ALL_DUPS diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl index 9aed659..b35e84e 100644 --- a/nvim/.config/nvim/fnl/dots/keybinds.fnl +++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl @@ -31,6 +31,7 @@ "o" (cmd "Telescope live_grep" "Grep files") "p" (cmd "Telescope file_browser" "Open file-browser") ":" (cmd "Telescope commands" "Search command with fzf") + "s" (cmd "w" "Save file") "m" {:name "+Code actions" "d" (cmd "Lspsaga hover_doc" "Show documentation") diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl index 6766c2d..091187a 100644 --- a/nvim/.config/nvim/fnl/dots/plugins.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins.fnl @@ -150,6 +150,7 @@ :qnighy/lalrpop.vim {} :edwinb/idris2-vim {:ft ["idris2"]} + ;:ShinKage/nvim-idris2 {} :vmchale/ats-vim {:ft ["ats" "dats" "sats"]} :bakpakin/fennel.vim {}) diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl index ff7f5d7..ed6600d 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl @@ -66,7 +66,12 @@ (init-lsp :erlangls) (init-lsp :yamlls) (init-lsp :html) -(init-lsp :cssls) +(init-lsp :cssls {:filestypes ["css" "scss" "less" "stylus"] + :settings {:css {:validate true} + :less {:validate true} + :scss {:validate true}}}) + + (let [rust-tools (require "rust-tools")] (rust-tools.setup {:tools {:inlay_hints {:show_parameter_hints false}}})) diff --git a/xmonad/.xmonad/lib/Config.hs b/xmonad/.xmonad/lib/Config.hs index 5bacb56..0486675 100644 --- a/xmonad/.xmonad/lib/Config.hs +++ b/xmonad/.xmonad/lib/Config.hs @@ -261,7 +261,7 @@ myStartupHook :: X () myStartupHook = do setWMName "LG3D" -- Java stuff hack --spawnOnce "nm-applet &" - --spawnOnce "udiskie -s &" -- Mount USB sticks automatically. -s is smart systray mode: systray icon if something is mounted + spawnOnce "udiskie -s &" -- Mount USB sticks automatically. -s is smart systray mode: systray icon if something is mounted spawnOnce "xfce4-clipman &" --spawnOnce "redshift -P -O 5000 &" spawn "xset r rate 300 50 &" -- make key repeat quicker