From def300827a448e5a24ea10365529a964cdc9d389 Mon Sep 17 00:00:00 2001 From: Bun Date: Tue, 29 Apr 2025 21:30:44 -0400 Subject: [PATCH] Standardize more paths and such --- modules/home/default.nix | 3 +-- modules/home/programs/default.nix | 3 ++- modules/home/programs/misc/general/default.nix | 5 ++++- modules/home/settings/nix/unfree/default.nix | 7 ++++--- modules/system/services/server/forgejo/default.nix | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index b4d3754a..0f0e3450 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,4 +1,4 @@ -{ lib, nur, ... }: +{ lib, ... }: { imports = [ ./files @@ -8,7 +8,6 @@ ./user ./variables ./wms - nur.modules.homeManager.default ]; options.home = with lib; { diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index 023aaf79..f47beed1 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -1,8 +1,9 @@ -{ ... }: +{ nur, ... }: { imports = [ ./gui ./terminal ./misc + nur.modules.homeManager.default ]; } diff --git a/modules/home/programs/misc/general/default.nix b/modules/home/programs/misc/general/default.nix index c0ffd99e..6c023524 100644 --- a/modules/home/programs/misc/general/default.nix +++ b/modules/home/programs/misc/general/default.nix @@ -6,6 +6,9 @@ qbittorrent vesktop ]; - persistence."/persist${config.home.homeDirectory}".directories = [ ".config/vesktop" ]; + persistence."/persist${config.home.homeDirectory}".directories = [ + ".config/qBittorrent" + ".config/vesktop" + ]; }; } diff --git a/modules/home/settings/nix/unfree/default.nix b/modules/home/settings/nix/unfree/default.nix index c9730546..8c0a288a 100644 --- a/modules/home/settings/nix/unfree/default.nix +++ b/modules/home/settings/nix/unfree/default.nix @@ -1,7 +1,8 @@ { config, lib, ... }: -{ - options.nixpkgs.allowUnfreePackages = lib.mkOption { - type = with lib.types; listOf str; +with lib; { + options.nixpkgs.allowUnfreePackages = mkOption { + type = types.listOf types.str; + default = []; }; config.nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowUnfreePackages; diff --git a/modules/system/services/server/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix index 50e5307e..37ce0176 100644 --- a/modules/system/services/server/forgejo/default.nix +++ b/modules/system/services/server/forgejo/default.nix @@ -24,7 +24,7 @@ }; service = { REGISTER_EMAIL_CONFIRM = true; - DISABLE_REGISTRATION = false; + DISABLE_REGISTRATION = true; }; ui.DEFAULT_THEME = "forgejo-dark"; };