nix: cleanup

diff --git a/flake.nix b/flake.nix
index 2a2d09b5aefa8ae73a72a0392d909fe003980762..7efbc63491c8fa10ef51b90fdaa06688c7af503e 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -41,6 +41,7 @@ outputs = inputs: let
         private = "/root/private"; # Kept out of /nix/store
       };
       extraArgs = {
+        inherit hostName inputs;
         hosts = inputs.self.nixosConfigurations;
       };
       pkgs = import nixpkgsPath {
@@ -78,7 +79,7 @@ outputs = inputs: let
           home-manager.verbose = true;
           home-manager.backupFileExtension = null;
           home-manager.extraSpecialArgs = {
-            inherit hostName;
+            inherit hostName inputs;
           };
         }
       ];

diff --git a/homes/julm.nix b/homes/julm.nix
index dcee8c06f434a064145fc01d376e65ec60281612..fe754092d1e9afb02694a876c903268b0f2f9b48 100644 (file)
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, lib, config, hostName, ... }:
+{ pkgs, lib, config, hostName, ... }:
 {
 imports = [
   ./softwares.nix

diff --git a/homes/julm/hosts/oignon.nix b/homes/julm/hosts/oignon.nix
index d966eb701a89aecb6ef780bc931dce620477a292..e6e41d854d995d25b376645d03f81834b4368008 100644 (file)
--- a/homes/julm/hosts/oignon.nix
+++ b/homes/julm/hosts/oignon.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, inputs, ... }:
+{ pkgs, lib, config, ... }:
 {
 programs.bash.shellAliases.riseup = "sudo ip netns exec riseup sudo -u $USER PULSE_SERVER=/run/user/$(id -u $USER)/pulse/native";
 programs.bash.shellAliases.firefox = "riseup firefox";

diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index a8894145768bf6c85bb4afe70fefb9b8d3cb2510..6b238356ed854dc2cd9cd580d9bad8813df60074 100644 (file)
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, private, hostName, ... }:
+{ config, pkgs, lib, private, hostName, ... }:
 let
   inherit (config.users) users;
   inherit (config.services) davfs2;
@@ -58,14 +58,20 @@ nix = {
     dates = "weekly";
     options = "--delete-older-than 7d";
   };
+  /*
   nixPath = [
     "nixpkgs=/etc/nixpkgs"
     "nixpkgs-overlays=/etc/nixpkgs-overlays/overlays.nix"
   ];
+  */
+  nixPath = lib.mkForce [];
   trustedUsers = [ users.julm.name ];
   binaryCaches = [ "http://nix-localcache.losurdo.wg" ];
   binaryCachePublicKeys = [ "losurdo.sourcephile.fr-1:XGeaIE2AA2mZskSZ5bIDrfx53q+TDDWJOUEpZDX7los=" ];
 };
+#environment.etc."nixpkgs".source = pkgs.path;
+#environment.etc."nixpkgs-overlays".source = inputs.self + "/nixpkgs";
+
 documentation = {
   enable = true;
   dev.enable = true;
@@ -85,9 +91,6 @@ services.openssh.openFirewall = false;
 services.openssh.forwardX11 = true;
 services.openssh.passwordAuthentication = false;
 
-environment.etc."nixpkgs".source = pkgs.path;
-environment.etc."nixpkgs-overlays".source = inputs.self + "/nixpkgs";
-
 time.timeZone = "Europe/Paris";
 i18n.defaultLocale = "fr_FR.UTF-8";
 console.font = "Lat2-Terminus16";

diff --git a/profiles/security.nix b/profiles/security.nix
index fa1c743f80f18114463273b273d72d8178d90b48..166c7a497d52d4f0a631696278965cad9720701f 100644 (file)
--- a/profiles/security.nix
+++ b/profiles/security.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, lib, config, ... }:
+{ pkgs, lib, config, ... }:
 {
 boot.kernelPackages = pkgs.linuxPackages_latest;
 #boot.kernelPackages = pkgs.linuxPackages_hardened;