whatever

common/agenix.nix

@@ -1,4 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   imports = [
     inputs.agenix.nixosModules.default
   ];

common/boot.nix

@@ -1,5 +1,6 @@
+{ config, ... }:
 {
-  fileSystems."/boot" = {
+  fileSystems.${config.boot.loader.efi.efiSysMountPoint} = {
     label = "BOOT";
     fsType = "vfat";
   };
@@ -16,6 +17,12 @@
         efiSysMountPoint = "/boot";
       };
     };
-    tmp.cleanOnBoot = true;
+
+    # TODO
+    tmp = {
+      useTmpfs = true;
+      tmpfsSize = "50%";
+      cleanOnBoot = true;
+    };
   };
 }

common/bottom.nix

@@ -1,3 +1,4 @@
-{pkgs, ...}: {
-  environment.systemPackages = [pkgs.bottom];
+{ pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.bottom ];
 }

common/fish.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.fish.enable = true;
 
   users.defaultUserShell = pkgs.fish;

common/gc.nix

@@ -1,7 +0,0 @@
-{
-  nix.gc = {
-    automatic = true;
-    dates = "daily";
-    options = "--delete-older-than 7d";
-  };
-}

common/gitui.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   environment.systemPackages = [
     pkgs.gitui
   ];

common/helix.nix

@@ -1,16 +1,21 @@
 {
+  inputs,
   lib,
   pkgs,
   ...
-}: let
-  package = pkgs.helix;
-in {
-  environment.systemPackages = [package];
+}:
+let
+  package = inputs.hxwrap.packages.${pkgs.system}.default;
+in
+{
+  environment.systemPackages = [ package ];
 
-  environment.sessionVariables = let
-    exe = builtins.baseNameOf (lib.getExe package);
-  in {
-    EDITOR = exe;
-    VISUAL = exe;
-  };
+  environment.sessionVariables =
+    let
+      exe = builtins.baseNameOf (lib.getExe package);
+    in
+    {
+      EDITOR = exe;
+      VISUAL = exe;
+    };
 }

common/networking.nix

@@ -1,5 +1,9 @@
-{pkgs, ...}: {
-  networking.nftables.enable = true;
+{ attrName, pkgs, ... }:
+{
+  networking = {
+    hostName = attrName;
+    nftables.enable = true;
+  };
 
   environment.systemPackages = [
     pkgs.nixos-firewall-tool

common/nh.nix

@@ -0,0 +1,17 @@
+{
+  pkgs,
+  self,
+  ...
+}:
+{
+  programs.nh = {
+    enable = true;
+    clean = {
+      enable = true;
+      extraArgs = "--keep 5 --keep-since 1w";
+      dates = "weekly";
+    };
+  };
+
+  environment.sessionVariables.NH_FLAKE = "git+https://forgejo@forgejo.helveticanonstandard.net/helvetica/puter.git"; # TODO
+}

common/nix-index-database.nix

@@ -1,4 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   imports = [
     inputs.nix-index-database.nixosModules.nix-index
   ];

common/nix.nix

@@ -3,16 +3,17 @@
   inputs,
   lib,
   ...
-}: {
+}:
+{
   nix = {
-    registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
+    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
 
     nixPath = lib.mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry;
 
     optimise.automatic = true;
 
     settings = {
-      trusted-users = ["root"] ++ config.users.normalUsers;
+      trusted-users = [ "root" ] ++ config.users.normalUsers;
       experimental-features = [
         "nix-command"
         "flakes"
@@ -24,5 +25,4 @@
   };
 
   nixpkgs.config.allowUnfree = true;
-  hardware.enableAllFirmware = true;
 }

common/pubkeys.nix

@@ -2,10 +2,12 @@
   lib,
   self,
   ...
-}: {
-  options.pubkeys = let
-    inherit (lib) types;
-  in
+}:
+{
+  options.pubkeys =
+    let
+      inherit (lib) types;
+    in
     lib.mkOption {
       type = types.attrsOf (types.attrsOf types.str);
       description = ''

common/puter.nix

@@ -1,12 +0,0 @@
-{
-  pkgs,
-  self,
-  ...
-}: {
-  environment = {
-    systemPackages = [
-      self.packages.${pkgs.system}.puter
-    ];
-    sessionVariables.PUTER_FLAKEREF = "git+https://forgejo@tea.wrz.one/lukas/puter.git";
-  };
-}

common/ripgrep.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   environment.systemPackages = [
     pkgs.ripgrep
   ];

common/rsync.nix

@@ -0,0 +1,25 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  #services.rsync = {
+  #  enable = true;
+
+  #  commonArgs = let
+  #    rsh = "${lib.getExe pkgs.openssh} -i /etc/ssh/ssh_host_ed25519_key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null";
+  #  in [
+  #    "--verbose"
+  #    "--verbose"
+  #    "--archive"
+  #    "--update"
+  #    "--delete"
+  #    "--mkpath"
+  #    "--exclude"
+  #    "lost+found"
+  #    "--rsh"
+  #    rsh
+  #  ];
+  #};
+}

common/shpool.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [
+    pkgs.shpool
+  ];
+}

common/ssh.nix

@@ -1,5 +1,5 @@
 {
-  age.identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+  age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
   services.openssh = {
     enable = true;

common/syncthing.nix

@@ -1,6 +1,8 @@
-{config, ...}: let
+{ config, ... }:
+let
   inherit (config.networking) hostName;
-in {
+in
+{
   services.syncthing = {
     enable = true;
     systemService = true;

common/tailscale.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   services.tailscale = {
     enable = true;
     openFirewall = true;

common/users.nix

@@ -2,10 +2,12 @@
   config,
   lib,
   ...
-}: let
+}:
+let
   inherit (config.users) mainUser;
-in {
-  age.secrets = lib.mkSecrets {"user-${mainUser}" = {};};
+in
+{
+  age.secrets = lib.mkSecrets { "user-${mainUser}" = { }; };
 
   users = {
     mutableUsers = false;
@@ -20,7 +22,7 @@ in {
         isNormalUser = true;
         hashedPasswordFile = config.age.secrets."user-${mainUser}".path;
         openssh.authorizedKeys.keys = builtins.attrValues config.pubkeys.users;
-        extraGroups = ["wheel"]; #TODO remove
+        extraGroups = [ "wheel" ]; # TODO remove
       };
     };
   };

common/wheel.nix

@@ -1,3 +1,4 @@
-{config, ...}: {
+{ config, ... }:
+{
   users.groups.wheel.members = config.users.normalUsers;
 }

common/zellij.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   environment.systemPackages = [
     pkgs.zellij
   ];