diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/dev-utils/default.nix | 5 | ||||
| -rw-r--r-- | home/neovim/filetype.nix | 1 | ||||
| -rw-r--r-- | home/neovim/lsp.nix | 19 | ||||
| -rw-r--r-- | home/zsh/plugins.nix | 34 |
4 files changed, 6 insertions, 53 deletions
diff --git a/home/dev-utils/default.nix b/home/dev-utils/default.nix index 67bf017..7239c28 100644 --- a/home/dev-utils/default.nix +++ b/home/dev-utils/default.nix @@ -33,7 +33,10 @@ clojure leiningen ] - ++ lib.optional pkgs.stdenv.isDarwin trash; + ++ lib.optionals pkgs.stdenv.isDarwin [ + pbv + trash + ]; # Add system manual pages to the search path on Darwin. home.sessionVariables.MANPATH = lib.optionalString pkgs.stdenv.isDarwin "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/share/man:/Applications/Xcode.app/Contents/Developer/usr/share/man:/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/share/man:$MANPATH"; diff --git a/home/neovim/filetype.nix b/home/neovim/filetype.nix index 08b5e46..cb47420 100644 --- a/home/neovim/filetype.nix +++ b/home/neovim/filetype.nix @@ -8,5 +8,6 @@ vim-noweb vim-janet vim-crystal + vim-svelte ]; } diff --git a/home/neovim/lsp.nix b/home/neovim/lsp.nix index 20de898..0c2e290 100644 --- a/home/neovim/lsp.nix +++ b/home/neovim/lsp.nix @@ -49,24 +49,7 @@ -- map buffer local keybindings when the language server attaches local servers = { pyright = { cmd = { "${pkgs.pyright}/bin/pyright-langserver", "--stdio" } }, - nil_ls = { - cmd = { "${pkgs.nil}/bin/nil" }, - settings = { - ["nil"] = { - formatting = { - command = {"nix", "run", "nixpkgs#alejandra"}, - }, - nix = { - flake = { - -- calls `nix flake archive` to put a flake and its output to store - autoArchive = true, - -- auto eval flake inputs for improved completion - autoEvalInputs = true, - }, - }, - }, - }, - }, + nixd = { cmd = { "${pkgs.nixd}/bin/nixd" } }, denols = { init_options = { enable = true, diff --git a/home/zsh/plugins.nix b/home/zsh/plugins.nix index 91cee3d..6dbc151 100644 --- a/home/zsh/plugins.nix +++ b/home/zsh/plugins.nix @@ -19,40 +19,6 @@ }; } { - name = "zsh-cwd-history"; - src = pkgs.stdenvNoCC.mkDerivation rec { - pname = "zsh-cwd-history"; - version = "73afed8"; - - src = pkgs.fetchFromGitHub { - owner = "ericfreese"; - repo = pname; - rev = version; - hash = "sha256-xW11wPFDuFU80AzgAgLwkvK7Qv58fo3i3kSasE3p0zs="; - }; - - fixupPhase = '' - substituteInPlace ${pname}.zsh \ - --replace md5 ${pkgs.hashdeep}/bin/md5deep - - mkdir -p $out - mv * $out - ''; - - # This is kind of a weird, useless derivation, so we have to - # manually avoid doing lots of the usual stuff. - dontInstall = true; - }; - config = '' - # Where to but history files - export ZSH_CWD_HISTORY_DIR=${config.xdg.dataHome}/zsh-cwd-history - mkdir -p "$ZSH_CWD_HISTORY_DIR" - - # Toggle between global/local history - bindkey '^G' cwd-history-toggle - ''; - } - { name = "zsh-vi-mode-cursor"; src = pkgs.fetchFromGitHub { owner = "Buckmeister"; |