about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/grfn/system/system/machines/ogopogo.nix1
-rw-r--r--users/sterni/machines/edwin/default.nix1
-rw-r--r--users/sterni/modules/minecraft-fabric.nix4
-rw-r--r--users/tazjin/nixos/khamovnik/default.nix2
-rw-r--r--users/wpcarro/common.nix3
5 files changed, 4 insertions, 7 deletions
diff --git a/users/grfn/system/system/machines/ogopogo.nix b/users/grfn/system/system/machines/ogopogo.nix
index 82c0163bc8f4..14514465f9ba 100644
--- a/users/grfn/system/system/machines/ogopogo.nix
+++ b/users/grfn/system/system/machines/ogopogo.nix
@@ -58,7 +58,6 @@
     freeMemThreshold = 5;
   };
 
-  nixpkgs.config.allowUnfree = true;
   hardware.enableAllFirmware = true;
 
   hardware.pulseaudio.extraConfig = ''
diff --git a/users/sterni/machines/edwin/default.nix b/users/sterni/machines/edwin/default.nix
index de34aa78afe4..c1b267526e5b 100644
--- a/users/sterni/machines/edwin/default.nix
+++ b/users/sterni/machines/edwin/default.nix
@@ -20,7 +20,6 @@
   config = {
     time.timeZone = "Europe/Berlin";
 
-    nixpkgs.config.allowUnfreeRedistributable = true;
     nix = {
       package = pkgs.nix_2_3;
       settings = {
diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix
index 7c04aae725dd..daca54b6d113 100644
--- a/users/sterni/modules/minecraft-fabric.nix
+++ b/users/sterni/modules/minecraft-fabric.nix
@@ -447,8 +447,8 @@ in
     assertions = [
       {
         assertion = builtins.all (instance: !instance.enable) (builtins.attrValues cfg)
-          || config.nixpkgs.config.allowUnfreeRedistributable or false
-          || config.nixpkgs.config.allowUnfree or false;
+          || pkgs.config.allowUnfreeRedistributable or false
+          || pkgs.config.allowUnfree or false;
         message = lib.concatStringsSep " " [
           "You need to allow unfree software for minecraft,"
           "as you'll implicitly agree to Mojang's EULA."
diff --git a/users/tazjin/nixos/khamovnik/default.nix b/users/tazjin/nixos/khamovnik/default.nix
index ca214876cc28..957397f281ef 100644
--- a/users/tazjin/nixos/khamovnik/default.nix
+++ b/users/tazjin/nixos/khamovnik/default.nix
@@ -112,8 +112,6 @@ in
   hardware.bluetooth.enable = true;
   users.users.tazjin.extraGroups = [ "tss" ];
 
-  nixpkgs.config.allowUnfree = true;
-
   environment.systemPackages = with pkgs; [
     tdesktop
   ];
diff --git a/users/wpcarro/common.nix b/users/wpcarro/common.nix
index 72ae374bbdaa..582b63fc4c43 100644
--- a/users/wpcarro/common.nix
+++ b/users/wpcarro/common.nix
@@ -29,7 +29,8 @@ in
     # Remodel the system clipboard as a list instead of a point.
     clipmenu.enable = true;
 
-    locate.enable = true;
+    # TODO(wpcarro): broken in nixpkgs as of 2023-10-04
+    locate.enable = false;
 
     depot.automatic-gc = {
       enable = true;