chore: format with alejandra

2023-02-07 18:24:28 +01:00 · 2023-02-07 18:24:28 +01:00 · 89f5f65f2d
commit 89f5f65f2d
parent 05f0cbdfb4
181 changed files with 2720 additions and 2560 deletions
--- a/_archive/environments/dev/cross.nix
+++ b/_archive/environments/dev/cross.nix
@ -45,7 +45,7 @@ import /home/steveej/src/github/NixOS/nixpkgs/default.nix {
 #          # we'll also add one of our own patches
 #          { patch = ./dts.patch; name = "dts-fix"; }
 #        ];
-#   
+#
 #        # add "CONFIG_PPP_FILTER y" option to the set of kernel options
 #        extraConfig = ''
 #           HAVE_IMX_ANATOP y
@ -87,3 +87,4 @@ import /home/steveej/src/github/NixOS/nixpkgs/default.nix {
 #      };
 #    };
 #  };
+
--- a/_archive/environments/dev/go/default.nix
+++ b/_archive/environments/dev/go/default.nix
@ -1,6 +1,11 @@
-{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
-, name ? "generic", version, extraBuildInputs ? [ ], extraShellHook ? "" }:
-let
+{
+  gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
+  pkgs ? gitpkgs,
+  name ? "generic",
+  version,
+  extraBuildInputs ? [],
+  extraShellHook ? "",
+}: let
  go = builtins.getAttr "go_${version}" pkgs;
  commonVimRC = ''
    let g:tagbar_type_go = {
@ -66,19 +71,19 @@ let
    #      ( import ./vim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
    #      ( import ./neovim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
  ];
+in
+  pkgs.stdenv.mkDerivation {
+    inherit name;
+    buildInputs = extraBuildInputs ++ buildInputs;
+    shellHook = ''
+      goname=${go.version}_$name
+      # FIXME: setPS1 $goname
+      export GOROOT=${go}/share/go
+      export GOPATH="$HOME/.gopath_$goname"
+      export PATH="$HOME/.gopath_$goname/bin:$PATH"
+      unset name
+      unset SSL_CERT_FILE

-in pkgs.stdenv.mkDerivation {
-  inherit name;
-  buildInputs = extraBuildInputs ++ buildInputs;
-  shellHook = ''
-    goname=${go.version}_$name
-    # FIXME: setPS1 $goname
-    export GOROOT=${go}/share/go
-    export GOPATH="$HOME/.gopath_$goname"
-    export PATH="$HOME/.gopath_$goname/bin:$PATH"
-    unset name
-    unset SSL_CERT_FILE
-
-    ${extraShellHook}
-  '';
-}
+      ${extraShellHook}
+    '';
+  }
--- a/_archive/environments/dev/go/neovim-go.nix
+++ b/_archive/environments/dev/go/neovim-go.nix
@ -1,11 +1,12 @@
-{ commonRC, ... }@args:
-
-(import ../../pkg-configuration/vim-derivates/neovim.nix args // {
-  additionalRC = commonRC + ''
-    " deoplete {
-    let g:deoplete#enable_at_startup = 1
-    let g:deoplete#enable_smart_case = 1
-    " }
-  '';
-  additionalPlugins = [ "deoplete-go" "deoplete-nvim" "vim-go" ];
-})
+{commonRC, ...} @ args: (import ../../pkg-configuration/vim-derivates/neovim.nix args
+  // {
+    additionalRC =
+      commonRC
+      + ''
+        " deoplete {
+        let g:deoplete#enable_at_startup = 1
+        let g:deoplete#enable_smart_case = 1
+        " }
+      '';
+    additionalPlugins = ["deoplete-go" "deoplete-nvim" "vim-go"];
+  })
--- a/_archive/environments/dev/pandoc.nix
+++ b/_archive/environments/dev/pandoc.nix
@ -1,24 +1,31 @@
-{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
-, name ? "generic", version ? "Stable", extraBuildInputs ? [ ] }:
-let commonVimRC = "";
-in pkgs.stdenv.mkDerivation {
-  inherit name;
-  buildInputs = with pkgs;
-    [
-      (import ./vim-pandoc.nix {
-        pkgs = gitpkgs;
-        commonRC = commonVimRC;
-      })
-      pandoc
-      texlive.combined.scheme-medium
-      python27Packages.pandocfilters
-      python27Packages.htmltreediff
-      python27Packages.html5lib
-      python27Packages.dbus-python
-    ] ++ extraBuildInputs;
-  shellHook = ''
-    pandocname=pandoc_${pkgs.pandoc.version}
-    setPS1 $pandocname
-    unset name
-  '';
-}
+{
+  gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
+  pkgs ? gitpkgs,
+  name ? "generic",
+  version ? "Stable",
+  extraBuildInputs ? [],
+}: let
+  commonVimRC = "";
+in
+  pkgs.stdenv.mkDerivation {
+    inherit name;
+    buildInputs = with pkgs;
+      [
+        (import ./vim-pandoc.nix {
+          pkgs = gitpkgs;
+          commonRC = commonVimRC;
+        })
+        pandoc
+        texlive.combined.scheme-medium
+        python27Packages.pandocfilters
+        python27Packages.htmltreediff
+        python27Packages.html5lib
+        python27Packages.dbus-python
+      ]
+      ++ extraBuildInputs;
+    shellHook = ''
+      pandocname=pandoc_${pkgs.pandoc.version}
+      setPS1 $pandocname
+      unset name
+    '';
+  }
--- a/_archive/environments/dev/rkt.nix
+++ b/_archive/environments/dev/rkt.nix
@ -1,6 +1,8 @@
-{ pkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }
-, mkGoEnv ? import ./go.nix, rktPath, }:
-let
+{
+  pkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
+  mkGoEnv ? import ./go.nix,
+  rktPath,
+}: let
  rktBasebuildInputs = with pkgs; [
    glibc.out
    glibc.static
@ -28,7 +30,7 @@ let
    TARGET=$GOPATH/src/github.com/coreos/rkt
    if [[ -e ${rktPath}/rkt/rkt.go ]]; then
      pushd ${rktPath}
-    else 
+    else
      echo rktPath must be run the rkt repository clone, but got '${rktPath}'
      exit 1
    fi
--- a/_archive/environments/dev/rust/default.nix
+++ b/_archive/environments/dev/rust/default.nix
@ -1,29 +1,39 @@
-{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
-, name ? "generic", version ? "Stable", extraBuildInputs ? [ ] }:
-let
+{
+  gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
+  pkgs ? gitpkgs,
+  name ? "generic",
+  version ? "Stable",
+  extraBuildInputs ? [],
+}: let
  rustPackages = builtins.getAttr "rust${version}" pkgs;
  rustc = rustPackages.rustc;
-  rustShellHook = { rustc, name }: ''
+  rustShellHook = {
+    rustc,
+    name,
+  }: ''
    rustname=rust_${rustc.version}_${name}
    setPS1 $rustname
    unset name
  '';
  commonVimRC = "";
-in pkgs.stdenv.mkDerivation {
-  inherit name;
-  buildInputs = with rustPackages;
-    [
-      (import ./vim-rust.nix {
-        pkgs = gitpkgs;
-        commonRC = commonVimRC;
-        inherit rustc;
-        racerd = pkgs.rustracerd;
-      })
-      rustc
-      cargo
-    ] ++ [ pkgs.rustfmt ] ++ extraBuildInputs;
-  shellHook = (rustShellHook) {
+in
+  pkgs.stdenv.mkDerivation {
    inherit name;
-    inherit rustc;
-  };
-}
+    buildInputs = with rustPackages;
+      [
+        (import ./vim-rust.nix {
+          pkgs = gitpkgs;
+          commonRC = commonVimRC;
+          inherit rustc;
+          racerd = pkgs.rustracerd;
+        })
+        rustc
+        cargo
+      ]
+      ++ [pkgs.rustfmt]
+      ++ extraBuildInputs;
+    shellHook = rustShellHook {
+      inherit name;
+      inherit rustc;
+    };
+  }
--- a/_archive/environments/dev/vim-go.nix
+++ b/_archive/environments/dev/vim-go.nix
@ -1,17 +1,19 @@
-{ commonRC, ... }@args:
-
-import ../../pkg-configuration/vim-derivates/vim.nix (args // {
-  name = "vim-for-go";
-  additionalRC = commonRC + ''
-    	  " Disable AutoComplPop.
-    	  let g:acp_enableAtStartup = 0
-    	  " Use neocomplete.
-    	  let g:neocomplete#enable_at_startup = 1
-    	  " Use smartcase.
-    	  let g:neocomplete#enable_smart_case = 1
-          if !exists('g:neocomplete#sources#omni#input_patterns')
-    		let g:neocomplete#sources#omni#input_patterns = {}
-    	  endif
-     '';
-  additionalPlugins = [ "neocomplete" "vim-go" ];
-})
+{commonRC, ...} @ args:
+import ../../pkg-configuration/vim-derivates/vim.nix (args
+  // {
+    name = "vim-for-go";
+    additionalRC =
+      commonRC
+      + ''
+         " Disable AutoComplPop.
+         let g:acp_enableAtStartup = 0
+         " Use neocomplete.
+         let g:neocomplete#enable_at_startup = 1
+         " Use smartcase.
+         let g:neocomplete#enable_smart_case = 1
+            if !exists('g:neocomplete#sources#omni#input_patterns')
+        let g:neocomplete#sources#omni#input_patterns = {}
+         endif
+      '';
+    additionalPlugins = ["neocomplete" "vim-go"];
+  })
--- a/_archive/environments/dev/vim-pandoc.nix
+++ b/_archive/environments/dev/vim-pandoc.nix
@ -1,16 +1,18 @@
-{ commonRC, ... }@args:
+{commonRC, ...} @ args:
+import ../../pkg-configuration/vim-derivates/vim.nix (args
+  // {
+    name = "vim-for-pandoc";
+    additionalRC =
+      commonRC
+      + ''
+        set statusline+=%#warningmsg#
+        set statusline+=%{SyntasticStatuslineFlag()}
+        set statusline+=%*

-import ../../pkg-configuration/vim-derivates/vim.nix (args // {
-  name = "vim-for-pandoc";
-  additionalRC = commonRC + ''
-    set statusline+=%#warningmsg#
-    set statusline+=%{SyntasticStatuslineFlag()}
-    set statusline+=%*
-
-    let g:syntastic_always_populate_loc_list = 1
-    let g:syntastic_auto_loc_list = 1
-    let g:syntastic_check_on_open = 1
-    let g:syntastic_check_on_wq = 0
-  '';
-  additionalPlugins = [ "vim-pandoc" "vim-pandoc-syntax" "vimpreviewpandoc" ];
-})
+        let g:syntastic_always_populate_loc_list = 1
+        let g:syntastic_auto_loc_list = 1
+        let g:syntastic_check_on_open = 1
+        let g:syntastic_check_on_wq = 0
+      '';
+    additionalPlugins = ["vim-pandoc" "vim-pandoc-syntax" "vimpreviewpandoc"];
+  })
--- a/_archive/environments/dev/vim-rust.nix
+++ b/_archive/environments/dev/vim-rust.nix
@ -1,41 +1,48 @@
-{ commonRC, rustc, racerd, ... }@args:
+{
+  commonRC,
+  rustc,
+  racerd,
+  ...
+} @ args:
+import ../../pkg-configuration/vim-derivates/vim.nix (args
+  // {
+    name = "vim-for-rust";
+    additionalRC =
+      commonRC
+      + ''
+        set statusline+=%#warningmsg#
+        set statusline+=%{SyntasticStatuslineFlag()}
+        set statusline+=%*

-import ../../pkg-configuration/vim-derivates/vim.nix (args // {
-  name = "vim-for-rust";
-  additionalRC = commonRC + ''
-    set statusline+=%#warningmsg#
-    set statusline+=%{SyntasticStatuslineFlag()}
-    set statusline+=%*
+        let g:syntastic_always_populate_loc_list = 1
+        let g:syntastic_auto_loc_list = 1
+        let g:syntastic_check_on_open = 1
+        let g:syntastic_check_on_wq = 0

-    let g:syntastic_always_populate_loc_list = 1
-    let g:syntastic_auto_loc_list = 1
-    let g:syntastic_check_on_open = 1
-    let g:syntastic_check_on_wq = 0
+        " tagbar
+        let g:tagbar_type_rust = {
+            \ 'ctagstype' : 'rust',
+            \ 'kinds' : [
+                \'T:types,type definitions',
+                \'f:functions,function definitions',
+                \'g:enum,enumeration names',
+                \'s:structure names',
+                \'m:modules,module names',
+                \'c:consts,static constants',
+                \'t:traits,traits',
+                \'i:impls,trait implementations',
+            \]
+        \}

-    " tagbar
-    let g:tagbar_type_rust = {
-        \ 'ctagstype' : 'rust',
-        \ 'kinds' : [
-            \'T:types,type definitions',
-            \'f:functions,function definitions',
-            \'g:enum,enumeration names',
-            \'s:structure names',
-            \'m:modules,module names',
-            \'c:consts,static constants',
-            \'t:traits,traits',
-            \'i:impls,trait implementations',
-        \]
-    \}
+        let g:syntastic_rust_checkers = ["rustc"]

-    let g:syntastic_rust_checkers = ["rustc"]
+        "rustfmt
+        let g:rustfmt_autosave = 1

-    "rustfmt
-    let g:rustfmt_autosave = 1
+        let g:ycm_auto_trigger = 1
+        let g:ycm_rust_src_path = '${rustc.src}/src'
+        let g:ycm_racerd_binary_path = '${racerd.out}/bin/racerd'

-    let g:ycm_auto_trigger = 1
-    let g:ycm_rust_src_path = '${rustc.src}/src'
-    let g:ycm_racerd_binary_path = '${racerd.out}/bin/racerd'
-
-  '';
-  additionalPlugins = [ "rust-vim" ];
-})
+      '';
+    additionalPlugins = ["rust-vim"];
+  })
--- a/_archive/environments/fhs/android.nix
+++ b/_archive/environments/fhs/android.nix
@ -1,43 +1,42 @@
-{ pkgs ? import <nixpkgs> { } }:
-
+{pkgs ? import <nixpkgs> {}}:
 (pkgs.buildFHSUserEnv {
  name = "devfhs";
-  multiPkgs = pkgs:
-    (with pkgs; [
-      android-udev-rules
-      sudo
-      gawk
-      bzip2
-      file
-      gcc
-      getopt
-      git
-      gnumake
-      ncurses
-      openssl
-      patch
-      perl
-      pkgconfig
-      python
-      openssh
-      subversion
-      unzip
-      wget
-      which
-      vim
-      zlib
-      libusb
-      libusb1
-      systemd
-      strace
-      swt
-      xorg.libXtst
-      glib
-      gtk2
-      gnome.gtk
-    ]);
+  multiPkgs = pkgs: (with pkgs; [
+    android-udev-rules
+    sudo
+    gawk
+    bzip2
+    file
+    gcc
+    getopt
+    git
+    gnumake
+    ncurses
+    openssl
+    patch
+    perl
+    pkgconfig
+    python
+    openssh
+    subversion
+    unzip
+    wget
+    which
+    vim
+    zlib
+    libusb
+    libusb1
+    systemd
+    strace
+    swt
+    xorg.libXtst
+    glib
+    gtk2
+    gnome.gtk
+  ]);
  profile = ''
    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/lib:/lib64:/lib32:/usr/lib32:/usr/lib64:${pkgs.xorg.libXtst}/lib:${pkgs.glib}/lib:${pkgs.gtk2}/lib
  '';
  runScript = "bash";
-}).env
+})
+.env
--- a/_archive/environments/fhs/vscode.nix
+++ b/_archive/environments/fhs/vscode.nix
@ -1,37 +1,36 @@
-{ pkgs ? import <nixpkgs> { } }:
-
+{pkgs ? import <nixpkgs> {}}:
 (pkgs.buildFHSUserEnv {
  name = "everydayFHS";
-  targetPkgs = pkgs:
-    (with pkgs; [
-      which
-      gitFull
-      zsh
-      file
-      direnv
+  targetPkgs = pkgs: (with pkgs; [
+    which
+    gitFull
+    zsh
+    file
+    direnv

-      xdg_utils
-      xsel
+    xdg_utils
+    xsel

-      vscode
+    vscode

-      # vscode live share
-      gnome3.gcr
-      libgnome_keyring3
-      liburcu
-      libunwind
-      lttng-ust
-      curl
-      openssl
-      libkrb5
-      libuuid
-      icu
-      zlib
-      libsecret
-    ]);
-  multiPkgs = pkgs: (with pkgs; [ ]);
+    # vscode live share
+    gnome3.gcr
+    libgnome_keyring3
+    liburcu
+    libunwind
+    lttng-ust
+    curl
+    openssl
+    libkrb5
+    libuuid
+    icu
+    zlib
+    libsecret
+  ]);
+  multiPkgs = pkgs: (with pkgs; []);
  profile = ''
    export SHELL=/bin/zsh
  '';
  # FIXME runScript = "$SHELL";
-}).env
+})
+.env