Remove darwin.nix

darwin.nix

@@ -1,110 +0,0 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-let
-  checkBrew = "command -v brew > /dev/null";
-in
-{
-  users.users."dave.gallant".home = "/Users/dave.gallant";
-  environment = {
-    extraInit = ''
-      ${checkBrew} || >&2 echo "brew is not installed (install it via https://brew.sh)"
-    '';
-  };
-  system.defaults = {
-    loginwindow = {
-      GuestEnabled = false;
-      SHOWFULLNAME = false;
-    };
-
-    finder = {
-      AppleShowAllExtensions = true;
-      FXEnableExtensionChangeWarning = true;
-      _FXShowPosixPathInTitle = true;
-    };
-
-    trackpad = {
-      ActuationStrength = 0;
-      Clicking = true;
-      FirstClickThreshold = 1;
-      SecondClickThreshold = 1;
-      TrackpadRightClick = false;
-    };
-
-    # firewall
-    alf = {
-      # 0 = disabled 1 = enabled 2 = blocks all connections except for essential services
-      globalstate = 1;
-      loggingenabled = 0;
-      stealthenabled = 1;
-    };
-
-    dock = {
-      autohide = true;
-      autohide-delay = 0.0;
-      autohide-time-modifier = 1.0;
-      tilesize = 50;
-      static-only = false;
-      showhidden = false;
-      show-recents = false;
-      show-process-indicators = true;
-      orientation = "bottom";
-      mru-spaces = false;
-    };
-
-    NSGlobalDomain = {
-      "com.apple.sound.beep.feedback" = 0;
-      "com.apple.sound.beep.volume" = 0.000;
-      ApplePressAndHoldEnabled = false;
-      InitialKeyRepeat = 10;
-      KeyRepeat = 2;
-      AppleShowAllExtensions = true;
-      AppleShowScrollBars = "Automatic";
-    };
-  };
-
-  homebrew = {
-    enable = true;
-    onActivation.autoUpdate = false;
-    onActivation.upgrade = false;
-    global = {
-      brewfile = true;
-    };
-
-    brews = [
-      "coreutils"
-      "gnu-sed"
-      "gnu-tar"
-      "netdata"
-      "node"
-      "podman"
-      "podman-compose"
-    ];
-
-    casks = [
-      "dbeaver-community"
-      "font-fira-code-nerd-font"
-      "font-hack-nerd-font"
-      "karabiner-elements"
-      "logseq"
-      "lulu"
-      "notunes"
-      "obsidian"
-      "podman-desktop"
-      "postman"
-      "raycast"
-      "rectangle"
-      "stats"
-      "warp"
-    ];
-
-    taps = [
-      "homebrew/bundle"
-      "homebrew/cask-fonts"
-      "homebrew/cask-versions"
-      "homebrew/services"
-    ];
-  };
-}

flake.lock

@@ -204,11 +204,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1710036095,
+        "lastModified": 1710066242,
-        "narHash": "sha256-joYx0arQtHM/7VhUY5ByP+jlf8XeJkK2fBdri8vK918=",
+        "narHash": "sha256-bO7kahLdawW7rBqUTfWgf9mdPYrnOo5DGvWRJa9N8Do=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f592a7ea771bc3c417f7e3026af615d0c6be84ce",
+        "rev": "db339f1706f555794b71aa4eb26a5a240fb6a599",
         "type": "github"
       },
       "original": {

flake.nix

@@ -116,7 +116,6 @@
 
             modules = [
               home-manager.darwinModules.home-manager
-              ./darwin.nix
               ./machines/zelus/configuration.nix
               ./packages.nix
               ./upgrade-diff.nix

machines/zelus/configuration.nix

@@ -1,7 +1,16 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
-  nixpkgs.config.allowUnfree = true;
+let
-
+  checkBrew = "command -v brew > /dev/null";
-  environment = { variables = { LANG = "en_US.UTF-8"; }; };
+in
+{
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "nix-2.16.2"
+      ];
+    };
+  };
 
   networking = { hostName = "zelus"; };
 
@@ -17,4 +26,89 @@
   };
 
   system.stateVersion = 4;
+  users.users."dave.gallant".home = "/Users/dave.gallant";
+
+  environment = {
+    extraInit = ''
+      ${checkBrew} || >&2 echo "brew is not installed (install it via https://brew.sh)"
+    '';
+    variables = { LANG = "en_US.UTF-8"; };
+  };
+
+  system.defaults = {
+
+    trackpad = {
+      ActuationStrength = 0;
+      Clicking = true;
+      FirstClickThreshold = 1;
+      SecondClickThreshold = 1;
+      TrackpadRightClick = true;
+    };
+
+    dock = {
+      autohide = true;
+      autohide-delay = 0.0;
+      autohide-time-modifier = 1.0;
+      tilesize = 50;
+      static-only = false;
+      showhidden = false;
+      show-recents = false;
+      show-process-indicators = true;
+      orientation = "bottom";
+      mru-spaces = false;
+    };
+
+    NSGlobalDomain = {
+      "com.apple.sound.beep.feedback" = 0;
+      "com.apple.sound.beep.volume" = 0.000;
+      ApplePressAndHoldEnabled = false;
+      InitialKeyRepeat = 10;
+      KeyRepeat = 2;
+      AppleShowAllExtensions = true;
+      AppleShowScrollBars = "Automatic";
+    };
+  };
+
+  homebrew = {
+    enable = true;
+    onActivation.autoUpdate = false;
+    onActivation.upgrade = false;
+    global = {
+      brewfile = true;
+    };
+
+    brews = [
+      "coreutils"
+      "gnu-sed"
+      "gnu-tar"
+      "netdata"
+      "node"
+      "podman"
+      "podman-compose"
+    ];
+
+    casks = [
+      "dbeaver-community"
+      "font-fira-code-nerd-font"
+      "font-hack-nerd-font"
+      "karabiner-elements"
+      "logseq"
+      "lulu"
+      "notunes"
+      "obsidian"
+      "postman"
+      "raycast"
+      "rectangle"
+      "stats"
+      "warp"
+    ];
+
+    taps = [
+      "homebrew/bundle"
+      "homebrew/cask-fonts"
+      "homebrew/cask-versions"
+      "homebrew/services"
+    ];
+  };
+
 }