From 6e34ca8bda9cddcce1ea73f73b883a3ec8358678 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 14 Oct 2022 18:01:11 +0200 Subject: Reformat nix files --- user/settings/darwin.nix | 64 +++++++++++++++----------------- user/settings/development/javascript.nix | 10 ++--- user/settings/satoshipay.nix | 4 +- user/settings/tabnine.nix | 40 ++++++++++---------- 4 files changed, 57 insertions(+), 61 deletions(-) (limited to 'user/settings') diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix index ab7afe15..50d84464 100644 --- a/user/settings/darwin.nix +++ b/user/settings/darwin.nix @@ -3,41 +3,37 @@ { nixpkgs.overlays = [ (self: super: { - darwin-zsh-completions = super.runCommand "darwin-zsh-completions-0.0.0" - { preferLocalBuild = true; } - '' - mkdir -p $out/share/zsh/site-functions - cat <<-'EOF' > $out/share/zsh/site-functions/_darwin-rebuild - #compdef darwin-rebuild - #autoload - _nix-common-options - local -a _1st_arguments - _1st_arguments=( - 'switch:Build, activate, and update the current generation'\ - 'build:Build without activating or updating the current generation'\ - 'check:Build and run the activation sanity checks'\ - 'changelog:Show most recent entries in the changelog'\ - ) - _arguments \ - '--list-generations[Print a list of all generations in the active profile]'\ - '--rollback[Roll back to the previous configuration]'\ - {--switch-generation,-G}'[Activate specified generation]'\ - '(--profile-name -p)'{--profile-name,-p}'[Profile to use to track current and previous system configurations]:Profile:_nix_profiles'\ - '1:: :->subcmds' && return 0 - case $state in - subcmds) - _describe -t commands 'darwin-rebuild subcommands' _1st_arguments - ;; - esac - EOF - ''; - }) - ]; - home.packages = with pkgs; [ - aspell - aspellDicts.en - darwin-zsh-completions + darwin-zsh-completions = super.runCommand "darwin-zsh-completions-0.0.0" { + preferLocalBuild = true; + } '' + mkdir -p $out/share/zsh/site-functions + cat <<-'EOF' > $out/share/zsh/site-functions/_darwin-rebuild + #compdef darwin-rebuild + #autoload + _nix-common-options + local -a _1st_arguments + _1st_arguments=( + 'switch:Build, activate, and update the current generation'\ + 'build:Build without activating or updating the current generation'\ + 'check:Build and run the activation sanity checks'\ + 'changelog:Show most recent entries in the changelog'\ + ) + _arguments \ + '--list-generations[Print a list of all generations in the active profile]'\ + '--rollback[Roll back to the previous configuration]'\ + {--switch-generation,-G}'[Activate specified generation]'\ + '(--profile-name -p)'{--profile-name,-p}'[Profile to use to track current and previous system configurations]:Profile:_nix_profiles'\ + '1:: :->subcmds' && return 0 + case $state in + subcmds) + _describe -t commands 'darwin-rebuild subcommands' _1st_arguments + ;; + esac + EOF + ''; + }) ]; + home.packages = with pkgs; [ aspell aspellDicts.en darwin-zsh-completions ]; programs.emacs.package = pkgs.emacsMacport; diff --git a/user/settings/development/javascript.nix b/user/settings/development/javascript.nix index b07c134a..232ad4ce 100644 --- a/user/settings/development/javascript.nix +++ b/user/settings/development/javascript.nix @@ -20,11 +20,11 @@ in ] else [ - # npm install may use any of these - binutils - gnumake - gcc - python2 + # npm install may use any of these + binutils + gnumake + gcc + python2 ] )) ++ (with pkgs.nodePackages; [ node2nix diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix index 6a1f738f..4e96a227 100644 --- a/user/settings/satoshipay.nix +++ b/user/settings/satoshipay.nix @@ -76,8 +76,8 @@ in initExtra = '' if [[ -n $commands[helm] ]] then - autoload _helm - compdef _helm helm + autoload _helm + compdef _helm helm fi ''; }; diff --git a/user/settings/tabnine.nix b/user/settings/tabnine.nix index cb503938..78b8a513 100644 --- a/user/settings/tabnine.nix +++ b/user/settings/tabnine.nix @@ -5,9 +5,9 @@ let version = "3.2.28"; target = if stdenv.isDarwin then - "x86_64-apple-darwin" + "x86_64-apple-darwin" else - "x86_64-unknown-linux-musl"; + "x86_64-unknown-linux-musl"; tabninePackage = (pkgs.fetchurl { url = "https://update.tabnine.com/${version}/${target}/TabNine"; @@ -36,24 +36,24 @@ in { disable_auto_update = true; user_understands_that_enabling_tabnine_cloud_sends_code_to_tabnine_servers = false; - hosted_deep_completions_enabled = "Disabled"; - tabnine_cloud_certificate_domain = null; - tabnine_cloud_host = null; - tabnine_cloud_port = null; - cloud_whitelist = [ ]; - api_key = null; - api_key_service_level = null; - api_base_url = null; - local_enabled = "Yes"; - local_indexing = null; - local_model_size = null; - disable_local_when_using_battery = false; - hide_deep_information_message = false; - enable_power_saving_mode = false; - enable_telemetry = false; - generation = "0"; - rate_limit_interval_seconds = null; - rate_limit_amount = null; + hosted_deep_completions_enabled = "Disabled"; + tabnine_cloud_certificate_domain = null; + tabnine_cloud_host = null; + tabnine_cloud_port = null; + cloud_whitelist = [ ]; + api_key = null; + api_key_service_level = null; + api_base_url = null; + local_enabled = "Yes"; + local_indexing = null; + local_model_size = null; + disable_local_when_using_battery = false; + hide_deep_information_message = false; + enable_power_saving_mode = false; + enable_telemetry = false; + generation = "0"; + rate_limit_interval_seconds = null; + rate_limit_amount = null; }; lspConfig = { "language.typescript" = { -- cgit 1.4.1