feat: Nix settings tweaks

lpchaim · Nov 23, 2024 · f835d25 · f835d25
1 parent f62714f
commit f835d25
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 35 deletions.
diff --git a/lib/shared/default.nix b/lib/shared/default.nix
@@ -18,12 +18,11 @@ in {
       wallpaper = assetWithPrefix "wallpaper";
       profilePicture = assetWithPrefix "profile-picture";
     };
-    nix.settings = rec {
+    nix.settings = {
       accept-flake-config = true;
       builders-use-substitutes = true;
       auto-optimise-store = true;
       extra-experimental-features = "flakes nix-command";
-      extra-substituters = extra-trusted-substituters;
       extra-trusted-substituters = [
         "https://hyprland.cachix.org"
         "https://lpchaim.cachix.org"

diff --git a/modules/home/base/default.nix b/modules/home/base/default.nix
@@ -2,36 +2,38 @@
   config,
   lib,
   ...
-} @ args:
-with lib; let
+} @ args: let
+  inherit (lib) mkDefault;
   inherit (lib.lpchaim) shared;
   inherit (lib.snowfall) fs;
-  namespace = ["my" "modules"];
-  cfg = getAttrFromPath namespace config;
-in {
-  imports = [
-    (fs.get-file "modules/shared")
-  ];
-
-  options = setAttrByPath namespace {
-    enable = mkEnableOption "customizations";
-  };
-
-  config = {
-    my.modules = {
-      enable = mkDefault true;
-      cli.enable = mkDefault true;
-      de.gnome.enable = mkDefault false;
-      gui.enable = mkDefault false;
+in
+  lib.lpchaim.mkModule {
+    inherit config;
+    description = "root home config";
+    namespace = "my.modules";
+    imports = [
+      (fs.get-file "modules/shared")
+    ];
+    configBuilder = cfg: {
+      my.modules = {
+        enable = mkDefault true;
+        cli.enable = mkDefault true;
+        de.gnome.enable = mkDefault false;
+        gui.enable = mkDefault false;
+      };
+      programs.home-manager.enable = mkDefault true;
+      nix =
+        {
+          gc = {
+            automatic = true;
+            frequency = "daily";
+            options = "--delete-older-than=7d";
+          };
+          settings = shared.nix.settings;
+        }
+        // (lib.optionalAttrs (args ? osConfig) {
+          inherit (args.osConfig.nix) extraOptions;
+        });
+      systemd.user.startServices = "sd-switch";
     };
-    programs.home-manager.enable = mkDefault true;
-    nix.gc = {
-      automatic = true;
-      frequency = "daily";
-      options = "--delete-older-than=7d";
-    };
-    nix.settings = shared.nix.settings;
-    nix.extraOptions = mkIf (args ? osConfig) args.osConfig.nix.extraOptions;
-    systemd.user.startServices = "sd-switch";
-  };
-}
+  }
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
@@ -46,7 +46,7 @@ in {
 
   # Package manager
   nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = ''
       experimental-features = flakes nix-command
     '';

diff --git a/modules/nixos/secrets/extraNixOptions/default.nix b/modules/nixos/secrets/extraNixOptions/default.nix
@@ -1,5 +1,14 @@
-{config, ...}: {
-  sops.secrets."nix/extraAccessTokens".mode = "0440";
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.lpchaim.shared) defaults;
+in {
+  sops.secrets."nix/extraAccessTokens" = {
+    mode = "0400";
+    owner = defaults.name.user;
+  };
   nix.extraOptions = ''
     !include ${config.sops.secrets."nix/extraAccessTokens".path}
   '';