diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix index 17a9f87..f87b8d9 100644 --- a/nixcfgs/flake.nix +++ b/nixcfgs/flake.nix @@ -166,6 +166,7 @@ betterfox-nix.modules.homeManager.betterfox sops-nix.homeManagerModules.sops stylix.homeModules.stylix + nix-index-database.homeModules.nix-index ]; }; }; diff --git a/nixcfgs/hosts/zen/brew.nix b/nixcfgs/hosts/zen/brew.nix index 797e2e9..b76d21d 100644 --- a/nixcfgs/hosts/zen/brew.nix +++ b/nixcfgs/hosts/zen/brew.nix @@ -25,6 +25,7 @@ # Networking "wireshark-app" "clash-verge-rev" + "protonvpn" # Terminal Emulator @@ -37,6 +38,7 @@ "steam" "discord" "orbstack" # Docker runtime + "proton-drive" # System Enhancement "alt-tab" # Turn cmd-tab to windows behaviour diff --git a/nixcfgs/hosts/zen/default.nix b/nixcfgs/hosts/zen/default.nix index f9f5592..53aff95 100644 --- a/nixcfgs/hosts/zen/default.nix +++ b/nixcfgs/hosts/zen/default.nix @@ -6,4 +6,6 @@ ./system.nix ]; time.timeZone = "Europe/London"; + + services.tailscale.enable = true; } diff --git a/nixcfgs/hosts/zen/dock.nix b/nixcfgs/hosts/zen/dock.nix index 0f6a4ca..22da5ec 100644 --- a/nixcfgs/hosts/zen/dock.nix +++ b/nixcfgs/hosts/zen/dock.nix @@ -8,7 +8,7 @@ mineffect = "suck"; minimize-to-application = true; persistent-apps = [ - {app = "${pkgs.firefox}/Applications/Firefox.app";} + {app = "${pkgs.firefox-bin}/Applications/Firefox.app";} {app = "${pkgs.ghostty-bin}/Applications/Ghostty.app";} {app = "/Applications/Obsidian.app";} # { app = "/Applications/LibreWolf.app"; } diff --git a/nixcfgs/modules/home/darwin.nix b/nixcfgs/modules/home/darwin.nix index 112f4f6..071337e 100644 --- a/nixcfgs/modules/home/darwin.nix +++ b/nixcfgs/modules/home/darwin.nix @@ -21,6 +21,7 @@ programs.ghostty.systemd.enable = false; programs.ghostty.package = lib.mkForce pkgs.ghostty-bin; + programs.firefox.package = lib.mkForce pkgs.firefox-bin; home.file.".ssh/config".text = '' # ~/.ssh/config @@ -28,4 +29,9 @@ UseKeychain yes AddKeysToAgent yes ''; + + stylix = { + # cursor.enable = lib.mkForce false; + icons.enable = lib.mkForce false; + }; } diff --git a/nixcfgs/users/js0ny/zen.nix b/nixcfgs/users/js0ny/zen.nix index b5d361f..34ccfb6 100644 --- a/nixcfgs/users/js0ny/zen.nix +++ b/nixcfgs/users/js0ny/zen.nix @@ -10,9 +10,11 @@ ./programs/shell/bash.nix ./programs/shell/zsh.nix ./programs/shell/fish.nix + ./programs/shell/carapace.nix ./programs/shell/direnv.nix # Programs + ./programs/aichat.nix ./programs/firefox ./programs/emacs.nix ./programs/zed-editor.nix @@ -28,6 +30,7 @@ ./programs/ghostty.nix ./programs/tmux.nix ./programs/kitty.nix + ./programs/anki.nix # ./programs/retroarch.nix # Package broken on macOS ./programs/duti.nix