diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 8904c2b89..d7333a6d8 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: { imports = [ ./boot.nix diff --git a/hosts/common/fs.nix b/hosts/common/fs.nix index 21c41bef1..046367696 100644 --- a/hosts/common/fs.nix +++ b/hosts/common/fs.nix @@ -2,7 +2,7 @@ # - x-systemd options: # - fuse options: `man mount.fuse` -{ config, lib, pkgs, sane-lib, utils, ... }: +{ config, lib, utils, ... }: let fsOpts = rec { @@ -346,12 +346,6 @@ lib.mkMerge [ # but it decreases working memory under the heaviest of loads by however much space the compressed memory occupies (e.g. 50% if 2:1; 25% if 4:1) zramSwap.memoryPercent = 100; - # environment.pathsToLink = [ - # # needed to achieve superuser access for user-mounted filesystems (see sshRoot above) - # # we can only link whole directories here, even though we're only interested in pkgs.openssh - # "/libexec" - # ]; - programs.fuse.userAllowOther = true; #< necessary for `allow_other` or `allow_root` options. } diff --git a/hosts/common/net/default.nix b/hosts/common/net/default.nix index 15b17cd87..cc835243d 100644 --- a/hosts/common/net/default.nix +++ b/hosts/common/net/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { imports = [ diff --git a/hosts/common/net/vpn.nix b/hosts/common/net/vpn.nix index eff1596d9..421dbcca2 100644 --- a/hosts/common/net/vpn.nix +++ b/hosts/common/net/vpn.nix @@ -5,7 +5,7 @@ # - generate config @ OVPN.com # - copy the Address, PublicKey, Endpoint from OVPN's config -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let # N.B.: OVPN issues each key (i.e. device) a different IP (addrV4), and requires you use it. # the IP it issues can be used to connect to any of their VPNs. diff --git a/hosts/common/ssh.nix b/hosts/common/ssh.nix index 3524894c5..85ffd660c 100644 --- a/hosts/common/ssh.nix +++ b/hosts/common/ssh.nix @@ -1,4 +1,4 @@ -{ config, lib, sane-lib, ... }: +{ config, lib, ... }: let hostKeys = lib.mapAttrsToList diff --git a/hosts/common/users/default.nix b/hosts/common/users/default.nix index 031f6c462..d1b5506ab 100644 --- a/hosts/common/users/default.nix +++ b/hosts/common/users/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, sane-lib, ... }: +{ pkgs, ... }: let libcapForPam = pkgs.libcap; diff --git a/hosts/common/users/root.nix b/hosts/common/users/root.nix index 994398a18..d7dbb4ab2 100644 --- a/hosts/common/users/root.nix +++ b/hosts/common/users/root.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { sane.persist.sys.byStore.ephemeral = [ # when running commands as root, some things may create ~/.cache entries.