diff --git a/common/default.nix b/common/default.nix index 5b96051..7d4e51f 100644 --- a/common/default.nix +++ b/common/default.nix @@ -257,7 +257,11 @@ else publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJk3a190w/1TZkzVKORvz/kwyKmFY144lVeDFm80p17"; }; "rsync.net" = { - extraHostNames = [ "rsn" "rsyncnet" "fm2382.rsync.net" ]; + extraHostNames = [ + "rsn" + "rsyncnet" + "fm2382.rsync.net" + ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINdUkGe6kKn5ssz4WRZKjcws0InbQqZayenzk9obmP1z"; }; diff --git a/common/defaultPackages.nix b/common/defaultPackages.nix index 87b898b..396badc 100644 --- a/common/defaultPackages.nix +++ b/common/defaultPackages.nix @@ -87,7 +87,10 @@ lib.mkMerge [ }) { vacu.packages.ffmpeg-vacu-full.enable = config.vacu.systemKind == "desktop"; - vacu.packages.ffmpeg-vacu-headless.enable = config.vacu.systemKind != "minimal" && config.vacu.systemKind != "container" && config.vacu.systemKind != "desktop"; + vacu.packages.ffmpeg-vacu-headless.enable = + config.vacu.systemKind != "minimal" + && config.vacu.systemKind != "container" + && config.vacu.systemKind != "desktop"; } { vacu.packages = { @@ -122,63 +125,62 @@ lib.mkMerge [ }; } { - vacu.packages = - with pkgs; [ - bash - bzip2 - curl - ddrescue - diffutils - dig - dnsutils - ethtool - file - findutils - gnugrep - gnused - gnutar - gnutls - gzip - hostname - htop - inetutils - iperf3 - iputils - jq - killall - lsof - mosh - nano - ncdu - netcat-openbsd - nixos-rebuild - openssh - "p7zip-unfree" - pciutils - progress - psutils - pv - ripgrep - rsync - screen - # sed => gnused - sops - sshfs - ssh-to-age - # tar => gnutar - tmux - tree - tzdata - # units => vacu-units - unzip - usbutils - util-linux - "vacu-units" - vim - wget - which - xz - zip - ]; + vacu.packages = with pkgs; [ + bash + bzip2 + curl + ddrescue + diffutils + dig + dnsutils + ethtool + file + findutils + gnugrep + gnused + gnutar + gnutls + gzip + hostname + htop + inetutils + iperf3 + iputils + jq + killall + lsof + mosh + nano + ncdu + netcat-openbsd + nixos-rebuild + openssh + "p7zip-unfree" + pciutils + progress + psutils + pv + ripgrep + rsync + screen + # sed => gnused + sops + sshfs + ssh-to-age + # tar => gnutar + tmux + tree + tzdata + # units => vacu-units + unzip + usbutils + util-linux + "vacu-units" + vim + wget + which + xz + zip + ]; } ] diff --git a/common/package-set.nix b/common/package-set.nix index 2367c1f..6d361dc 100644 --- a/common/package-set.nix +++ b/common/package-set.nix @@ -33,7 +33,8 @@ let readOnly = true; }; }; - config.finalPackage = if config.overrides == null then config.package else config.package.override config.overrides; + config.finalPackage = + if config.overrides == null then config.package else config.package.override config.overrides; } ) ); diff --git a/common/sourceTree.nix b/common/sourceTree.nix index 262a05c..1cc945d 100644 --- a/common/sourceTree.nix +++ b/common/sourceTree.nix @@ -47,7 +47,9 @@ in }; config = { - vacu.sourceTree = inputsOf inputs.self // { inherit inputs; }; + vacu.sourceTree = inputsOf inputs.self // { + inherit inputs; + }; # vacu.sourceTree = pkgs.runCommand "inputs-tree" { } '' # mkdir -p $out # ln -s ${inputs.self} $out/self diff --git a/compute-deck/default.nix b/compute-deck/default.nix index 35e63a4..866d674 100644 --- a/compute-deck/default.nix +++ b/compute-deck/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - inputs, - ... -}: +{ pkgs, inputs, ... }: { imports = [ inputs.jovian.nixosModules.jovian diff --git a/flake.nix b/flake.nix index e91601c..a640bf4 100644 --- a/flake.nix +++ b/flake.nix @@ -175,10 +175,11 @@ map (name: lib.nameValuePair name inputs.${name + suffix}) inp' ); in - thisInputsA // { - inherit nixpkgs; - inherit (inputs) self; - }; + thisInputsA + // { + inherit nixpkgs; + inherit (inputs) self; + }; mkNixosConfig = { unstable ? false, @@ -210,7 +211,12 @@ ); lib = { - inherit mkPlain mkPkgs mkInputs mkNixosConfig; + inherit + mkPlain + mkPkgs + mkInputs + mkNixosConfig + ; }; nixosConfigurations = { @@ -268,9 +274,7 @@ inherit (inputs) dns; vacuModuleType = "nix-on-droid"; }; - pkgs = mkPkgs { - system = arm; - }; + pkgs = mkPkgs { system = arm; }; }; checks = nixpkgs.lib.genAttrs [ x86 ] ( @@ -286,15 +290,15 @@ node.specialArgs.selfPackages = self.packages.${system}; node.specialArgs.vacuModuleType = "nixos"; }; - mkTest = name: + mkTest = + name: nixpkgs.lib.nixos.runTest { imports = [ commonTestModule ./tests/${name} { node.specialArgs.inputs = self.nixosConfigurations.${name}._module.specialArgs.inputs; } ]; - } - ; + }; checksFromConfig = plain.config.vacu.checks; in assert !(checksFromConfig ? liam) && !(checksFromConfig ? trip); @@ -421,7 +425,8 @@ // (inputs.flake-utils.lib.eachDefaultSystem ( system: let - mkNixvim = unstable: + mkNixvim = + unstable: let nixvim-input = if unstable then inputs.nixvim-unstable else inputs.nixvim; in @@ -437,12 +442,8 @@ config.allowUnfree = true; overlays = [ inputs.sm64baserom.overlays.default ]; }; - pkgs-unstable = mkPkgs (nixpkgs-args // { - useUnstable = true; - }); - pkgs-stable = mkPkgs (nixpkgs-args // { - useUnstable = false; - }); + pkgs-unstable = mkPkgs (nixpkgs-args // { useUnstable = true; }); + pkgs-stable = mkPkgs (nixpkgs-args // { useUnstable = false; }); _plain = mkPlain pkgs-unstable; plain = _plain.config.vacu.withAsserts _plain; treefmtEval = inputs.treefmt-nix.lib.evalModule pkgs-unstable ./treefmt.nix; @@ -473,14 +474,18 @@ }; generated = pkgs.linkFarm "generated" { nixpkgs = "${inputs.nixpkgs}"; - "liam-test/hints.py" = pkgs.writeText "hints.py" (import ./typesForTest.nix { - name = "liam"; - inherit (pkgs-stable) lib; - inherit self; - inherit (inputs) nixpkgs; - }); + "liam-test/hints.py" = pkgs.writeText "hints.py" ( + import ./typesForTest.nix { + name = "liam"; + inherit (pkgs-stable) lib; + inherit self; + inherit (inputs) nixpkgs; + } + ); "dns/python-env" = builtins.dirOf (builtins.dirOf dns.interpreter); - "mailtest/python-env" = builtins.dirOf (builtins.dirOf self.checks.x86_64-linux.liam.nodes.checker.vacu.mailtest.smtp.interpreter); + "mailtest/python-env" = builtins.dirOf ( + builtins.dirOf self.checks.x86_64-linux.liam.nodes.checker.vacu.mailtest.smtp.interpreter + ); }; haproxy-auth-request = pkgs.callPackage ./packages/haproxy-auth-request.nix { inherit haproxy-lua-http; diff --git a/fw/tpm-fido.nix b/fw/tpm-fido.nix index 6d40e40..06d575f 100644 --- a/fw/tpm-fido.nix +++ b/fw/tpm-fido.nix @@ -1,8 +1,11 @@ { config, ... }: { vacu.packages = [ "tpm-fido" ]; - users.groups.uhid = {}; - users.users.shelvacu.extraGroups = [ config.security.tpm2.tssGroup config.users.groups.uhid.name ]; + users.groups.uhid = { }; + users.users.shelvacu.extraGroups = [ + config.security.tpm2.tssGroup + config.users.groups.uhid.name + ]; security.tpm2.enable = true; security.tpm2.applyUdevRules = true; services.udev.extraRules = '' diff --git a/jobs/public/index.html b/jobs/public/index.html index 3197e76..db3dee6 100644 --- a/jobs/public/index.html +++ b/jobs/public/index.html @@ -13,8 +13,9 @@ background: #eee; padding: 0 10px; } - h1,h2,h3 { line-height: 1.2; } - + h1, h2, h3 { + line-height: 1.2; + } form { padding: 5px; @@ -22,21 +23,34 @@ border-radius: 3px; margin: 5px; } - form label { display: block; } + form label { + display: block; + }

Jobs info

-

Hi! I am currently looking to find a Software Engineering job. I am a professional developer specializing in Ruby on Rails and Rust, with over 10 years of experience.

+

+ Hi! I am currently looking to find a Software Engineering job. I am a + professional developer specializing in Ruby on Rails and Rust, with over + 10 years of experience. +

What I want in a job:

@@ -44,41 +58,78 @@ Things you probably want to know:

Resume

- You can see my latest, up-to-date resume here. + You can see my latest, up-to-date resume here.

To send me job offers

-

Unfortunately I get a lot of bad job offers if I just give out my email to anyone. As such, I will only accept job offers sent using this form. +

+ Unfortunately I get a lot of bad job offers if I just give out my email to + anyone. As such, I will only accept job offers sent using this form. +

-

Each time you want to send me an email about a new job offer, you must return to this page. The process may change from time to time. If you have multiple jobs you think I am a good fit for, please combine them in one email.

+

+ Each time you want to send me an email about a new job offer, you must + return to this page. The process may change from time to time. If you have + multiple jobs you think I am a good fit for, please combine them in one + email. +