Autoformat

This commit is contained in:
Sam W 2022-03-01 14:51:42 +00:00
parent 6a64411c0a
commit 8c107d27cb
3 changed files with 12 additions and 13 deletions

View File

@ -6,8 +6,7 @@ in {
home.sessionVariables = { home.sessionVariables = {
"PATH" = "$HOME/.local/bin:$PATH"; "PATH" = "$HOME/.local/bin:$PATH";
"EDITOR" = "vim"; "EDITOR" = "vim";
"WORDCHARS" = "WORDCHARS" = "\${WORDCHARS//[\\/.]/}"; # ctrl-w on paths without make angery
"\${WORDCHARS//[\\/.]/}"; # ctrl-w on paths without make angery
}; };
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
@ -54,8 +53,7 @@ in {
hostname.format = "[$hostname]($style) "; hostname.format = "[$hostname]($style) ";
directory = { truncation_length = -1; }; directory = { truncation_length = -1; };
git_branch.format = "[$symbol$branch]($style) "; git_branch.format = "[$symbol$branch]($style) ";
python.format = python.format = "[py \${pyenv_prefix}(\${version} )(\\($virtualenv\\) )]($style)";
"[py \${pyenv_prefix}(\${version} )(\\($virtualenv\\) )]($style)";
nodejs.format = "[js ($version )]($style)"; nodejs.format = "[js ($version )]($style)";
nix_shell.format = "[nix $state( \\($name\\))]($style) "; nix_shell.format = "[nix $state( \\($name\\))]($style) ";
}; };

View File

@ -1,7 +1,8 @@
{ pkgs, lib, ... }: { { pkgs, lib, ... }: {
# Use secretive for SSH agent # Use secretive for SSH agent
programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin { programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin {
host = "*"; host = "*";
extraOptions."IdentityAgent" = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh"; extraOptions."IdentityAgent" =
"~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
}; };
} }

View File

@ -7,10 +7,10 @@
enable = true; enable = true;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
# Basic stuff # Basic stuff
vim-sensible vim-sensible
vim-noctu # 16color colorscheme vim-noctu # 16color colorscheme
gruvbox-nvim gruvbox-nvim
fzfWrapper fzfWrapper
# More fancy shit # More fancy shit
@ -19,16 +19,16 @@
nvim-lspconfig nvim-lspconfig
trouble-nvim trouble-nvim
vim-nix vim-nix
rust-vim rust-vim
vim-go vim-go
# Git stuff # Git stuff
fugitive fugitive
vim-gitgutter vim-gitgutter
]; ];
extraConfig = '' extraConfig = ''
lua <<EOF lua <<EOF
${builtins.readFile ./init.lua} ${builtins.readFile ./init.lua}
EOF EOF
''; '';
}; };
} }