summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/base/nix.nix2
-rw-r--r--modules/core/nix/default.nix5
-rw-r--r--modules/mac/default.nix6
-rw-r--r--modules/mac/programs/homebrew/casks.nix2
-rw-r--r--modules/mac/programs/homebrew/default.nix2
-rw-r--r--modules/mac/programs/homebrew/nix-homebrew.nix1
6 files changed, 12 insertions, 6 deletions
diff --git a/modules/base/nix.nix b/modules/base/nix.nix
index 1b4703c..2390b4b 100644
--- a/modules/base/nix.nix
+++ b/modules/base/nix.nix
@@ -6,8 +6,6 @@
}:
{
nix = {
- optimise.automatic = true;
- registry.nixpkgs.flake = inputs.nixpkgs;
package = lib.mkForce pkgs.nixVersions.git;
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
channel.enable = false;
diff --git a/modules/core/nix/default.nix b/modules/core/nix/default.nix
index 5211041..0928b49 100644
--- a/modules/core/nix/default.nix
+++ b/modules/core/nix/default.nix
@@ -11,6 +11,11 @@
./nh.nix
];
+ nix = {
+ optimise.automatic = true;
+ registry.nixpkgs.flake = inputs.nixpkgs;
+ };
+
nix.settings = {
auto-optimise-store = true;
http-connections = 0;
diff --git a/modules/mac/default.nix b/modules/mac/default.nix
index 5b34d77..1ed98c7 100644
--- a/modules/mac/default.nix
+++ b/modules/mac/default.nix
@@ -5,5 +5,9 @@
];
security.pam.enableSudoTouchIdAuth = true;
- nix.settings.trusted-users = [ "@admin" ];
+
+ nix = {
+ enable = false;
+ settings.trusted-users = [ "@admin" ];
+ };
}
diff --git a/modules/mac/programs/homebrew/casks.nix b/modules/mac/programs/homebrew/casks.nix
index b1d99e3..87a18c8 100644
--- a/modules/mac/programs/homebrew/casks.nix
+++ b/modules/mac/programs/homebrew/casks.nix
@@ -38,7 +38,7 @@
"raindropio"
"raycast"
"sony-ps-remote-play"
- "retroarch"
+ # "retroarch"
"roblox"
# "textual"
"spotify"
diff --git a/modules/mac/programs/homebrew/default.nix b/modules/mac/programs/homebrew/default.nix
index cc738c7..3d53a35 100644
--- a/modules/mac/programs/homebrew/default.nix
+++ b/modules/mac/programs/homebrew/default.nix
@@ -2,7 +2,7 @@
imports = [
./brews.nix
./casks.nix
- ./mas-apps.nix
+ # ./mas-apps.nix
./nix-homebrew.nix
];
diff --git a/modules/mac/programs/homebrew/nix-homebrew.nix b/modules/mac/programs/homebrew/nix-homebrew.nix
index 2a3db8a..5903803 100644
--- a/modules/mac/programs/homebrew/nix-homebrew.nix
+++ b/modules/mac/programs/homebrew/nix-homebrew.nix
@@ -10,7 +10,6 @@
"artginzburg/homebrew-tap" = artginzburg-homebrew-tap;
"homebrew/homebrew-core" = homebrew-core;
"homebrew/homebrew-cask" = homebrew-cask;
- "homebrew/homebrew-bundle" = homebrew-bundle;
"nerdsupremacist/homebrew-tap" = nerdsupremacist-homebrew-tap;
"nikitabobko/homebrew-tap" = nikitabobko-homebrew-tap;
"tuist/homebrew-tuist" = tuist-homebrew-tap;