From 36ca408b4b439f9d70d2edd2b02e00865610e090 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Sat, 17 Sep 2022 15:30:46 +0200 Subject: [PATCH] made changes --- modules/desktop.nix | 28 ++++++++++++++-------------- modules/neovim.nix | 22 +++++++++++++++++++--- modules/zsh.nix | 3 +++ 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/modules/desktop.nix b/modules/desktop.nix index 09ae681..da29531 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -115,7 +115,7 @@ in with lib; { "${mod}+t" = "exec ocr-screenshot.sh"; # rofi fuckery "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../other/rofi-themes/applauncher.rasi}"; - "${mod}+space" = "exec --no-startup-id -show window"; + "${mod}+space" = "exec --no-startup-id rofi -show window -theme ${../other/rofi-themes/applauncher.rasi}"; "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../other/rofi-themes/applauncher.rasi}"; "${mod}+m" = "exec --no-startup-id menu-qalc"; @@ -193,15 +193,15 @@ in with lib; { ]; vSync = true; - opacityRules = [ - "90:class_g = 'kitty'" - "80:class_g = 'Signal'" - "80:class_g = 'Rofi'" - "80:class_g = 'discord'" - "80:class_g = 'Mailspring'" - "85:class_g = 'nheko'" - "75:class_g = 'obsidian'" - ]; + #opacityRules = [ + #"90:class_g = 'kitty'" + #"80:class_g = 'Signal'" + #"80:class_g = 'Rofi'" + #"80:class_g = 'discord'" + #"80:class_g = 'Mailspring'" + #"85:class_g = 'nheko'" + #"75:class_g = 'obsidian'" + #]; settings = { # blur #"detect-client-opacity = true;" @@ -210,10 +210,10 @@ in with lib; { #"blur-deviation = 15" #"blur-background-fixed = true" "detect-client-opacity" = true; - "blur-method" = "gaussian"; - "blur-size" = 30; - "blur-deviation" = 15; - "blur-background-fixed" = true; + #"blur-method" = "gaussian"; + #"blur-size" = 30; + #"blur-deviation" = 15; + #"blur-background-fixed" = true; # fading rofi "fading" = true; diff --git a/modules/neovim.nix b/modules/neovim.nix index 9f5045f..326d7bb 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -34,6 +34,20 @@ in with lib; { coc-emmet coc-vimlsp coc-tsserver + { + plugin = toggleterm-nvim; + config = '' + lua require("toggleterm").setup{} + autocmd TermEnter term://*toggleterm#* + \ tnoremap exe v:count1 . "ToggleTerm" + + " By applying the mappings this way you can pass a count to your + " mapping to open a specific window. + " For example: 2 will open terminal 2 + nnoremap exe v:count1 . "ToggleTerm direction=float" + inoremap exe v:count1 . "ToggleTerm direction=float" + ''; + } { plugin = gruvbox-nvim; config = "colorscheme gruvbox"; @@ -45,7 +59,7 @@ in with lib; { { plugin = nerdcommenter; config = '' - vmap ++ NERDCommenterToggle + vmap ++ NERDCommenterToggle nmap ++ NERDCommenterToggle ''; } @@ -124,10 +138,12 @@ in with lib; { extraConfig = '' " neovide let g:neovide_refresh_rate_idle=5 - let g:neovide_cursor_animation_length=0.2 - let g:neovide_cursor_trail_size=0.2 + let g:neovide_cursor_animation_length=0.1 + let g:neovide_cursor_trail_size=0.3 let g:neovide_cursor_vfx_mode="railgun" + let g:neovide_remember_window_size = v:false + set guifont=FiraCode\ Nerd\ Font:h11 set fdm=marker nmap H _ diff --git a/modules/zsh.nix b/modules/zsh.nix index 3fed847..6d9b640 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -10,6 +10,9 @@ in with lib; { home.packages = with pkgs; [ thefuck ]; + home.sessionVariables = { + "NEOVIDE_MULTIGRID" = "true"; + }; programs.zsh = { enable = true; enableAutosuggestions = true;