Getting home manager to build again by switching back to vim from neovim for now. Futsing with FZF, fd, bat, etc.

master
Dustin Swan 5 years ago
parent cffe4829d9
commit fb0399aeb1
Signed by: dustinswan
GPG Key ID: AB49BD6B2B3A6377

@ -1,9 +1,9 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
# nodePackages.eslint # nodePackages.eslint aerc
home.packages = with pkgs; [ home.packages = with pkgs; [
ripgrep fd wget silver-searcher tree ranger nodejs-12_x yarn mosh w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert catimg tldr aerc ffsend magic-wormhole ripgrep fd wget silver-searcher tree ranger nodejs-12_x yarn mosh w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert catimg tldr ffsend
]; ];
home.sessionVariables = { home.sessionVariables = {
@ -85,7 +85,8 @@
baseIndex = 1; baseIndex = 1;
clock24 = true; clock24 = true;
secureSocket = false; secureSocket = false;
plugins = with pkgs.tmuxPlugins; [ sensible resurrect pain-control continuum copycat open urlview fzf-tmux-url yank vim-tmux-navigator ]; plugins = with pkgs.tmuxPlugins; [ sensible resurrect pain-control continuum open urlview fzf-tmux-url yank vim-tmux-navigator ];
# copycat
extraConfig = '' extraConfig = ''
set -g set-titles on set -g set-titles on
set -g set-titles-string "#H (#S)" set -g set-titles-string "#H (#S)"
@ -126,6 +127,10 @@
programs.fzf = { programs.fzf = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
defaultCommand = "fd --type file --color=always";
defaultOptions = [ "--height 40%" "--border" "--ansi" ];
fileWidgetCommand = "fd --type file --color=always";
fileWidgetOptions = [ "--min-height 30 --preview-window noborder --preview '(bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}) 2> /dev/null'" ];
# enableFishIntegration = true; # uhoh, this doesn't exist yet # enableFishIntegration = true; # uhoh, this doesn't exist yet
}; };
@ -173,12 +178,13 @@
programs.msmtp.enable = true; programs.msmtp.enable = true;
programs.offlineimap.enable = true; programs.offlineimap.enable = true;
programs.neovim = { # programs.neovim = {
programs.vim = {
enable = true; enable = true;
viAlias = true; # viAlias = true;
vimAlias = true; # vimAlias = true;
withNodeJs = true; # withNodeJs = true;
withPython3 = true; # withPython3 = true;
# unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade floaterm coc-nvim # unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade floaterm coc-nvim
plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter nerdtree emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify vim-abolish ]; plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter nerdtree emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify vim-abolish ];
extraConfig = '' extraConfig = ''

@ -1,7 +1,7 @@
{pkgs, lib, ... }: {pkgs, lib, ... }:
{ {
home.packages = with pkgs; [ clipit ncmpcpp pandoc unzip wirelesstools xsel anki pavucontrol blueman gifsicle networkmanager paprefs steam pinentry vlc nitrogen wine yarn spotify signal-desktop google-chrome emacs-all-the-icons-fonts python3 python37Packages.pip veracrypt bashmount exfat exfat-utils i3lock-pixeled p4v killall calc cargo cava diceware magic-wormhole xorg.xmodmap zip cacert dropbox-cli keepassx2 wireshark-qt vdirsyncer slack riot-web retroarch gimp blender khal khard mu xcape home.packages = with pkgs; [ clipit ncmpcpp pandoc unzip wirelesstools xsel anki pavucontrol blueman gifsicle networkmanager paprefs steam pinentry vlc nitrogen wine yarn spotify signal-desktop google-chrome emacs-all-the-icons-fonts python3 python37Packages.pip veracrypt bashmount exfat exfat-utils i3lock-pixeled p4v killall calc cargo cava diceware xorg.xmodmap zip cacert dropbox-cli keepassx2 wireshark-qt vdirsyncer slack riot-web retroarch gimp blender khal khard mu xcape
]; ];
home.keyboard.options = [ "ctrl:nocaps" "compose:ralt" ]; home.keyboard.options = [ "ctrl:nocaps" "compose:ralt" ];

@ -6,12 +6,12 @@
home.file.gpg-agent = { home.file.gpg-agent = {
target = ".gnupg/gpg-agent.conf"; target = ".gnupg/gpg-agent.conf";
text = '' text = ''
pinentry-program ${builtins.getEnv "HOME"}/.nix-profile/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
default-cache-ttl 86400 default-cache-ttl 86400
max-cache-ttl 86400 max-cache-ttl 86400
''; '';
}; };
# pinentry-program ${builtins.getEnv "HOME"}/.nix-profile/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh"; programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh";
# programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh"; # programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh";

Loading…
Cancel
Save