Autoformatting of nix files

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

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

View file

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

View file

@ -2,8 +2,8 @@
{ config, pkgs, ... }:
{
networking.hostName = "foureighty";
boot = {
networking.hostName = "foureighty";
boot = {
kernelPackages = pkgs.linuxPackages_latest;
extraModulePackages = with config.boot.kernelPackages; [ wireguard ];
initrd.kernelModules = [ "i915" ];
@ -25,60 +25,60 @@
preLVM = true;
allowDiscards = true;
}];
loader.grub = {
device = "nodev";
efiSupport = true;
loader.grub = {
device = "nodev";
efiSupport = true;
};
loader.efi.canTouchEfiVariables = true;
};
loader.efi.canTouchEfiVariables = true;
};
time.hardwareClockInLocalTime = true;
time.timeZone = "Europe/London";
time.hardwareClockInLocalTime = true;
time.timeZone = "Europe/London";
hardware.bumblebee.enable = true;
hardware.bumblebee.connectDisplay = true;
hardware.bumblebee.enable = true;
hardware.bumblebee.connectDisplay = true;
hardware.trackpoint.enable = true;
hardware.trackpoint.enable = true;
services.fprintd.enable = true;
services.fprintd.enable = true;
systemd.services.cpu-throttling = {
enable = true;
description = "CPU Throttling Fix";
documentation = [
"https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues"
];
path = [ pkgs.msr-tools ];
script = "wrmsr -a 0x1a2 0x3000000";
serviceConfig = {
Type = "oneshot";
};
wantedBy = [
"timers.target"
];
};
systemd.services.cpu-throttling = {
enable = true;
description = "CPU Throttling Fix";
documentation = [
"https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues"
];
path = [ pkgs.msr-tools ];
script = "wrmsr -a 0x1a2 0x3000000";
serviceConfig = {
Type = "oneshot";
};
wantedBy = [
"timers.target"
];
};
systemd.timers.cpu-throttling = {
enable = true;
description = "CPU Throttling Fix";
documentation = [
"https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues"
];
timerConfig = {
OnActiveSec = 60;
OnUnitActiveSec = 60;
Unit = "cpu-throttling.service";
};
wantedBy = [
"timers.target"
];
};
systemd.timers.cpu-throttling = {
enable = true;
description = "CPU Throttling Fix";
documentation = [
"https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues"
];
timerConfig = {
OnActiveSec = 60;
OnUnitActiveSec = 60;
Unit = "cpu-throttling.service";
};
wantedBy = [
"timers.target"
];
};
imports = [
/etc/nixos/hardware-configuration.nix
../boot.nix
../common.nix
../gfx-intel.nix
../virtualbox.nix
];
}
imports = [
/etc/nixos/hardware-configuration.nix
../boot.nix
../common.nix
../gfx-intel.nix
../virtualbox.nix
];
}

View file

@ -12,19 +12,19 @@
preLVM = true;
allowDiscards = true;
}];
loader.grub = {
device = "nodev";
efiSupport = true;
loader.grub = {
device = "nodev";
efiSupport = true;
};
loader.efi.canTouchEfiVariables = true;
};
loader.efi.canTouchEfiVariables = true;
};
time.timeZone = "Europe/London";
time.timeZone = "Europe/London";
imports = [
/etc/nixos/hardware-configuration.nix
../boot.nix
../common.nix
../gfx-intel.nix
../virtualbox.nix
];
}
imports = [
/etc/nixos/hardware-configuration.nix
../boot.nix
../common.nix
../gfx-intel.nix
../virtualbox.nix
];
}

View file

@ -10,15 +10,15 @@
preLVM = true;
allowDiscards = true;
}];
loader.grub = {
device = "/dev/sda";
loader.grub = {
device = "/dev/sda";
};
};
};
time.timeZone = "Europe/Warsaw";
imports = [
/etc/nixos/hardware-configuration.nix
../boot.nix
../common.nix
../gfx-intel.nix
];
}
time.timeZone = "Europe/Warsaw";
imports = [
/etc/nixos/hardware-configuration.nix
../boot.nix
../common.nix
../gfx-intel.nix
];
}

View file

@ -6,7 +6,7 @@
services.xserver.desktopManager.plasma5.enable = lib.mkForce false;
services.xserver.displayManager.sddm.enable = lib.mkForce false;
imports = [
imports = [
<nixpkgs/nixos/modules/installer/virtualbox-demo.nix>
../common.nix
];

View file

@ -4,107 +4,107 @@ 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
./syncthing.nix
./gsconnect.nix
];
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
unstable = import unstableTarball {
config = config.nixpkgs.config;
};
cyplo = import ./nixpkgs {
config = config.nixpkgs.config;
};
};
};
environment.systemPackages = with pkgs; [
wget git zsh gnupg curl tmux python36Packages.glances vim htop atop firefox home-manager
];
i18n.defaultLocale = "en_GB.UTF-8";
users.users.cyryl = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers"];
packages = with pkgs; [
unstable.pypi2nix etesync-dav unstable.hopper
{
imports =
[
./vscode.nix
./syncthing.nix
./gsconnect.nix
];
shell = pkgs.zsh;
};
virtualisation.docker = {
enable = true;
autoPrune.enable = true;
};
services = {
fwupd.enable = true;
tlp.enable = true;
printing = {
enable = true;
drivers = [ pkgs.epson-escpr pkgs.samsung-unified-linux-driver pkgs.splix ];
};
avahi = {
enable = true;
nssmdns = true;
};
restic.backups.home = {
passwordFile = "/etc/nixos/secrets/restic-password";
paths = [ "/home" ];
repository = "sftp:fetcher@brix:/mnt/data/backup-targets";
timerConfig = { OnCalendar = "hourly"; };
};
gnome3 = {
chrome-gnome-shell.enable = true;
gnome-keyring.enable = true;
};
xserver = {
enable = true;
layout = "pl";
libinput = {
enable = true;
naturalScrolling = false;
clickMethod = "clickfinger";
};
desktopManager = {
gnome3 = {
enable = true;
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
unstable = import unstableTarball {
config = config.nixpkgs.config;
};
cyplo = import ./nixpkgs {
config = config.nixpkgs.config;
};
};
};
displayManager.gdm= {
enable = true;
wayland = false;
environment.systemPackages = with pkgs; [
wget git zsh gnupg curl tmux python36Packages.glances vim htop atop firefox home-manager
];
i18n.defaultLocale = "en_GB.UTF-8";
users.users.cyryl = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers"];
packages = with pkgs; [
unstable.pypi2nix etesync-dav unstable.hopper
];
shell = pkgs.zsh;
};
};
};
security.pam.services.gdm.enableGnomeKeyring = true;
sound.enable = true;
networking.networkmanager.enable = true;
hardware.enableRedistributableFirmware = true;
hardware.cpu.intel.updateMicrocode = true;
hardware.pulseaudio.enable = true;
hardware.u2f.enable = true;
hardware.brightnessctl.enable = true;
hardware.sane.enable = true;
powerManagement.cpuFreqGovernor = (lib.mkForce null);
nix.gc.automatic = true;
system.autoUpgrade.enable = true;
system.stateVersion = "19.03";
}
virtualisation.docker = {
enable = true;
autoPrune.enable = true;
};
services = {
fwupd.enable = true;
tlp.enable = true;
printing = {
enable = true;
drivers = [ pkgs.epson-escpr pkgs.samsung-unified-linux-driver pkgs.splix ];
};
avahi = {
enable = true;
nssmdns = true;
};
restic.backups.home = {
passwordFile = "/etc/nixos/secrets/restic-password";
paths = [ "/home" ];
repository = "sftp:fetcher@brix:/mnt/data/backup-targets";
timerConfig = { OnCalendar = "hourly"; };
};
gnome3 = {
chrome-gnome-shell.enable = true;
gnome-keyring.enable = true;
};
xserver = {
enable = true;
layout = "pl";
libinput = {
enable = true;
naturalScrolling = false;
clickMethod = "clickfinger";
};
desktopManager = {
gnome3 = {
enable = true;
};
};
displayManager.gdm= {
enable = true;
wayland = false;
};
};
};
security.pam.services.gdm.enableGnomeKeyring = true;
sound.enable = true;
networking.networkmanager.enable = true;
hardware.enableRedistributableFirmware = true;
hardware.cpu.intel.updateMicrocode = true;
hardware.pulseaudio.enable = true;
hardware.u2f.enable = true;
hardware.brightnessctl.enable = true;
hardware.sane.enable = true;
powerManagement.cpuFreqGovernor = (lib.mkForce null);
nix.gc.automatic = true;
system.autoUpgrade.enable = true;
system.stateVersion = "19.03";
}

View file

@ -3,16 +3,16 @@
let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
in
{
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
unstable = import unstableTarball {
config = config.nixpkgs.config;
{
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
unstable = import unstableTarball {
config = config.nixpkgs.config;
};
};
};
};
home.packages = with pkgs; [
home.packages = with pkgs; [
keepass fontconfig nodejs rustup gcc gdb
binutils xclip pkgconfig veracrypt gitAndTools.diff-so-fancy
gnome3.gnome-shell-extensions chrome-gnome-shell gnomeExtensions.clipboard-indicator
@ -28,55 +28,25 @@ in
];
imports = [
./programs/zsh.nix
./programs/vim.nix
./programs/alacritty.nix
];
];
programs = {
home-manager.enable = true;
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;
shortcut = "a";
extraConfig = ''
set -g status off
set -g mouse on
fzf.enable = true;
tmux = {
enable = true;
shortcut = "a";
extraConfig = ''
set -g status off
set -g mouse on
'';
};
firefox.enable = true;
chromium.enable = true;
go.enable = true;
bat.enable = true;
};
firefox.enable = true;
chromium.enable = true;
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"
];
};
}

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 {
@ -11,10 +11,10 @@ in
};
};
services.syncthing = {
enable = true;
user = "cyryl";
dataDir = "/home/cyryl/.syncthing";
openDefaultPorts = true;
package = pkgs.unstable.syncthing;
enable = true;
user = "cyryl";
dataDir = "/home/cyryl/.syncthing";
openDefaultPorts = true;
package = pkgs.unstable.syncthing;
};
}
}

View file

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

View file

@ -3,154 +3,154 @@
let
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
in
{
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
unstable = import unstableTarball {
config = config.nixpkgs.config;
{
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
unstable = import unstableTarball {
config = config.nixpkgs.config;
};
};
};
};
users.users.cyryl = {
users.users.cyryl = {
packages = with pkgs; [
(unstable.vscode-with-extensions.override {
vscodeExtensions = with vscode-extensions; [ bbenoist.Nix ms-python.python ]
++ vscode-utils.extensionsFromVscodeMarketplace [
vscodeExtensions = with vscode-extensions; [ bbenoist.Nix ms-python.python ]
++ vscode-utils.extensionsFromVscodeMarketplace [
{
publisher = "2gua";
name = "rainbow-brackets";
version = "0.0.6";
sha256 = "1m5c7jjxphawh7dmbzmrwf60dz4swn8c31svbzb5nhaazqbnyl2d";
publisher = "2gua";
name = "rainbow-brackets";
version = "0.0.6";
sha256 = "1m5c7jjxphawh7dmbzmrwf60dz4swn8c31svbzb5nhaazqbnyl2d";
}
{
publisher = "vscodevim";
name = "vim";
version = "1.4.0";
sha256 = "0vfhvsp485rgik3pjzbpnc4jxrjpiykynl563a16rlz8h85x2m4f";
publisher = "vscodevim";
name = "vim";
version = "1.4.0";
sha256 = "0vfhvsp485rgik3pjzbpnc4jxrjpiykynl563a16rlz8h85x2m4f";
}
{
publisher = "swyphcosmo";
name = "spellchecker";
version = "1.2.13";
sha256 = "1lr33lf01afgi74c1a9gylk92li4hyq24l8bki4l6ggl4z4c2h3w";
publisher = "swyphcosmo";
name = "spellchecker";
version = "1.2.13";
sha256 = "1lr33lf01afgi74c1a9gylk92li4hyq24l8bki4l6ggl4z4c2h3w";
}
{
publisher = "asabil";
name = "meson";
version = "1.1.1";
sha256 = "00cc28a2nb325f54bx51wf5q15x1pmsn0j9z6rnxxqxwii1dm5cl";
publisher = "asabil";
name = "meson";
version = "1.1.1";
sha256 = "00cc28a2nb325f54bx51wf5q15x1pmsn0j9z6rnxxqxwii1dm5cl";
}
{
publisher = "bungcip";
name = "better-toml";
version = "0.3.2";
sha256 = "08lhzhrn6p0xwi0hcyp6lj9bvpfj87vr99klzsiy8ji7621dzql3";
publisher = "bungcip";
name = "better-toml";
version = "0.3.2";
sha256 = "08lhzhrn6p0xwi0hcyp6lj9bvpfj87vr99klzsiy8ji7621dzql3";
}
{
publisher = "codezombiech";
name = "gitignore";
version = "0.6.0";
sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b";
publisher = "codezombiech";
name = "gitignore";
version = "0.6.0";
sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b";
}
{
publisher = "DavidAnson";
name = "vscode-markdownlint";
version = "0.26.0";
sha256 = "0g4pssvajn7d8p2547v7313gjyqx4pzs7cbjws2s3v2fk1sw7vbj";
publisher = "DavidAnson";
name = "vscode-markdownlint";
version = "0.26.0";
sha256 = "0g4pssvajn7d8p2547v7313gjyqx4pzs7cbjws2s3v2fk1sw7vbj";
}
{
publisher = "esbenp";
name = "prettier-vscode";
version = "1.8.1";
sha256 = "0qcm2784n9qc4p77my1kwqrswpji7bp895ay17yzs5g84cj010ln";
publisher = "esbenp";
name = "prettier-vscode";
version = "1.8.1";
sha256 = "0qcm2784n9qc4p77my1kwqrswpji7bp895ay17yzs5g84cj010ln";
}
{
publisher = "hbenl";
name = "vscode-test-explorer";
version = "2.9.3";
sha256 = "1yf85hgvganxq5n5jff9ckn3smxd6xi79cgn6k53qi5w1r5rahy0";
publisher = "hbenl";
name = "vscode-test-explorer";
version = "2.9.3";
sha256 = "1yf85hgvganxq5n5jff9ckn3smxd6xi79cgn6k53qi5w1r5rahy0";
}
{
publisher = "hbenl";
name = "vscode-test-explorer-liveshare";
version = "1.0.4";
sha256 = "0a57cm8bjfvz2whkr6krjv3whv9c7sdzlrjwdr5zaz78nxn9dfy7";
publisher = "hbenl";
name = "vscode-test-explorer-liveshare";
version = "1.0.4";
sha256 = "0a57cm8bjfvz2whkr6krjv3whv9c7sdzlrjwdr5zaz78nxn9dfy7";
}
{
publisher = "lextudio";
name = "restructuredtext";
version = "106.0.0";
sha256 = "096r8071202nxi1is6z7dghcmpsh0f0mm3mp3cfh1yj2mnyzlaxa";
publisher = "lextudio";
name = "restructuredtext";
version = "106.0.0";
sha256 = "096r8071202nxi1is6z7dghcmpsh0f0mm3mp3cfh1yj2mnyzlaxa";
}
{
publisher = "lostintangent";
name = "vsls-pomodoro";
version = "0.1.0";
sha256 = "1b73zbkhlhacvi18cx4g3n6randy3hw9cab1gkw5gzb3375w7w3p";
publisher = "lostintangent";
name = "vsls-pomodoro";
version = "0.1.0";
sha256 = "1b73zbkhlhacvi18cx4g3n6randy3hw9cab1gkw5gzb3375w7w3p";
}
{
publisher = "lostintangent";
name = "vsls-whiteboard";
version = "0.0.8";
sha256 = "13fcay9bs861msb5y694casbw66dmhl504xm5cvprssx1qka186p";
publisher = "lostintangent";
name = "vsls-whiteboard";
version = "0.0.8";
sha256 = "13fcay9bs861msb5y694casbw66dmhl504xm5cvprssx1qka186p";
}
{
publisher = "mauve";
name = "terraform";
version = "1.3.9";
sha256 = "0hnarr21rivvv41y5x1sp0skdmzwz7zi9aya3n5z1b13ir7lyy42";
publisher = "mauve";
name = "terraform";
version = "1.3.9";
sha256 = "0hnarr21rivvv41y5x1sp0skdmzwz7zi9aya3n5z1b13ir7lyy42";
}
{
publisher = "mechatroner";
name = "rainbow-csv";
version = "1.0.0";
sha256 = "1fyamgm7zq31r3c00cn6pcb66rrkfhwfmp72qnhrajydmnvcnbg6";
publisher = "mechatroner";
name = "rainbow-csv";
version = "1.0.0";
sha256 = "1fyamgm7zq31r3c00cn6pcb66rrkfhwfmp72qnhrajydmnvcnbg6";
}
{
publisher = "ms-vscode";
name = "Go";
version = "0.9.2";
sha256 = "0yxnsby8zz1dvnx8nqrhi4xx316mpjf2hs2c5r6fkzh8zhjccwqz";
publisher = "ms-vscode";
name = "Go";
version = "0.9.2";
sha256 = "0yxnsby8zz1dvnx8nqrhi4xx316mpjf2hs2c5r6fkzh8zhjccwqz";
}
{
publisher = "ms-vsliveshare";
name = "vsliveshare";
version = "1.0.67";
sha256 = "1shy9xaqz1wsyzzz5z8g409ma5h5kaic0y7bc1q2nxy60gbq828n";
publisher = "ms-vsliveshare";
name = "vsliveshare";
version = "1.0.67";
sha256 = "1shy9xaqz1wsyzzz5z8g409ma5h5kaic0y7bc1q2nxy60gbq828n";
}
{
publisher = "ms-vsliveshare";
name = "vsliveshare-audio";
version = "0.1.48";
sha256 = "1lccsyhj3mgbacw76hikgml85hi82zipaza1194nqnj1inhci80b";
publisher = "ms-vsliveshare";
name = "vsliveshare-audio";
version = "0.1.48";
sha256 = "1lccsyhj3mgbacw76hikgml85hi82zipaza1194nqnj1inhci80b";
}
{
publisher = "ritwickdey";
name = "LiveServer";
version = "5.6.1";
sha256 = "077arf3hsn1yb8xdhlrax5gf93ljww78irv4gm8ffmsqvcr1kws0";
publisher = "ritwickdey";
name = "LiveServer";
version = "5.6.1";
sha256 = "077arf3hsn1yb8xdhlrax5gf93ljww78irv4gm8ffmsqvcr1kws0";
}
{
publisher = "ronnidc";
name = "nunjucks";
version = "0.2.3";
sha256 = "119xgyn1dggw2rcqkn2mnz364iw5jlrxg7pcydbijsqj5d3zdfsf";
publisher = "ronnidc";
name = "nunjucks";
version = "0.2.3";
sha256 = "119xgyn1dggw2rcqkn2mnz364iw5jlrxg7pcydbijsqj5d3zdfsf";
}
{
publisher = "rust-lang";
name = "rust";
version = "0.6.1";
sha256 = "0f66z6b374nvnrn7802dg0xz9f8wq6sjw3sb9ca533gn5jd7n297";
publisher = "rust-lang";
name = "rust";
version = "0.6.1";
sha256 = "0f66z6b374nvnrn7802dg0xz9f8wq6sjw3sb9ca533gn5jd7n297";
}
{
publisher = "serayuzgur";
name = "crates";
version = "0.4.2";
sha256 = "1knspsc98cfw4mhc0yaz0f2185sxdf9kn9qsysfs6c82g9wjaqcj";
publisher = "serayuzgur";
name = "crates";
version = "0.4.2";
sha256 = "1knspsc98cfw4mhc0yaz0f2185sxdf9kn9qsysfs6c82g9wjaqcj";
}
];})
];
};
}
];})
];
};
}