feat(git,dock): show git status, set only listed app in dock

pwnwriter · Nov 20, 2024 · e1893d5 · e1893d5
1 parent e5d5792
commit e1893d5
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 24 deletions.
diff --git a/flake.nix b/flake.nix
@@ -32,7 +32,6 @@
             ./modules/darwin.nix
             home-manager.darwinModules.home-manager
             {
-              home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.pwnwriter = {
                 imports = [

diff --git a/modules/darwin.nix b/modules/darwin.nix
@@ -9,36 +9,73 @@
 
   networking.computerName = "earlymoon";
 
-  nix.settings.trusted-users = [ "pwnwriter" ];
+  nix.settings.trusted-users = [
+    "root"
+    "pwnwriter"
+  ];
 
   programs.zsh.enable = true;
 
-  system.defaults = {
-    dock = {
-      tilesize = 20;
-      orientation = "left";
-      autohide = true;
-    };
+  system = {
+    defaults = {
+      dock = {
+        tilesize = 20;
+        orientation = "left";
+        autohide = true;
+        persistent-apps = [
+          "/System/Applications/Notes.app"
+          "/System/Applications/Calendar.app"
+          "/System/Cryptexes/App/System/Applications/Safari.app"
+          "/System/Applications/Mail.app"
+          "/System/Applications/Messages.app"
+          "/System/Applications/Music.app"
+        ];
+      };
 
-    CustomUserPreferences."com.apple.screencapture" = {
-      location = "~/Documents/screenshots";
-      type = "png";
-    };
+      CustomUserPreferences = {
+        # "com.apple.Safari" = {
+        #   IncludeInternalDebugMenu = true;
+        #   IncludeDevelopMenu = true;
+        #   WebKitDeveloperExtrasEnabledPreferenceKey = true;
+        #   ShowFullURLInSmartSearchField = true;
+        #   AutoOpenSafeDownloads = false;
+        #   AutoFillCreditCardData = false;
+        #   AutoFillFromAddressBook = false;
+        #   AutoFillMiscellaneousForms = false;
+        #   AutoFillPasswords = false;
+        #   "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" = true;
+        #   AlwaysRestoreSessionAtLaunch = 1;
+        #   ExcludePrivateWindowWhenRestoringSessionAtLaunch = 1;
+        #   ShowBackgroundImageInFavorites = 0;
+        #   ShowFrequentlyVisitedSites = 1;
+        #   ShowHighlightsInFavorites = 1;
+        #   ShowPrivacyReportInFavorites = 1;
+        #   ShowRecentlyClosedTabsPreferenceKey = 1;
+        # };
 
-    NSGlobalDomain = {
-      _HIHideMenuBar = true;
-      InitialKeyRepeat = 15;
-      KeyRepeat = 2;
-    };
+        "com.apple.screencapture" = {
+          location = "~/Documents/screenshots";
+          type = "png";
 
-    SoftwareUpdate = {
-      AutomaticallyInstallMacOSUpdates = false;
-    };
+        };
+      };
+
+      NSGlobalDomain = {
+        _HIHideMenuBar = true;
+        InitialKeyRepeat = 15;
+        KeyRepeat = 2;
+      };
+
+      SoftwareUpdate = {
+        AutomaticallyInstallMacOSUpdates = false;
+      };
+
+      trackpad = {
+        Clicking = true;
+      };
 
-    trackpad = {
-      Clicking = true;
+      loginwindow.LoginwindowText = "Have you been pwned?";
     };
 
-    loginwindow.LoginwindowText = "Have you been pwned?";
   };
 }
diff --git a/modules/starship.nix b/modules/starship.nix
@@ -28,7 +28,8 @@ in
     settings = {
       scan_timeout = 10;
 
-      format = lib.concatStrings [ "$directory$git_branch$git_status$character" ];
+      #format = lib.concatStrings [ "$directory$git_branch$git_status$character" ];
+      format = lib.concatStrings [ "$directory$git_branch$character" ];
 
       right_format = lib.concatStrings [ "$nix_shell" ];