diff --git a/hosts/darwin/home/partials/ghostty/ghostty.nix b/hosts/darwin/home/partials/ghostty/ghostty.nix deleted file mode 100644 index 5b10389..0000000 --- a/hosts/darwin/home/partials/ghostty/ghostty.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - home.file = { - ".config/ghostty/" = { - source = ./ghostty; - }; - }; -} diff --git a/hosts/darwin/home/partials/ghostty/ghostty/config b/hosts/darwin/home/partials/ghostty/ghostty/config deleted file mode 100644 index b0203a7..0000000 --- a/hosts/darwin/home/partials/ghostty/ghostty/config +++ /dev/null @@ -1,13 +0,0 @@ -# macOS specific -macos-titlebar-style = "tabs" - -# Window padding & size -window-padding-x = 8 -window-padding-y = 0,2 -window-height = 25 -window-width = 100 - -# Themes -background-blur=true -background-opacity = 0.85 -theme = Spacegray Eighties diff --git a/hosts/darwin/home/partials/wallpaper/walls.jpg b/hosts/darwin/home/partials/wallpaper/walls.jpg deleted file mode 100644 index da36336..0000000 Binary files a/hosts/darwin/home/partials/wallpaper/walls.jpg and /dev/null differ diff --git a/hosts/darwin/home/partials/wallpaper/walls.nix b/hosts/darwin/home/partials/wallpaper/walls.nix deleted file mode 100644 index 90b0dee..0000000 --- a/hosts/darwin/home/partials/wallpaper/walls.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - ... -}: -let - wallpaperPath = "${config.home.homeDirectory}/.config/wallpaper/current-wallpaper.jpg"; -in -{ - # Create wallpaper directory and download wallpaper - home.file.".config/wallpaper/current-wallpaper.jpg" = { - source = ./walls.jpg; - }; - - # Set wallpaper using activation script - home.activation.setWallpaper = config.lib.dag.entryAfter [ "writeBoundary" ] '' - # Set wallpaper for all desktops using osascript - $DRY_RUN_CMD /usr/bin/osascript -e "tell application \"System Events\" to tell every desktop to set picture to \"${wallpaperPath}\"" - ''; -} diff --git a/hosts/darwin/home/users/alistreaza.nix b/hosts/darwin/home/users/alistreaza.nix index 0bd2ddd..317dcaa 100644 --- a/hosts/darwin/home/users/alistreaza.nix +++ b/hosts/darwin/home/users/alistreaza.nix @@ -27,16 +27,14 @@ # Nix & languages env deps home.env.nix.enable = true; - home.env.jdk.enable = true; - home.env.rust.enable = true; - home.env.python.enable = true; - - home.packages = [ ]; # No Home Application Folders targets.darwin.linkApps.enable = false; targets.darwin.copyApps.enable = false; + # Home packages + home.packages = [ ]; + # The state version is required and should stay at the version you # originally installed. home.stateVersion = "25.11"; diff --git a/hosts/darwin/system/os.nix b/hosts/darwin/system/os.nix index db79815..b699426 100644 --- a/hosts/darwin/system/os.nix +++ b/hosts/darwin/system/os.nix @@ -1,7 +1,6 @@ { ... }: { system.primaryUser = "alistreaza"; - nixpkgs.hostPlatform = "aarch64-darwin"; # Homebrew apps os.homebrew.ghostty.enable = true; @@ -12,4 +11,6 @@ os.homebrew.obsidian.enable = true; os.homebrew.microsoft.enable = true; os.homebrew.keka.enable = true; + + nixpkgs.hostPlatform = "aarch64-darwin"; } diff --git a/modules/home/nixos/apps/firefox.nix b/modules/home/nixos/apps/firefox.nix index 2b0f68b..e973f62 100644 --- a/modules/home/nixos/apps/firefox.nix +++ b/modules/home/nixos/apps/firefox.nix @@ -5,7 +5,9 @@ let in { options.home.firefox = { - enable = mkEnableOption "Ghostty service"; + enable = mkEnableOption "Firefox service"; + privacy = mkEnableOption "Firefox privacy service"; + sanity = mkEnableOption "Sanitize Firefox on shutdown"; }; config = mkIf cfg.enable { @@ -18,18 +20,45 @@ in programs.firefox = { enable = true; + languagePacks = [ "fr-FR" ]; policies = { - ExtensionSettings = { - "uBlock0@raymondhill.net" = { - default_area = "menupanel"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; - private_browsing = true; + DisablePocket = true; + ExtensionSettings = + { } + + mkif cfg.privacy { + "uBlock0@raymondhill.net" = { + default_area = "menupanel"; + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + installation_mode = "force_installed"; + private_browsing = true; + }; }; - }; + } + + mkif cfg.privacy { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = true; }; - profiles.alistreaza = { + profiles.default = { settings = { + # Vertical tabs + "sidebar.revamp" = true; + "sidebar.verticalTabs" = true; + "sidebar.new-sidebar.has-used" = true; + "sidebar.main.tools" = "history,passwords"; + "sidebar.backupState" = { + "panelOpen" = true; + "launcherExpanded" = false; + "launcherVisible" = true; + }; + # No bookmarks + "browser.toolbars.bookmarks.visibility" = "never"; + # New tab page + "browser.newtabpage.activity-stream.feeds.topsites" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = false; + } + + mkif cfg.privacy { # Disable some telemetry "app.shield.optoutstudies.enabled" = false; "browser.discovery.enabled" = false; @@ -55,25 +84,20 @@ in "toolkit.telemetry.unified" = false; "toolkit.telemetry.unifiedIsOptIn" = false; "toolkit.telemetry.updatePing.enabled" = false; - # New tab page - "browser.newtabpage.activity-stream.feeds.topsites" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = false; - # No bookmartks - "browser.toolbars.bookmarks.visibility" = "never"; - # Vertical tabs - "sidebar.backupState" = { - "panelOpen" = true; - "launcherExpanded" = false; - "launcherVisible" = true; + } + + mkif cfg.sanity { + # Sanitize + "SanitizeOnShutdown" = { + "Locked" = false; + "Cache" = true; + "History" = true; + "Cookies" = true; + "Sessions" = true; + "FormData" = true; + "SiteSettings" = true; }; - "sidebar.new-sidebar.has-used" = true; - "sidebar.verticalTabs" = true; - "sidebar.revamp" = true; - "sidebar.main.tools" = "history,passwords"; }; }; }; - }; }