aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2025-10-23 06:48:26 -0700
committerFranck Cuny <franck@fcuny.net>2025-10-23 06:48:26 -0700
commit9507edf2d9c1bca3c8c79e4b510a8ef870717f71 (patch)
tree21ff14367e8df4d4bb3a18b75a0ce67a9a9f9472 /modules
parentmove keycloak and forgejo on rivendell (diff)
downloadinfra-9507edf2d9c1bca3c8c79e4b510a8ef870717f71.tar.gz
simplify darwin configuration
Remove a bunch of files and consolidate everything into the host's file.
Diffstat (limited to 'modules')
-rw-r--r--modules/darwin/default.nix9
-rw-r--r--modules/darwin/desktop.nix34
-rw-r--r--modules/darwin/keyboard.nix7
-rw-r--r--modules/darwin/nix.nix42
-rw-r--r--modules/darwin/security.nix5
5 files changed, 0 insertions, 97 deletions
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
deleted file mode 100644
index 674e042..0000000
--- a/modules/darwin/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-{
- imports = [
- ./desktop.nix
- ./keyboard.nix
- ./nix.nix
- ./security.nix
- ];
-}
diff --git a/modules/darwin/desktop.nix b/modules/darwin/desktop.nix
deleted file mode 100644
index 55cef64..0000000
--- a/modules/darwin/desktop.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-{
- fonts.packages = with pkgs; [
- source-code-pro
- ];
-
- system.defaults = {
- dock = {
- autohide = true;
- dashboard-in-overlay = false;
- launchanim = false; # Don't animate opening applications.
- mru-spaces = false; # don’t rearrange spaces based on the most recent use
- orientation = "bottom";
- show-recents = false;
- showhidden = false;
- tilesize = 30; # Default is 64.
- wvous-br-corner = 1; # Disable Notes hot corner.
- };
- finder.AppleShowAllExtensions = true;
-
- CustomUserPreferences = {
- "com.apple.desktopservices" = {
- # Avoid creating .DS_Store files on network or USB volumes
- DSDontWriteNetworkStores = true;
- DSDontWriteUSBStores = true;
- };
- };
-
- # Requires the directory to already exist.
- # See system.activationScripts.postUserActivation
- screencapture.location = "~/Documents/screenshots";
- SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
- };
-}
diff --git a/modules/darwin/keyboard.nix b/modules/darwin/keyboard.nix
deleted file mode 100644
index c460bac..0000000
--- a/modules/darwin/keyboard.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
- system.keyboard = {
- enableKeyMapping = true;
- remapCapsLockToControl = true;
- };
-}
diff --git a/modules/darwin/nix.nix b/modules/darwin/nix.nix
deleted file mode 100644
index 56d85ca..0000000
--- a/modules/darwin/nix.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- lib,
- adminUser,
- pkgs,
- ...
-}:
-{
- nix = {
- extraOptions = ''
- tarball-ttl = 900
- '';
- gc = {
- automatic = true;
- options = "--delete-older-than 7d";
- };
- optimise = {
- automatic = true;
- };
- package = pkgs.nixVersions.stable;
- settings = {
- trusted-substituters = [
- "https://cachix.cachix.org"
- "https://nixpkgs.cachix.org"
- "https://nix-community.cachix.org"
- ];
- trusted-public-keys = [
- "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
- "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE="
- "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
- "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
- ];
- trusted-users = [
- "@admin"
- adminUser.name
- ];
- experimental-features = lib.mkDefault [
- "nix-command"
- "flakes"
- ];
- };
- };
-}
diff --git a/modules/darwin/security.nix b/modules/darwin/security.nix
deleted file mode 100644
index 178fca1..0000000
--- a/modules/darwin/security.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-{
- # Touch ID for sudo auth
- security.pam.services.sudo_local.touchIdAuth = true;
-}