updated inputs, staggered 24.05 and 24.11 for older inputs, various Q…

…oL improvements
heywoodlh · Dec 12, 2024 · 816162b · 816162b
1 parent ffae61f
commit 816162b
Show file tree

Hide file tree

Showing 14 changed files with 1,805 additions and 1,772 deletions.
diff --git a/darwin/roles/base.nix b/darwin/roles/base.nix
@@ -39,12 +39,10 @@
     substituters = [
       "https://nix-community.cachix.org"
       "http://attic.barn-banana.ts.net/nix-darwin"
-      "https://heywoodlh-helix.cachix.org"
     ];
     trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "nix-darwin:So8WZjJEaRb7LAm9t3cCIMS+d1C5Pu+fG1TkhOnKdYs=" # attic
-      "heywoodlh-helix.cachix.org-1:qHDV95nI/wX9pidAukzMzgeok1415rgjMAXinDsbb7M="
     ];
   };
 }
diff --git a/darwin/roles/defaults.nix b/darwin/roles/defaults.nix
@@ -41,8 +41,8 @@ in {
   ];
 
   # add nerd fonts
-  fonts.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "Hack" "DroidSansMono" "Iosevka" ]; })
+  fonts.packages = with pkgs.nerd-fonts; [
+    jetbrains-mono
   ];
 
   #system-defaults.nix
@@ -109,7 +109,7 @@ in {
     };
     CustomUserPreferences = {
       "NSGlobalDomain" = {
-        "AppleSpacesSwitchOnActivate" = 1; # Automatically refocus spaces on app switch
+        "AppleSpacesSwitchOnActivate" = 0; # Disable refocus spaces on app switch
       };
       "com.googlecode.iterm2" = {
         "PrefsCustomFolder" = "~/.config/iterm2";

diff --git a/darwin/roles/pkgs.nix b/darwin/roles/pkgs.nix
@@ -61,16 +61,11 @@ in {
       "knockknock"
       "lulu"
       "oversight"
-      "orbstack"
-      "qutebrowser"
       "reikey"
       "remoteviewer"
       "rustdesk"
-      "secretive"
       "shortcat"
       "syncthing"
-      "tabby"
-      "zen-browser"
     ];
     masApps = {
       DaisyDisk = 411643860;