From b4dd9407d4b8a81ff65e1539a7a0a9e6af06c3da Mon Sep 17 00:00:00 2001 From: Random936 Date: Wed, 26 Nov 2025 20:03:02 -0500 Subject: [PATCH] Removed some other darwin related config; switched to brave browser --- config/darwin.nix | 80 -------------------------------------- dotfiles/.config/i3/config | 2 +- home/modules/gui-apps.nix | 13 +++---- home/modules/zsh.nix | 5 --- 4 files changed, 7 insertions(+), 93 deletions(-) delete mode 100644 config/darwin.nix diff --git a/config/darwin.nix b/config/darwin.nix deleted file mode 100644 index 91737da..0000000 --- a/config/darwin.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ config, pkgs, lib, ... }: { - nix.settings.experimental-features = ["nix-command" "flakes"]; - - nixpkgs.config.allowUnfree = true; - environment.systemPackages = with pkgs; [ - git - ]; - - homebrew = { - enable = true; - onActivation.cleanup = "zap"; - taps = [ - "nikitabobko/tap" - "FelixKratz/formulae" - ]; - brews = [ - "wireguard-tools" - "pinentry-mac" - "sketchybar" - "coreutils" - "watch" - "rbw" - ]; - casks = [ - "font-hack-nerd-font" - "scroll-reverser" - "instantview" - "proton-mail" - "flameshot" - "aerospace" - "bitwarden" - "tailscale" - "wireshark" - "firefox" - "ghostty" - "discord" - "barrier" - "zoom" - "plex" - "vlc" - ]; - }; - - # Auto upgrade nix package and the daemon service. - nix.package = pkgs.nix; - - # Extra activation scripts - system.activationScripts.extraActivation.text = '' - softwareupdate --install-rosetta --agree-to-license - ''; - - # Keyboard and Mouse - system.keyboard = { - enableKeyMapping = true; - remapCapsLockToEscape = true; - swapLeftCommandAndLeftAlt = true; - }; - - # MacOS Changes - system = { - startup.chime = false; - defaults = { - dock.autohide = true; - NSGlobalDomain = { - "com.apple.mouse.tapBehavior" = 1; - _HIHideMenuBar = true; - }; - }; - }; - - # Create /etc/zshrc that loads the nix-darwin environment. - programs.zsh.enable = true; - - users.users.jadenmaxwell = { - name = "jadenmaxwell"; - home = "/Users/jadenmaxwell"; - }; - - system.stateVersion = 5; -} diff --git a/dotfiles/.config/i3/config b/dotfiles/.config/i3/config index e895c80..2efa54e 100644 --- a/dotfiles/.config/i3/config +++ b/dotfiles/.config/i3/config @@ -18,7 +18,7 @@ bindsym $mod+Return exec "alacritty" bindsym $mod+Shift+b exec "blueman-manager" bindsym $mod+Shift+d exec "vesktop" bindsym $mod+Shift+e exec "emacsclient -c" -bindsym $mod+Shift+f exec "firefox" +bindsym $mod+Shift+f exec "brave" bindsym $mod+Shift+m exec "proton-mail" bindsym $mod+Shift+p exec "rofi-rbw" bindsym $mod+Shift+s exec "flameshot gui" diff --git a/home/modules/gui-apps.nix b/home/modules/gui-apps.nix index c5a6d28..bc06ddb 100644 --- a/home/modules/gui-apps.nix +++ b/home/modules/gui-apps.nix @@ -3,7 +3,7 @@ feh vlc dconf - firefox + brave vesktop zoom-us twinkle @@ -13,7 +13,6 @@ pavucontrol easyeffects virt-viewer - google-chrome nextcloud-client protonmail-desktop kdePackages.okular @@ -46,11 +45,11 @@ xdg.mimeApps = { enable = true; defaultApplications = { - "text/html" = "firefox.desktop"; - "x-scheme-handler/http" = "firefox.desktop"; - "x-scheme-handler/https" = "firefox.desktop"; - "x-scheme-handler/about" = "firefox.desktop"; - "x-scheme-handler/unknown" = "firefox.desktop"; + "text/html" = "brave.desktop"; + "x-scheme-handler/http" = "brave-browser.desktop"; + "x-scheme-handler/https" = "brave-browser.desktop"; + "x-scheme-handler/about" = "brave-browser.desktop"; + "x-scheme-handler/unknown" = "brave-browser.desktop"; "application/pdf" = "okularApplication_pdf.desktop"; "text/plain" = "emacsclient.desktop"; }; diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix index 8f7de47..80e4c53 100644 --- a/home/modules/zsh.nix +++ b/home/modules/zsh.nix @@ -53,7 +53,6 @@ mindforge = "ssh mindforge@mindforge.randomctf.local"; # Nix Specific aliases - update-darwin = "darwin-rebuild switch --flake ~/dotfiles"; update-config = "sudo nixos-rebuild switch --flake ~/dotfiles"; update-home = "home-manager switch --flake ~/dotfiles"; update-all = "update-config && update-home"; @@ -68,10 +67,6 @@ function ...... { cd ../../../../../.. } function ....... { cd ../../../../../../.. } - if [[ "$(uname)" == "Darwin" ]]; then - source <(/opt/homebrew/bin/brew shellenv) - fi - if [[ -n "$SSH_CONNECTION" && "$TERM" == "ghostty" ]]; then export TERM="xterm-256color" fi