Update homebrew.nix

Makefile

@@ -0,0 +1,10 @@
+.PHONY: build update lock
+
+build:
+	sudo darwin-rebuild switch --flake .#dart
+
+update:
+	nix flake update
+
+lock:
+	nix flake lock

README.md

@@ -0,0 +1,6 @@
+# Lavitz - My NixOS desktop configuration named after Dart from the PS1 classic The Legend of Dragoon
+
+- Nix Version: 25.11
+- OS: MacOS
+- Browser: Librewolf
+- Terminal: Ghostty

flake.lock

@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772633327,
+        "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770922915,
-        "narHash": "sha256-6J/JoK9iL7sHvKJcGW2KId2agaKv1OGypsa7kN+ZBD4=",
+        "lastModified": 1772379624,
+        "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "6c5a56295d2a24e43bcd8af838def1b9a95746b2",
+        "rev": "52d061516108769656a8bd9c6e811c677ec5b462",
         "type": "github"
       },
       "original": {
@@ -22,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771177547,
-        "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=",
+        "lastModified": 1772674223,
+        "narHash": "sha256-/suKbHSaSmuC9UY7G0VRQ3aO+QKqxAQPQ19wG7QNkF8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2",
+        "rev": "66d9241e3dc2296726dc522e62dbfe89c7b449f3",
         "type": "github"
       },
       "original": {
@@ -38,6 +58,7 @@
     },
     "root": {
       "inputs": {
+        "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay"
@@ -50,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771211437,
-        "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=",
+        "lastModified": 1772679930,
+        "narHash": "sha256-FxYmdacqrdDVeE9QqZKTIpNLjv2B8GSKssgwlZuTR98=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f",
+        "rev": "9b741db17141331fdb26270a1b66b81be8be9edd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "dart — system configuration via nix-darwin";
+  description = "dart";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
@@ -9,13 +9,18 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, nix-darwin, rust-overlay }:
+  outputs = { self, nixpkgs, nix-darwin, home-manager, rust-overlay }:
     let
       system = "aarch64-darwin";
 
@@ -24,138 +29,32 @@
         overlays = [ rust-overlay.overlays.default ];
         config.allowUnfree = true;
       };
-
-      rustToolchain = pkgs.rust-bin.stable.latest.default.override {
-        extensions = [ "rust-src" "rust-analyzer" ];
-        targets = [ "aarch64-apple-darwin" ];
-      };
-
-      # CLI
-      cliTools = with pkgs; [
-        # Editors
-        helix
-        micro
-        lazygit
-        ripgrep
-
-        # Build/dev tools
-        fnm
-        cmake
-        ninja
-        gradle
-
-        # Network
-        netcat-gnu
-
-        # Misc
-        bitwarden-cli
-        pwgen
-        qrencode
-        sl
-        upx
-        wakeonlan
-        magic-wormhole
-        httpie
-        gh
-        doctl
-        qemu
-      ];
-
-      # Languages
-      languages = with pkgs; [
-        rustToolchain
-        python313
-        openjdk
-        openjdk17
-        lua
-        luajit
-        perl
-        ruby
-        go
-      ];
-
-      # Media
-      media = with pkgs; [
-        ffmpeg
-        tesseract
-        tectonic
-      ];
-
-      # Security
-      security = with pkgs; [
-        nmap
-        nikto
-        john
-        rustscan
-      ];
-
-      # Networking
-      networking = with pkgs; [
-        freerdp
-        openmpi
-      ];
-
-      allPackages =
-        cliTools
-        ++ languages
-        ++ media
-        ++ security
-        ++ networking;
-
     in
     {
       darwinConfigurations."dart" = nix-darwin.lib.darwinSystem {
         inherit system;
+        specialArgs = { inherit rust-overlay; };
         modules = [
-          {
-            nix.settings = {
-              experimental-features = [ "nix-command" "flakes" ];
-            };
-
-            nixpkgs = {
-              hostPlatform = system;
-              config.allowUnfree = true;
-              overlays = [ rust-overlay.overlays.default ];
-            };
-
-            environment.systemPackages = allPackages;
-
-            homebrew = {
-              enable = true;
-
-              onActivation = {
-                autoUpdate = true;
-                cleanup = "zap";
-              };
-
-              brews = [
-                "gamdl"
-                "knock"
-                "snort"
-              ];
-
-              casks = [
-                "android-platform-tools"
-                "flutter"
-                "ghostty"
-                "librewolf"
-                "ngrok"
-                "pearcleaner"
-                "zulu@17"
-              ];
-            };
-
-            programs.zsh.enable = true;
-            system.primaryUser = "atridad";
-            system.stateVersion = 6;
-          }
+          home-manager.darwinModules.home-manager
+          ./modules/system.nix
+          ./modules/packages/cli.nix
+          ./modules/packages/languages.nix
+          ./modules/packages/media.nix
+          ./modules/packages/networking.nix
+          ./modules/homebrew.nix
+          ./modules/librewolf.nix
+          ./modules/home/default.nix
         ];
       };
 
-      devShells.${system} = {
-        default = pkgs.mkShell {
-          packages = allPackages;
-        };
+      devShells.${system}.default = pkgs.mkShell {
+        packages = with pkgs; [
+          (rust-bin.stable.latest.default.override {
+            extensions = [ "rust-src" "rust-analyzer" ];
+            targets = [ "aarch64-apple-darwin" ];
+          })
+          helix
+        ];
       };
     };
 }

modules/home/default.nix

@@ -0,0 +1,24 @@
+{ pkgs, lib, ... }:
+
+{
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    backupFileExtension = "bak";
+
+    users.atridad = { pkgs, lib, ... }: {
+      imports = [
+        ./zed.nix
+        ./ssh.nix
+        ./git.nix
+        ./ghostty.nix
+      ];
+
+      home = {
+        username = "atridad";
+        homeDirectory = lib.mkForce "/Users/atridad";
+        stateVersion = "25.11";
+      };
+    };
+  };
+}

modules/home/ghostty.nix

@@ -0,0 +1,20 @@
+{ pkgs, lib, ... }:
+
+let
+  ghosttyStub = (pkgs.runCommand "ghostty-stub" { } "mkdir -p $out/bin")
+    // { meta.mainProgram = "ghostty"; };
+in
+{
+  programs.ghostty = {
+    enable = true;
+    package = lib.mkForce ghosttyStub;
+
+    enableZshIntegration = false;
+    enableBashIntegration = false;
+
+    settings = {
+      theme = "Catppuccin Macchiato";
+      background-opacity = "0.95";
+    };
+  };
+}

modules/home/git.nix

@@ -0,0 +1,20 @@
+{ ... }:
+
+{
+  programs.git = {
+    enable = true;
+
+    signing = {
+      key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILKb+pDgkHEKI7LDWvZbhoLJ11uJMaCmVyAqotDxNOI7 me@atri.dad";
+      signByDefault = true;
+      format = "ssh";
+    };
+
+    settings = {
+      user = {
+        name = "Atridad Lahiji";
+        email = "me@atri.dad";
+      };
+    };
+  };
+}

modules/home/ssh.nix

@@ -0,0 +1,31 @@
+{ ... }:
+
+{
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+
+    matchBlocks = {
+      "*" = {
+        extraOptions = {
+          IdentityAgent = "/Users/atridad/.bitwarden-ssh-agent.sock";
+        };
+      };
+      "localhost" = {
+        userKnownHostsFile = "/dev/null";
+      };
+      "tux" = {
+        hostname = "tuxworld.usask.ca";
+        user = "atl175";
+      };
+      "haschel" = {
+        hostname = "haschel";
+        user = "root";
+      };
+      "lloyd" = {
+        hostname = "lloyd";
+        user = "truenas_admin";
+      };
+    };
+  };
+}

modules/home/zed.nix

@@ -0,0 +1,58 @@
+{ pkgs, lib, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = lib.mkForce (pkgs.runCommand "zed-stub" { } "mkdir -p $out");
+
+    extensions = [
+      "nix"
+      "dracula"
+      "catppuccin-icons"
+      "toml"
+      "elixir"
+      "make"
+      "astro"
+      "vue"
+      "latex"
+      "mermaid"
+      "docker"
+      "docker-compose"
+    ];
+
+    userSettings = {
+      auto_update = false;
+      icon_theme = "Catppuccin Macchiato";
+      title_bar = {
+        show_sign_in = false;
+      };
+      collaboration_panel = {
+        button = false;
+      };
+      status_bar = {
+        cursor_position_button = false;
+      };
+      disable_ai = true;
+      telemetry = {
+        diagnostics = false;
+        metrics = false;
+      };
+      ui_font_size = 16;
+      buffer_font_size = 15;
+      theme = {
+        mode = "system";
+        light = "One Light";
+        dark = "Dracula";
+      };
+      languages = {
+        "Nix" = {
+          language_servers = [
+            "nil"
+            "nixd"
+          ];
+          format_on_save = "on";
+        };
+      };
+    };
+  };
+}

modules/homebrew.nix

@@ -0,0 +1,35 @@
+{ ... }:
+
+{
+  homebrew = {
+    enable = true;
+
+    onActivation = {
+      autoUpdate = true;
+      upgrade = true;
+      cleanup = "zap";
+    };
+
+    taps = [
+      "supersonic-app/supersonic"
+    ];
+
+    brews = [
+      "gamdl"
+      "knock"
+      "snort"
+    ];
+
+    casks = [
+      "android-platform-tools"
+      "flutter"
+      "ghostty"
+      "librewolf"
+      "ngrok"
+      "pearcleaner"
+      "zed"
+      "supersonic"
+      "calibre"
+    ];
+  };
+}

modules/librewolf.nix

@@ -0,0 +1,113 @@
+{ pkgs, ... }:
+
+let
+  policies = {
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      DisablePocket = true;
+      DisableFirefoxAccounts = true;
+      OfferToSaveLogins = false;
+      EnableTrackingProtection = true;
+
+      FirefoxHome = {
+        Search = true;
+        TopSites = true;
+        SponsoredTopSites = false;
+        Highlights = false;
+        Pocket = false;
+        SponsoredPocket = false;
+      };
+
+      SanitizeOnShutdown = {
+        Cache = true;
+        Cookies = false;
+        History = false;
+        Sessions = true;
+        SiteSettings = false;
+        OfflineApps = true;
+      };
+
+      SearchEngines = {
+        Default = "Searx Search";
+        Remove = [
+          "Google"
+          "Bing"
+          "Perplexity"
+          "Wikipedia (en)"
+        ];
+        Add = [
+          {
+            Name = "Searx Search";
+            URLTemplate = "https://search.atri.dad/search?q={searchTerms}";
+            Method = "GET";
+            IconURL = "https://search.atri.dad/favicon.ico";
+            Alias = "searx";
+            Description = "Searx (search.atri.dad)";
+          }
+          {
+            Name = "DuckDuckGo";
+            URLTemplate = "https://duckduckgo.com/?q={searchTerms}";
+            SuggestURLTemplate = "https://duckduckgo.com/ac/?q={searchTerms}&type=list";
+            Method = "GET";
+            IconURL = "https://duckduckgo.com/favicon.ico";
+            Alias = "ddg";
+            Description = "DuckDuckGo";
+          }
+        ];
+      };
+
+      ExtensionSettings = {
+        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        "floccus@handmadeideas.org" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/floccus/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+      };
+
+      Preferences = {
+        "browser.startup.homepage" = "about:home";
+        "extensions.autoDisableScopes" = 0;
+        "browser.toolbars.bookmarks.visibility" = "always";
+        "network.cookie.cookieBehavior" = 1;
+        "extensions.activeThemeID" = "firefox-alpenglow@mozilla.org";
+        "privacy.resistFingerprinting" = true;
+        "browser.ml.chat.enabled" = false;
+        "browser.ml.chat.sidebar" = false;
+        "browser.tabs.groups.smart.userEnabled" = false;
+        "browser.safebrowsing.malware.enabled" = false;
+        "browser.safebrowsing.phishing.enabled" = false;
+        "browser.safebrowsing.blockedURIs.enabled" = false;
+        "browser.safebrowsing.downloads.enabled" = false;
+        "browser.safebrowsing.provider.google4.gethashURL" = "";
+        "browser.safebrowsing.provider.google4.updateURL" = "";
+        "browser.safebrowsing.provider.google.gethashURL" = "";
+        "browser.safebrowsing.provider.google.updateURL" = "";
+        "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "dark-mountain";
+      };
+    };
+  };
+
+  policiesFile = pkgs.writeText "librewolf-policies.json" (builtins.toJSON policies);
+in
+{
+  system.activationScripts.postActivation.text = ''
+    for APP_DIR in "/Applications/LibreWolf.app" "$HOME/Applications/LibreWolf.app"; do
+      if [ -d "$APP_DIR" ]; then
+        DIST_DIR="$APP_DIR/Contents/Resources/distribution"
+        mkdir -p "$DIST_DIR"
+        cp -f ${policiesFile} "$DIST_DIR/policies.json"
+        chmod 644 "$DIST_DIR/policies.json"
+        echo "Applied LibreWolf policies to $APP_DIR"
+        xattr -dr com.apple.quarantine /Applications/LibreWolf.app
+      fi
+    done
+  '';
+}

modules/packages/cli.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    helix
+    micro
+    fnm
+    cmake
+    gradle
+    netcat-gnu
+    bitwarden-cli
+    qrencode
+    sl
+    upx
+  ];
+}

modules/packages/languages.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+let
+  rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+    extensions = [
+      "rust-src"
+      "rust-analyzer"
+    ];
+    targets = [ "aarch64-apple-darwin" ];
+  };
+in
+{
+  environment.systemPackages = with pkgs; [
+    rustToolchain
+    python313
+    openjdk
+    openjdk17
+    ruby
+    go
+    nil
+    nixd
+  ];
+}

modules/packages/media.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    ffmpeg
+    tectonic
+  ];
+}

modules/packages/networking.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    nmap
+    nikto
+    john
+    rustscan
+  ];
+}

modules/system.nix

@@ -0,0 +1,17 @@
+{ rust-overlay, ... }:
+
+{
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+  };
+
+  nixpkgs = {
+    hostPlatform = "aarch64-darwin";
+    config.allowUnfree = true;
+    overlays = [ rust-overlay.overlays.default ];
+  };
+
+  programs.zsh.enable = true;
+  system.primaryUser = "atridad";
+  system.stateVersion = 6;
+}