Compare commits

...

2 Commits

Author SHA1 Message Date
mandlm 22bb8c4e70
feat: remove nushell 2024-01-11 16:52:43 +01:00
mandlm 22fff3f683
feat(nvim): map jj/jk to escape 2024-01-11 16:50:16 +01:00
9 changed files with 7 additions and 42 deletions

View File

@ -3,7 +3,6 @@
programs.carapace = { programs.carapace = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
enableNushellIntegration = true;
}; };
} }

View File

@ -5,7 +5,6 @@
direnv = { direnv = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
enableNushellIntegration = true;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
}; };

View File

@ -52,6 +52,9 @@
project-nvim project-nvim
auto-session auto-session
# escape handling
better-escape-nvim
nvim-treesitter.withAllGrammars nvim-treesitter.withAllGrammars
markdown-preview-nvim # use({ "iamcco/markdown-preview.nvim", run = ":call mkdp#util#install()" }) markdown-preview-nvim # use({ "iamcco/markdown-preview.nvim", run = ":call mkdp#util#install()" })
toggleterm-nvim toggleterm-nvim

View File

@ -64,3 +64,6 @@ nnoremap("gq", ":Bdelete<CR>")
-- toggle search highlighting -- toggle search highlighting
vim.cmd('nnoremap <expr> * v:hlsearch ? ":nohlsearch<cr>" : "*"') vim.cmd('nnoremap <expr> * v:hlsearch ? ":nohlsearch<cr>" : "*"')
-- insert-map jj/jk to escape
require("better_escape").setup()

View File

@ -90,7 +90,6 @@ local servers = {
}, },
}, },
["marksman"] = {}, ["marksman"] = {},
["nushell"] = {},
["pylsp"] = { ["pylsp"] = {
pylsp = { pylsp = {
plugins = { plugins = {

View File

@ -1,36 +0,0 @@
{ config, lib, pkgs, user, theme, ... }:
{
programs.nushell = {
enable = true;
extraConfig = ''
let carapace_completer = {|spans|
carapace $spans.0 nushell $spans | from json
}
$env.config = {
show_banner: false,
edit_mode: vi
shell_integration: true
use_kitty_protocol: true
completions: {
case_sensitive: false # case-sensitive completions
quick: true # set to false to prevent auto-selecting completions
partial: true # set to false to prevent partial filling of the prompt
algorithm: "fuzzy" # prefix or fuzzy
external: {
# set to false to prevent nushell looking into $env.PATH to find more suggestions
enable: true
# set to lower can improve completion performance at the cost of omitting some options
max_results: 100
completer: $carapace_completer # check 'carapace_completer'
}
}
}
$env.PATH = ($env.PATH |
split row (char esep) |
prepend /home/myuser/.apps |
append /usr/bin/env
)
'';
};
}

View File

@ -3,7 +3,6 @@
{ {
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
enableNushellIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
}; };
} }

View File

@ -49,7 +49,6 @@
./home-manager/gpg ./home-manager/gpg
./home-manager/carapace.nix ./home-manager/carapace.nix
./home-manager/zsh.nix ./home-manager/zsh.nix
./home-manager/nushell.nix
./home-manager/starship.nix ./home-manager/starship.nix
./home-manager/sway ./home-manager/sway
./home-manager/direnv.nix ./home-manager/direnv.nix

View File

@ -8,7 +8,7 @@
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
home = "/home/mandlm"; home = "/home/mandlm";
shell = pkgs.nushell; shell = pkgs.zsh;
extraGroups = [ extraGroups = [
"wheel" "wheel"
"networkmanager" "networkmanager"