add alfred workflow, fix some ghostty settings

Sironheart · Jun 24, 2024 · a0e826b · a0e826b
1 parent ac6b66d
commit a0e826b
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 81 deletions.
diff --git a/config/hide-screen.alfredworkflow b/config/hide-screen.alfredworkflow
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,6 +9,7 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     sops-nix.url = "github:Mic92/sops-nix";
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     sironheart-nvim.url = "github:Sironheart/nvim-config";
     sironheart-nvim.inputs.nixpkgs.follows = "nixpkgs";

diff --git a/home/packages.nix b/home/packages.nix
@@ -38,10 +38,10 @@ in {
     ]
     ++ optionals isDarwin [
       # Kotlin Multiplatform
-      ruby
-      cocoapods
-      kdoctor
-      zulu
+      #   ruby
+      #   cocoapods
+      #   kdoctor
+      #   zulu
     ];
 
   home.stateVersion = "24.05";

diff --git a/home/programs/default.nix b/home/programs/default.nix
@@ -13,7 +13,7 @@
     font-family = Geist Mono
     theme = catppuccin-frappe
 
-    macos-non-native-fullscreen = visible-menu
+    # macos-non-native-fullscreen = visible-menu
     macos-option-as-alt = true
 
     confirm-close-surface = false

diff --git a/home/programs/shell/default.nix b/home/programs/shell/default.nix
@@ -70,6 +70,8 @@
       keymap_mode = "vim-insert";
       show_preview = true;
       update_check = false;
+      style = "compact";
+      inline_height = 20;
     };
   };
 

diff --git a/home/programs/sway/default.nix b/home/programs/sway/default.nix
@@ -113,7 +113,7 @@ in {
   };
 
   programs.waybar = {
-    enable = true;
+    enable = isLinux;
     systemd.target = "sway-session.target";
   };
   programs.alacritty = {

diff --git a/lib/shared/macOS/homebrew/default.nix b/lib/shared/macOS/homebrew/default.nix
@@ -27,16 +27,15 @@
       "alfred"
       "arc"
       "discord"
+      "elgato-camera-hub"
       "focusrite-control"
       "google-chrome"
       "jetbrains-toolbox"
       "jordanbaird-ice"
       "notion"
       "orbstack"
       "postman"
-      "slack"
       "spotify"
-      "xcodes"
       "zed"
     ];
 

diff --git a/lib/shared/macOS/mac-config.nix b/lib/shared/macOS/mac-config.nix
@@ -6,29 +6,46 @@
   environment.shells = [pkgs.fish];
 
   time.timeZone = "Europe/Berlin";
-  system.defaults.finder.ShowPathbar = true;
-  system.defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
+  system.defaults = {
+    finder.ShowPathbar = true;
+    SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
 
-  system.defaults.dock = {
-    "mineffect" = "scale";
-    "autohide" = true;
-    "show-recents" = false;
-  };
-  system.defaults.finder = {
-    "AppleShowAllFiles" = true;
-    "AppleShowAllExtensions" = true;
-    "FXPreferredViewStyle" = "Nlsv";
-  };
-  system.defaults.NSGlobalDomain = {
-    "com.apple.swipescrolldirection" = false;
-    "com.apple.keyboard.fnState" = true;
-    "KeyRepeat" = 2;
-    "AppleEnableMouseSwipeNavigateWithScrolls" = false;
-    "AppleEnableSwipeNavigateWithScrolls" = true;
-    "NSAutomaticCapitalizationEnabled" = false;
-    "NSAutomaticDashSubstitutionEnabled" = false;
-    "NSAutomaticPeriodSubstitutionEnabled" = false;
-    "NSAutomaticQuoteSubstitutionEnabled" = false;
-    "NSAutomaticSpellingCorrectionEnabled" = false;
+    dock = {
+      mineffect = "scale";
+      autohide = true;
+      show-recents = false;
+    };
+    finder = {
+      AppleShowAllFiles = true;
+      AppleShowAllExtensions = true;
+      FXPreferredViewStyle = "Nlsv";
+      # ShowPathbar = true;
+      ShowStatusBar = true;
+    };
+    NSGlobalDomain = {
+      AppleShowAllExtensions = true;
+      AppleShowAllFiles = true;
+      AppleInterfaceStyle = "Dark";
+      NSAutomaticCapitalizationEnabled = false;
+      "com.apple.swipescrolldirection" = false;
+      "com.apple.keyboard.fnState" = true;
+      KeyRepeat = 2;
+      AppleEnableMouseSwipeNavigateWithScrolls = false;
+      AppleEnableSwipeNavigateWithScrolls = true;
+      NSAutomaticDashSubstitutionEnabled = false;
+      NSAutomaticPeriodSubstitutionEnabled = false;
+      NSAutomaticQuoteSubstitutionEnabled = false;
+      NSAutomaticSpellingCorrectionEnabled = false;
+      NSDisableAutomaticTermination = true;
+    };
+
+    CustomSystemPreferences = {
+      "com.mitchellh.ghostty" = {
+        "NSUserKeyEquilvalents" = {
+          "Hide Ghostty" = " ";
+          "Hide Others" = " ";
+        };
+      };
+    };
   };
 }