From cd80c21d672dfaa8d24f9a722a783327062f3a00 Mon Sep 17 00:00:00 2001 From: Whovian9369 Date: Sat, 11 May 2024 04:41:00 -0400 Subject: [PATCH] Move some stuff around, eh. --- system/packages.nix | 42 +++++++++++++++++++++++------------------- system/users.nix | 2 +- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/system/packages.nix b/system/packages.nix index 63252de..7316143 100644 --- a/system/packages.nix +++ b/system/packages.nix @@ -3,23 +3,10 @@ environment.systemPackages = [ pkgs.file pkgs.xterm - /* - `agenix` is currently added via - "nixos#nixosConfigurations.nixos-wsl.modules.environment.systemPackages" - */ - # agenix.packages.x86_64-linux.default + # `agenix` is currently added via + # ".nixos-wsl.modules.environment.systemPackages" ]; - /* - documentation = { - nixos = { - includeAllModules = true; - }; - man = { - generateCaches = true; - }; - }; - */ nixpkgs = { config = { @@ -34,10 +21,10 @@ nano = { enable = true; }; - /* - I haven't figured out how to get `cdemu` properly working in WSL, so I'm - just going to leave it as `programs.cdemu.enable = false;` for now. - */ + + # I haven't figured out how to get `cdemu` properly working (in WSL), so + # I'm just going to leave it as `programs.cdemu.enable = false;` for now. + cdemu = { enable = false; group = "cdrom"; @@ -45,4 +32,21 @@ image-analyzer = false; }; }; + + # `documentation.man.generateCaches` seems to be mainly useful for `whatis`, + # but I couldn't really get it working well. + # From what I can tell, it depends on a package being installed via + # `environment.systemPackages`, *and* for that package to have a manpage. + # That's kinda useless for me since I've been mostly installing stuff via + # `home-manager`, sooooooooo... + /* + documentation = { + nixos = { + includeAllModules = true; + }; + man = { + generateCaches = true; + }; + }; + */ } diff --git a/system/users.nix b/system/users.nix index ef2e530..cc1664b 100644 --- a/system/users.nix +++ b/system/users.nix @@ -14,8 +14,8 @@ "wheel" "cdrom" ]; - initialPassword = "abcde"; # I need to log in somehow shell = pkgs.zsh; + initialPassword = "abcde"; # I need to log in somehow }; }; };