cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Autoformatting of nix files

Browse source
This commit is contained in:
Cyryl Płotnicki 2019-07-07 12:08:00 +01:00
parent 976b6b670d
commit db74835acf
12 changed files with 354 additions and 350 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vimrc.plugins-settings
View file

@ -3,6 +3,8 @@ let g:bufferline_echo = 0
let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1
au BufWrite * :Autoformat
" plugins: rust
let g:rustfmt_autosave = 1

1
.vimrc.settings
View file

@ -50,4 +50,3 @@ augroup END
" vimdiff
set diffopt+=iwhite
set diffexpr=""

2
nixos/boxes/foureighty.nix
View file

@ -81,4 +81,4 @@
../gfx-intel.nix
../virtualbox.nix
];
}
}

2
nixos/boxes/skinnyv.nix
View file

@ -27,4 +27,4 @@
../gfx-intel.nix
../virtualbox.nix
];
}
}

2
nixos/boxes/thinky.nix
View file

@ -21,4 +21,4 @@
../common.nix
../gfx-intel.nix
];
}
}

4
nixos/common.nix
View file

@ -4,7 +4,7 @@ let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
etesync-dav = import ./packages/etesync-dav/default.nix;
in
{
{
imports =
[
./vscode.nix
@ -106,5 +106,5 @@ in
nix.gc.automatic = true;
system.autoUpgrade.enable = true;
system.stateVersion = "19.03";
}
}

36
nixos/home.nix
View file

@ -3,7 +3,7 @@
let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
in
{
{
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
@ -28,43 +28,13 @@ in
];
imports = [
./programs/zsh.nix
./programs/vim.nix
./programs/alacritty.nix
];
programs = {
home-manager.enable = true;
vim = {
enable = true;
extraConfig = builtins.readFile ~/dev/dotfiles/.vimrc.nixos;
plugins = [
"vim-gitgutter"
"vim-toml"
"vim-autoformat"
"editorconfig-vim"
"tabular"
"vim-colors-solarized"
"fzf-vim"
"ctrlp-vim"
"vim-nix"
"vim-startify"
"ack-vim"
"vim-markdown"
"rust-vim"
"nerdtree"
"vim-dispatch"
"deoplete-nvim"
"deoplete-go"
"vim-fugitive"
"vim-sensible"
"vim-surround"
"vim-airline"
"vim-airline-themes"
"vim-dirdiff"
"nerdtree-git-plugin"
];
};
fzf.enable = true;
tmux = {
enable = true;
@ -79,4 +49,4 @@ in
go.enable = true;
bat.enable = true;
};
}
}

33
nixos/programs/vim.nix Normal file
View file

@ -0,0 +1,33 @@
{ config, pkgs, ... }:
{
programs.vim = {
enable = true;
extraConfig = builtins.readFile ~/dev/dotfiles/.vimrc.nixos;
plugins = [
"vim-gitgutter"
"vim-toml"
"vim-autoformat"
"editorconfig-vim"
"tabular"
"vim-colors-solarized"
"fzf-vim"
"ctrlp-vim"
"vim-nix"
"vim-startify"
"ack-vim"
"vim-markdown"
"rust-vim"
"nerdtree"
"vim-dispatch"
"deoplete-nvim"
"deoplete-go"
"vim-fugitive"
"vim-sensible"
"vim-surround"
"vim-airline"
"vim-airline-themes"
"vim-dirdiff"
"nerdtree-git-plugin"
];
};
}

4
nixos/syncthing.nix
View file

@ -2,7 +2,7 @@
let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
in
{
{
nixpkgs.config = {
packageOverrides = pkgs: {
unstable = import unstableTarball {
@ -17,4 +17,4 @@ in
openDefaultPorts = true;
package = pkgs.unstable.syncthing;
};
}
}

4
nixos/virtualbox.nix
View file

@ -2,7 +2,7 @@
let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
in
{
{
nixpkgs.config = {
packageOverrides = pkgs: {
unstable = import unstableTarball {
@ -15,4 +15,4 @@ in
enableExtensionPack = true;
enableHardening = false;
};
}
}

4
nixos/vscode.nix
View file

@ -3,7 +3,7 @@
let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
in
{
{
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
@ -153,4 +153,4 @@ in
];})
];
};
}
}