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

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

flake.nix

@@ -40,9 +40,9 @@
           ./modules/packages/cli.nix
           ./modules/packages/languages.nix
           ./modules/packages/media.nix
-          ./modules/packages/security.nix
           ./modules/packages/networking.nix
           ./modules/homebrew.nix
+          ./modules/librewolf.nix
           ./modules/home/default.nix
         ];
       };

modules/home/default.nix

@@ -4,10 +4,14 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    backupFileExtension = "bak";
 
     users.atridad = { pkgs, lib, ... }: {
       imports = [
         ./zed.nix
+        ./ssh.nix
+        ./git.nix
+        ./ghostty.nix
       ];
 
       home = {

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

@@ -7,7 +7,7 @@
 
     extensions = [
       "nix"
-      "catppuccin"
+      "dracula"
       "catppuccin-icons"
       "toml"
       "elixir"
@@ -16,9 +16,12 @@
       "vue"
       "latex"
       "mermaid"
+      "docker"
+      "docker-compose"
     ];
 
     userSettings = {
+      auto_update = false;
       icon_theme = "Catppuccin Macchiato";
       title_bar = {
         show_sign_in = false;
@@ -39,11 +42,14 @@
       theme = {
         mode = "system";
         light = "One Light";
-        dark = "Catppuccin Macchiato";
+        dark = "Dracula";
       };
       languages = {
         "Nix" = {
-          language_servers = [ "nil" "nixd" ];
+          language_servers = [
+            "nil"
+            "nixd"
+          ];
           format_on_save = "on";
         };
       };

modules/homebrew.nix

@@ -6,9 +6,14 @@
 
     onActivation = {
       autoUpdate = true;
+      upgrade = true;
       cleanup = "zap";
     };
 
+    taps = [
+      "supersonic-app/supersonic"
+    ];
+
     brews = [
       "gamdl"
       "knock"
@@ -19,11 +24,12 @@
       "android-platform-tools"
       "flutter"
       "ghostty"
-      "zed"
       "librewolf"
       "ngrok"
       "pearcleaner"
-      "zulu@17"
+      "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

@@ -4,23 +4,13 @@
   environment.systemPackages = with pkgs; [
     helix
     micro
-    lazygit
-    ripgrep
     fnm
     cmake
-    ninja
     gradle
     netcat-gnu
     bitwarden-cli
-    pwgen
     qrencode
     sl
     upx
-    wakeonlan
-    magic-wormhole
-    httpie
-    gh
-    doctl
-    qemu
   ];
 }

modules/packages/languages.nix

@@ -2,7 +2,10 @@
 
 let
   rustToolchain = pkgs.rust-bin.stable.latest.default.override {
-    extensions = [ "rust-src" "rust-analyzer" ];
+    extensions = [
+      "rust-src"
+      "rust-analyzer"
+    ];
     targets = [ "aarch64-apple-darwin" ];
   };
 in
@@ -12,10 +15,9 @@ in
     python313
     openjdk
     openjdk17
-    lua
-    luajit
-    perl
     ruby
     go
+    nil
+    nixd
   ];
 }

modules/packages/media.nix

@@ -3,7 +3,6 @@
 {
   environment.systemPackages = with pkgs; [
     ffmpeg
-    tesseract
     tectonic
   ];
 }

modules/packages/networking.nix

@@ -2,7 +2,9 @@
 
 {
   environment.systemPackages = with pkgs; [
-    freerdp
+    nmap
-    openmpi
+    nikto
+    john
+    rustscan
   ];
 }

modules/packages/security.nix

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