common/default.nix

@@ -5,6 +5,7 @@
     ./environment.nix
     ./home-manager.nix
     ./nginx.nix
+    ./nixpkgs.nix
     ./openssh.nix
     ./security.nix
   ];

common/home-manager.nix

@@ -1,13 +1,18 @@
 { config, lib, pkgs, ... }:
 
 {
-  home-manager.users = {
+  home-manager = {
-    qenya = { config, lib, pkgs, osConfig, ... }: {
+    useUserPackages = true;
-      home.homeDirectory = osConfig.users.users.qenya.home;
+    useGlobalPkgs = true;
 
-      imports = [
+    users = {
-        ../home/qenya
+      qenya = { config, lib, pkgs, osConfig, ... }: {
-      ];
+        home.homeDirectory = osConfig.users.users.qenya.home;
+
+        imports = [
+          ../home/qenya
+        ];
+      };
     };
   };
 }

common/nixpkgs.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      packageOverrides = pkgs: {
+        agenix = inputs.agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
+      };
+    };
+
+    overlays = [ inputs.nur.overlay ];
+  };
+}

flake.nix

@@ -27,24 +27,15 @@
         nodeNixpkgs = {
           kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow
         };
+        specialArgs = {
+          inherit inputs;
+        };
       };
 
-      defaults = { name, nodes, config, ... }: {
+      defaults = { name, nodes, ... }: {
         networking.hostName = name;
 
         nix.settings.experimental-features = "nix-command flakes";
-        nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
-        nixpkgs.config.allowUnfree = true;
-
-        nixpkgs.config.packageOverrides = pkgs: {
-          agenix = inputs.agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
-        };
-        nixpkgs.overlays = [ inputs.nur.overlay ];
-
-        home-manager = {
-          useUserPackages = true;
-          useGlobalPkgs = true;
-        };
 
         imports = [
           home-manager.nixosModules.home-manager
@@ -56,7 +47,7 @@
         ];
       };
 
-      kilgharrah.imports = [ ./hosts/kilgharrah ];
+      kilgharrah.imports = [ ./hosts/kilgharrah ] ;
       tohru.imports = [ ./hosts/tohru ];
 
       yevaud = { name, nodes, ... }: {

home/qenya/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./dconf
     ./cli.nix
-    ./firefox.nix
     ./git.nix
     ./tmux.nix
     ./vscode.nix

home/qenya/firefox.nix

@@ -1,51 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.firefox = {
-    # coming in 24.11
-    # languagePacks = [ "en-GB" ];
-
-    profiles.default = {
-      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-        bitwarden
-        ublock-origin
-      ];
-
-      settings = {
-        "browser.startup.page" = 3; # resume previous session
-        "browser.newtabpage.activity-stream.showSponsored" = false;
-        "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-
-        # disable telemetry
-        "datareporting.healthreport.uploadEnabled" = false;
-        "app.shield.optoutstudies.enabled" = false;
-        "browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
-
-        # disable prefetch?
-
-        # DNS over HTTPS
-        "network.trr.custom_uri" = "https://base.dns.mullvad.net/dns-query";
-        "network.trr.excluded-domains" = "detectportal.firefox.com";
-        "network.trr.mode" = 3;
-        "network.trr.uri" = "https://base.dns.mullvad.net/dns-query";
-
-        "browser.search.suggest.enabled" = false;
-        "browser.urlbar.suggest.searches" = false;
-
-        "dom.security.https_only_mode" = true;
-        "browser.contentblocking.category" = "strict"; # Enhanced Tracking Protection
-        # I think these are implied by the above
-        # "privacy.donottrackheader.enabled" = true;
-        # "privacy.trackingprotection.enabled" = true;
-        # "privacy.trackingprotection.emailtracking.enabled" = true;
-        # "privacy.trackingprotection.socialtracking.enabled" = true;
-
-        "privacy.sanitize.sanitizeOnShutdown" = true;
-        "privacy.clearOnShutdown_v2.historyFormDataAndDownloads" = false;
-
-        "dom.private-attribution.submission.enabled" = false; # disable "Privacy-Preserving Attribution for Advertising"
-        "extensions.autoDisableScopes" = 0; # automatically enable extensions installed through nix
-      };
-    };
-  };
-}

hosts/tohru/home.nix

@@ -4,7 +4,7 @@
   dconf.enable = true;
 
   programs = {
-    firefox.enable = true;
+    firefox.enable = true; # TODO: config is not yet nix-ified
     vscode.enable = true;
   };