Commit f55c37e

@@ -0,0 +1,29 @@
+{inputs, ...}: {
+  flake-file.inputs.programsdb = {
+    url = "github:wamserma/flake-programs-sqlite";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  flake.modules.nixos.core = {pkgs, ...}: {
+    programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.stdenv.system}.programs-sqlite;
+  };
+
+  flake.modules.homeManager.core = {
+    lib,
+    pkgs,
+    osConfig,
+    config,
+    ...
+  }: {
+    home.packages = [pkgs.sqlite];
+    home.activation.removeExistingNixChannel =
+      lib.mkIf (!osConfig.nix.settings.use-xdg-base-directories)
+      (lib.hm.dag.entryBefore ["checkLinkTargets"] ''
+        rm -f ${config.home.homeDirectory}/.nix-defexpr/channels
+      '');
+    home.file.".nix-defexpr/channels/nixpkgs/programs.sqlite" = {
+      source = inputs.programsdb.packages.${pkgs.stdenv.hostPlatform.system}.programs-sqlite;
+      force = true;
+    };
+  };
+}

@@ -1,5 +1,5 @@
 {
-  flake.modules.nixos.core = {config, ...}: {
+  flake.modules.nixos.core = {
     nix.settings = {
       experimental-features = ["auto-allocate-uids"];
 
@@ -16,18 +16,5 @@
 
       trusted-users = ["@wheel"];
     };
-
-    nix.extraOptions = ''
-      !include ${config.vaultix.templates.nix-access-tokens.path}
-    '';
-
-    vaultix.secrets.github-access-token.file = ./github-access-token.age;
-    vaultix.templates.nix-access-tokens = {
-      content = ''
-        access-tokens = github.com=${config.vaultix.placeholder.github-access-token}
-      '';
-      mode = "0440";
-      group = "wheel";
-    };
   };
 }

@@ -0,0 +1,16 @@
+{
+  flake.modules.nixos.core = {config, ...}: {
+    nix.extraOptions = ''
+      !include ${config.vaultix.templates.nix-access-tokens.path}
+    '';
+
+    vaultix.secrets.github-access-token.file = ./github-access-token.age;
+    vaultix.templates.nix-access-tokens = {
+      content = ''
+        access-tokens = github.com=${config.vaultix.placeholder.github-access-token}
+      '';
+      mode = "0440";
+      group = "wheel";
+    };
+  };
+}

@@ -1,10 +0,0 @@
-{inputs, ...}: {
-  flake-file.inputs.programsdb = {
-    url = "github:wamserma/flake-programs-sqlite";
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  flake.modules.nixos.core = {pkgs, ...}: {
-    programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.stdenv.hostPlatform.system}.programs-sqlite;
-  };
-}

@@ -1,17 +1,11 @@
-{inputs, ...}: {
+{
   flake.modules.nixos.core = _: {
     stylix.targets.fish.enable = false;
 
     programs.fish.enable = true;
   };
 
-  flake.modules.homeManager.core = {
-    lib, # Use inner lib for home-manager's overlay
-    pkgs,
-    config,
-    osConfig,
-    ...
-  }: {
+  flake.modules.homeManager.core = {pkgs, ...}: {
     programs.fish = {
       enable = true;
       generateCompletions = true;
@@ -44,16 +38,5 @@
         }
       ];
     };
-
-    home.packages = [pkgs.sqlite];
-    home.activation.removeExistingNixChannel =
-      lib.mkIf (!osConfig.nix.settings.use-xdg-base-directories)
-      (lib.hm.dag.entryBefore ["checkLinkTargets"] ''
-        rm -f ${config.home.homeDirectory}/.nix-defexpr/channels
-      '');
-    home.file.".nix-defexpr/channels/nixpkgs/programs.sqlite" = {
-      source = inputs.programsdb.packages.${pkgs.stdenv.hostPlatform.system}.programs-sqlite;
-      force = true;
-    };
   };
 }