home-manager: update

diff --git a/flake.nix b/flake.nix
index e38b06532c7cbc14d6bae4ae7dcb06cb1750858e..e4f4fc611cb52377049c5e954c772e2325fc4b1a 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -27,17 +27,23 @@ outputs = inputs: let
     '';
   };
   lib = originPkgs.lib;
+  nixosSystem = import (nixpkgsPath + "/nixos/lib/eval-config.nix");
+  #nixosSystem = inputs.nixpkgs.lib.nixosSystem;
   in {
   nixosConfigurations = lib.genAttrs
     (builtins.attrNames (lib.filterAttrs (n: v: v == "directory") (builtins.readDir ./hosts)))
-    (hostName: import (nixpkgsPath + "/nixos/lib/eval-config.nix") {
-              #inputs.nixpkgs.lib.nixosSystem {
+    (hostName: nixosSystem rec {
       system = "x86_64-linux";
       extraArgs = {
         inherit hostName inputs;
         hosts = inputs.self.nixosConfigurations;
         private = "/root/private"; # Kept out of /nix/store
       };
+      pkgs = import nixpkgsPath {
+        inherit system;
+        config.allowUnfree = true; # For hplip
+        overlays = import nixpkgs/overlays.nix;
+      };
       modules = [
         (import (./hosts + "/${hostName}.nix"))
         inputs.nixpkgs.nixosModules.notDetected
@@ -46,7 +52,7 @@ outputs = inputs: let
           nix.registry.nixpkgs.flake = inputs.nixpkgs;
           nix.package = pkgs.nixFlakes;
           nix.extraOptions = "experimental-features = nix-command flakes";
-          nixpkgs.overlays = import nixpkgs/overlays.nix;
+          #nixpkgs.overlays = import nixpkgs/overlays.nix;
           /*
           system.nixos.versionSuffix = ".${
             lib.substring 0 8 (inputs.self.lastModifiedDate or inputs.self.lastModified)}.${

diff --git a/homes/sevy.nix b/homes/sevy.nix
index 1696f9e39a2d509ce3d274e6a9a69a7f56869c48..111404f91da0c774b26e06267a327bd4f5e7f174 100644 (file)
--- a/homes/sevy.nix
+++ b/homes/sevy.nix
@@ -41,9 +41,9 @@ services.screen-locker = {
     ${pkgs.xsecurelock}/bin/xsecurelock
   '');
     #XSECURELOCK_SWITCH_USER_COMMAND="${pkgs.lightdm}/bin/dm-tool switch-to-greeter" \
-  enableDetectSleep = true;
   inactiveInterval = lib.mkDefault 5; # minutes
-  xssLockExtraOptions = [
+  xautolock.detectSleep = true;
+  xss-lock.extraOptions = [
     "--transfer-sleep-lock"
     #"-n" "${pkgs.xss-lock}/share/doc/xss-lock/dim-screen.sh"
   ];

diff --git a/homes/softwares/gnupg.nix b/homes/softwares/gnupg.nix
index 677ac6445274b5ce70399f3f327e25ac9bfbc74b..956820c466633206b6475819920523801af0f42a 100644 (file)
--- a/homes/softwares/gnupg.nix
+++ b/homes/softwares/gnupg.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, options, ... }:
+{ pkgs, lib, config, ... }:
 {
 config = {
 /*
@@ -43,7 +43,7 @@ home.file."${config.programs.gpg.homedir}/dirmngr.conf".text = ''
   #log-file dirmngr.log
   #standard-resolver
 '';
-} // lib.optionalAttrs (options ? "nixpkgs") {
+}/* // lib.optionalAttrs (!config.useGlobalPkgs) {
 nixpkgs.overlays = [ (self: super: {
   # Avoid rebuilding graphical dependencies
   # when using Nixpkgs PRs rebuilding them.
@@ -52,5 +52,5 @@ nixpkgs.overlays = [ (self: super: {
     enabledFlavors = [ "curses" "tty" ] ++ lib.optional config.host.desktop "gtk2";
   };
 }) ];
-};
+}*/;
 }

diff --git a/homes/softwares/podl.nix b/homes/softwares/podl.nix
deleted file mode 100644 (file)
index ffa3e46..0000000
--- a/homes/softwares/podl.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-config = lib.optionalAttrs (options ? "nixpkgs") {
-  nixpkgs.overlays = [()];
-};
-}

diff --git a/homes/softwares/vim.nix b/homes/softwares/vim.nix
index 3f147bf15098509ecfd9848b8ed3d819ce1c4cb7..485801b05798a3ecd273fe66d4f7fef927d576e0 100644 (file)
--- a/homes/softwares/vim.nix
+++ b/homes/softwares/vim.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, options, ... }:
+{ pkgs, lib, config, ... }:
 let inherit (builtins) readFile; in
 {
 config = {
@@ -71,7 +71,8 @@ programs.neovim = {
     #pkgs.vimPlugins.fugitive
   ];
 };
-} // lib.optionalAttrs (options ? "nixpkgs") {
+} /* // lib.optionalAttrs (!config.useGlobalPkgs) {
   nixpkgs.config.vim.gui = if config.host.desktop then "gtk3" else "";
-};
+}*/;
+
 }

diff --git a/homes/softwares/xmonad.nix b/homes/softwares/xmonad.nix
index 06689b9e82d478fe10e073451d9a0a06f81eb719..6b77f29d35ea8d6d83fd964162772ea2a95b1f2b 100644 (file)
--- a/homes/softwares/xmonad.nix
+++ b/homes/softwares/xmonad.nix
@@ -36,9 +36,9 @@ services.screen-locker = {
     ${pkgs.xsecurelock}/bin/xsecurelock
   '');
     #XSECURELOCK_SWITCH_USER_COMMAND="${pkgs.lightdm}/bin/dm-tool switch-to-greeter" \
-  enableDetectSleep = true;
   inactiveInterval = lib.mkDefault 3; # minutes
-  xssLockExtraOptions = [
+  xautolock.detectSleep = true;
+  xss-lock.extraOptions = [
     "--transfer-sleep-lock"
     #"-n" "${pkgs.xss-lock}/share/doc/xss-lock/dim-screen.sh"
   ];

diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index 9869c58b01a86235eed5088831e5d762b3fe745a..8072d86b96d85d42bef847f0ca34e66f91588709 100644 (file)
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -86,7 +86,6 @@ services.openssh.openFirewall = false;
 services.openssh.forwardX11 = true;
 services.openssh.passwordAuthentication = false;
 
-nixpkgs.config.allowUnfree = true;
 environment.etc."nixpkgs".source = pkgs.path;
 environment.etc."nixpkgs-overlays".source = inputs.self + "/nixpkgs";
 

diff --git a/hosts/patate.nix b/hosts/patate.nix
index b0f04db69d34c21f7539f5363a8964e08cb27b81..4d626f4451b2cf3f2c77e37d1a6c5528d66d72f8 100644 (file)
--- a/hosts/patate.nix
+++ b/hosts/patate.nix
@@ -63,9 +63,6 @@ nix = {
 };
 services.openssh.passwordAuthentication = false;
 
-nixpkgs.config = {
-  allowUnfree = true;
-};
 environment.etc."nixpkgs".source = pkgs.path;
 environment.etc."nixpkgs-overlays".source = inputs.self + "/nixpkgs";
 environment.systemPackages = [