diff options
| author | Freya Murphy <freya@freyacat.org> | 2025-06-24 12:44:25 -0400 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2025-06-24 12:44:25 -0400 |
| commit | b69d6dd7f87db131fa62a16f9debb49ae7e87f79 (patch) | |
| tree | 84b5824eb900f8d2c487524732ec229caec2f604 | |
| parent | redo lib, make global vars for key lists (diff) | |
| download | dotfiles-nix-b69d6dd7f87db131fa62a16f9debb49ae7e87f79.tar.gz dotfiles-nix-b69d6dd7f87db131fa62a16f9debb49ae7e87f79.tar.bz2 dotfiles-nix-b69d6dd7f87db131fa62a16f9debb49ae7e87f79.zip | |
fmt
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | hosts/wsl/default.nix | 7 | ||||
| -rw-r--r-- | lib/files.nix | 8 | ||||
| -rw-r--r-- | lib/lua.nix | 2 | ||||
| -rw-r--r-- | system/sshd.nix | 6 |
5 files changed, 21 insertions, 8 deletions
@@ -33,7 +33,11 @@ nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = {self, nixpkgs, ...} @ inputs: let + outputs = { + self, + nixpkgs, + ... + } @ inputs: let options = import ./options.nix; systems = ["x86_64-linux"]; perSystem = func: diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix index dae77b5..bb9c4c4 100644 --- a/hosts/wsl/default.nix +++ b/hosts/wsl/default.nix @@ -1,6 +1,11 @@ # WSL # System configuration for any wsl instance -{config, pkgs, inputs, ...}: { +{ + config, + pkgs, + inputs, + ... +}: { imports = [ inputs.nixos-wsl.nixosModules.default ]; diff --git a/lib/files.nix b/lib/files.nix index 18439d9..156ec7c 100644 --- a/lib/files.nix +++ b/lib/files.nix @@ -1,5 +1,4 @@ {lib, ...}: let - # gets list of files from a directory getFiles = folder: lib.attrsets.mapAttrsToList (name: type: "${folder}/${name}") (builtins.readDir folder); @@ -8,13 +7,14 @@ certs = getFiles ../files/certs; # set of ssh keys - sshKeys = builtins.filter + sshKeys = + builtins.filter (path: lib.strings.hasSuffix "pub" path) (getFiles ../files/keys); # set of gpg keys - gpgKeys = builtins.filter + gpgKeys = + builtins.filter (path: lib.strings.hasSuffix "asc" path) (getFiles ../files/keys); - in { inherit getFiles; inherit certs; diff --git a/lib/lua.nix b/lib/lua.nix index 6f6389e..9bde6bb 100644 --- a/lib/lua.nix +++ b/lib/lua.nix @@ -1,6 +1,6 @@ {lib, ...}: let toLua = val: - # nil + # nil if val == null then "nil" # boolean diff --git a/system/sshd.nix b/system/sshd.nix index d9e11f3..088bccb 100644 --- a/system/sshd.nix +++ b/system/sshd.nix @@ -1,4 +1,8 @@ -{config, self, ...}: { +{ + config, + self, + ... +}: { # sshd services.openssh = { enable = true; |