From 65cf940db79f795cae29cd95d8d709288ca7c509 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Wed, 13 Dec 2023 11:10:02 +0800 Subject: [PATCH] profiles/research: move as foo-dogsquared's user module Because in practice, this is only used by it. --- modules/home-manager/default.nix | 1 - users/home-manager/foo-dogsquared/default.nix | 2 +- users/home-manager/foo-dogsquared/modules/default.nix | 1 + .../foo-dogsquared/modules/programs}/research.nix | 11 ++++++----- 4 files changed, 8 insertions(+), 7 deletions(-) rename {modules/home-manager/profiles => users/home-manager/foo-dogsquared/modules/programs}/research.nix (78%) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 9a2ed4c4..32c1eff8 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -22,7 +22,6 @@ let ./profiles/dev.nix ./profiles/editors.nix ./profiles/i18n.nix - ./profiles/research.nix ]; in modules diff --git a/users/home-manager/foo-dogsquared/default.nix b/users/home-manager/foo-dogsquared/default.nix index 06d0a6c3..2389bf6d 100644 --- a/users/home-manager/foo-dogsquared/default.nix +++ b/users/home-manager/foo-dogsquared/default.nix @@ -17,6 +17,7 @@ git.enable = true; keys.gpg.enable = true; keys.ssh.enable = true; + research.enable = true; shell.enable = true; terminal-multiplexer.enable = true; }; @@ -63,7 +64,6 @@ video.enable = true; documents.enable = true; }; - research.enable = true; }; home.stateVersion = "23.11"; diff --git a/users/home-manager/foo-dogsquared/modules/default.nix b/users/home-manager/foo-dogsquared/modules/default.nix index d79c12b8..537c80c9 100644 --- a/users/home-manager/foo-dogsquared/modules/default.nix +++ b/users/home-manager/foo-dogsquared/modules/default.nix @@ -8,6 +8,7 @@ ./programs/email.nix ./programs/git.nix ./programs/keys.nix + ./programs/research.nix ./programs/shell.nix ./programs/terminal-multiplexer.nix diff --git a/modules/home-manager/profiles/research.nix b/users/home-manager/foo-dogsquared/modules/programs/research.nix similarity index 78% rename from modules/home-manager/profiles/research.nix rename to users/home-manager/foo-dogsquared/modules/programs/research.nix index e1bfd975..f0aff8f6 100644 --- a/modules/home-manager/profiles/research.nix +++ b/users/home-manager/foo-dogsquared/modules/programs/research.nix @@ -1,21 +1,22 @@ { config, lib, pkgs, ... }: -let cfg = config.profiles.research; +let + userCfg = config.users.foo-dogsquared; + cfg = userCfg.programs.research; in { - options.profiles.research.enable = - lib.mkEnableOption "my usual toolbelt for research"; + options.users.foo-dogsquared.programs.research.enable = + lib.mkEnableOption "foo-dogsquared's usual toolbelt for research"; config = lib.mkIf cfg.enable { home.packages = with pkgs; [ anki # Rise, rinse, and repeat. - archivebox # The ultimate archiving solution created by a pirate! + #archivebox # The ultimate archiving solution created by a pirate! curl # The general purpose downloader. fanficfare # It's for the badly written fanfics. gallery-dl # More potential for your image collection. internetarchive # All of the potential vintage collection of questionable materials at your fingertips. kiwix # Offline reader for your fanon wiki. monolith # Archive webpages into a single file. - newsboat # Reading news easily on the command line? qbittorrent # The pirate's toolkit for downloading Linux ISOs. sherlock # Make a profile of your *target*. wget # Who would've think a simple tool can be made for this purpose?