From 53a64aaf52ed1bac6e321ddf2ef6720bd602d37a Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Thu, 20 Nov 2025 16:18:28 -0600 Subject: [PATCH] formatting --- .../mattjallen@macbook-pro/default.nix | 138 +++++++++--------- modules/darwin/home/default.nix | 18 +-- modules/darwin/programs/ssh/default.nix | 4 +- modules/home/programs/waybar/default.nix | 19 ++- modules/nixos/hardware/battery/default.nix | 2 +- modules/nixos/home/default.nix | 2 +- packages/librepods-beta/default.nix | 61 ++++---- .../aarch64-darwin/macbook-pro/settings.nix | 62 ++++---- 8 files changed, 151 insertions(+), 155 deletions(-) diff --git a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix b/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix index d939386..aecacc2 100755 --- a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix +++ b/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix @@ -144,34 +144,34 @@ in showIndicatorsForOpenApplications = true; showSuggestedAndRecentAppsInDock = false; size = 64; # 16 - 128 - # persistentApps = [ - # { app = "/Applications/Clock.app"; } - # { folder = "/Applications"; } - # { app = "/Applications/Safari.app"; } - # { app = "/Applications/Firefox.app"; } - # { app = "/Applications/Tabby.app"; } - # { app = "/Applications/Termius.app"; } - # { app = "/Applications/Muic.app"; } - # { app = "/Applications/Vesktop.app"; } - # { app = "/Applications/Messages.app"; } - # { app = "/Applications/Calendar.app"; } - # { app = "/Applications/Reminders.app"; } - # { app = "/Applications/Notes.app"; } - # { app = "/Applications/Weather.app"; } - # { app = "/Applications/Maps.app"; } - # { app = "/Applications/App Store.app"; } - # { app = "/Applications/System Settings.app"; } - # { app = "/Applications/ChatGPT.app"; } - # { app = "/Applications/Nextcloud.app"; } - # { app = "/Applications/VSCodium.app"; } - # { app = "/Applications/Omnissa Horizon Client.app"; } - # { app = "/Applications/Proton Pass.app"; } - # { app = "/Applications/OrcaSlicer.app"; } - # { app = "/Applications/AlDente.app"; } - # ]; - # persistentOthers = [ - # "~/Downloads" - # ]; + # persistentApps = [ + # { app = "/Applications/Clock.app"; } + # { folder = "/Applications"; } + # { app = "/Applications/Safari.app"; } + # { app = "/Applications/Firefox.app"; } + # { app = "/Applications/Tabby.app"; } + # { app = "/Applications/Termius.app"; } + # { app = "/Applications/Muic.app"; } + # { app = "/Applications/Vesktop.app"; } + # { app = "/Applications/Messages.app"; } + # { app = "/Applications/Calendar.app"; } + # { app = "/Applications/Reminders.app"; } + # { app = "/Applications/Notes.app"; } + # { app = "/Applications/Weather.app"; } + # { app = "/Applications/Maps.app"; } + # { app = "/Applications/App Store.app"; } + # { app = "/Applications/System Settings.app"; } + # { app = "/Applications/ChatGPT.app"; } + # { app = "/Applications/Nextcloud.app"; } + # { app = "/Applications/VSCodium.app"; } + # { app = "/Applications/Omnissa Horizon Client.app"; } + # { app = "/Applications/Proton Pass.app"; } + # { app = "/Applications/OrcaSlicer.app"; } + # { app = "/Applications/AlDente.app"; } + # ]; + # persistentOthers = [ + # "~/Downloads" + # ]; }; hotCorners = { # ["-" "Mission Control" "Application Windows" "Desktop" "Start Screen Saver" "Disable Screen Saver" "Dashboard" "Put Display to Sleep" "Launchpad" "Notification Center" "Lock Screen" "Quick Note"] @@ -204,49 +204,49 @@ in preferTabsWhenOpeningDocuments = "In Full Screen"; tiledWindowsHaveMargin = false; }; - }; - focus = { - shareAcrossDevices = true; - }; - general.dateAndTime."24HourTime" = false; - notifications = { - notificationCenter = { - showPreviews = "When Unlocked"; - summarizeNotifications = true; }; - }; - sound = { - soundEffects = { - alertSound = "Boop"; - alertVolume = 0.7; - playFeedbackWhenVolumeIsChanged = true; - playUserInterfaceSoundEffects = true; + focus = { + shareAcrossDevices = true; }; - }; - spotlight = { - helpAppleImproveSearch = false; - # searchResults = { - # applications = true; - # calculator = true; - # contacts = true; - # conversion = true; - # definition = true; - # developer = true; - # documents = true; - # eventsAndReminders = true; - # folders = true; - # fonts = false; - # images = true; - # mailAndMessages = true; - # movies = true; - # music = true; - # other = false; - # pdfDocuments = true; - # presentations = true; - # siriSuggestions = false; - # systemSettings = true; - # tips = false; - # websites = true; + general.dateAndTime."24HourTime" = false; + notifications = { + notificationCenter = { + showPreviews = "When Unlocked"; + summarizeNotifications = true; + }; + }; + sound = { + soundEffects = { + alertSound = "Boop"; + alertVolume = 0.7; + playFeedbackWhenVolumeIsChanged = true; + playUserInterfaceSoundEffects = true; + }; + }; + spotlight = { + helpAppleImproveSearch = false; + # searchResults = { + # applications = true; + # calculator = true; + # contacts = true; + # conversion = true; + # definition = true; + # developer = true; + # documents = true; + # eventsAndReminders = true; + # folders = true; + # fonts = false; + # images = true; + # mailAndMessages = true; + # movies = true; + # music = true; + # other = false; + # pdfDocuments = true; + # presentations = true; + # siriSuggestions = false; + # systemSettings = true; + # tips = false; + # websites = true; }; }; }; diff --git a/modules/darwin/home/default.nix b/modules/darwin/home/default.nix index d508626..f4f14a1 100644 --- a/modules/darwin/home/default.nix +++ b/modules/darwin/home/default.nix @@ -1,10 +1,8 @@ { - config, lib, options, namespace, inputs, - system, ... }: { @@ -43,17 +41,13 @@ }; # Make ALL external HM modules available globally - sharedModules = - with inputs; - [ - sops-nix.homeManagerModules.sops - nix-plist-manager.homeManagerModules.default - # Add any other external HM modules here - ]; + sharedModules = with inputs; [ + sops-nix.homeManagerModules.sops + nix-plist-manager.homeManagerModules.default + # Add any other external HM modules here + ]; - users."mattjallen" = - lib.mkAliasDefinitions - options.${namespace}.home.extraOptions; + users."mattjallen" = lib.mkAliasDefinitions options.${namespace}.home.extraOptions; verbose = true; }; diff --git a/modules/darwin/programs/ssh/default.nix b/modules/darwin/programs/ssh/default.nix index d3742e3..e9ee118 100644 --- a/modules/darwin/programs/ssh/default.nix +++ b/modules/darwin/programs/ssh/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { config = { programs.ssh.knownHosts = { @@ -10,4 +10,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix index 8e8762f..d644a1c 100755 --- a/modules/home/programs/waybar/default.nix +++ b/modules/home/programs/waybar/default.nix @@ -24,16 +24,15 @@ let border-radius: 0rem 1rem 1rem 0rem; margin-right: 0.5rem; ''; - borderLeft = - palette.tokens.borderLeft or '' - padding-top: 0.2rem; - padding-bottom: 0.2rem; - padding-left: 0.5rem; - padding-right: 0.5rem; - margin: 3px 0; - border-radius: 1rem 0rem 0rem 1rem; - margin-left: 0.5rem; - ''; + borderLeft = '' + padding-top: 0.2rem; + padding-bottom: 0.2rem; + padding-left: 0.5rem; + padding-right: 0.5rem; + margin: 3px 0; + border-radius: 1rem 0rem 0rem 1rem; + margin-left: 0.5rem; + ''; baseStyle = if cfg.style.file != null then diff --git a/modules/nixos/hardware/battery/default.nix b/modules/nixos/hardware/battery/default.nix index ff5d56c..57e8080 100644 --- a/modules/nixos/hardware/battery/default.nix +++ b/modules/nixos/hardware/battery/default.nix @@ -40,4 +40,4 @@ in }; }; }; -} \ No newline at end of file +} diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index 9561f05..b2900e3 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -67,7 +67,7 @@ in # Add any other external HM modules here ] ++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ]) - ++ (if (isDarwin) then with inputs; [ ] else [ ]); + ++ (if (isDarwin) then with inputs; [ ] else [ ]); users.${config.${namespace}.user.name} = lib.mkAliasDefinitions diff --git a/packages/librepods-beta/default.nix b/packages/librepods-beta/default.nix index dd6722c..e06b9fb 100644 --- a/packages/librepods-beta/default.nix +++ b/packages/librepods-beta/default.nix @@ -1,20 +1,21 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, makeWrapper -, dbus -, libpulseaudio -, gtk4 -, libadwaita -, glib -, bluez -, wayland -, libxkbcommon -, libGL -, vulkan-loader -, xorg -, gsettings-desktop-schemas +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeWrapper, + dbus, + libpulseaudio, + gtk4, + libadwaita, + glib, + bluez, + wayland, + libxkbcommon, + libGL, + vulkan-loader, + xorg, + gsettings-desktop-schemas, }: rustPlatform.buildRustPackage rec { @@ -58,18 +59,20 @@ rustPlatform.buildRustPackage rec { # Create wrapper script instead of wrapping in-place postInstall = '' mv $out/bin/librepods $out/bin/.librepods-unwrapped - + makeWrapper $out/bin/.librepods-unwrapped $out/bin/librepods \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ - wayland - libxkbcommon - libGL - vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - ]}" \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + wayland + libxkbcommon + libGL + vulkan-loader + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + ] + }" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --set GDK_BACKEND "wayland,x11" ''; @@ -82,4 +85,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "librepods"; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/systems/aarch64-darwin/macbook-pro/settings.nix b/systems/aarch64-darwin/macbook-pro/settings.nix index 9fcd3d2..8e78fd7 100644 --- a/systems/aarch64-darwin/macbook-pro/settings.nix +++ b/systems/aarch64-darwin/macbook-pro/settings.nix @@ -4,39 +4,39 @@ enable = true; options = { applications.systemSettings = { - # # allowWallpaperTintingInWindows = true; - general = { - softwareUpdate = { - automaticallyDownloadNewUpdatesWhenAvailable = true; - automaticallyInstallMacOSUpdates = false; - automaticallyInstallApplicationUpdatesFromTheAppStore = false; - automaticallyInstallSecurityResponseAndSystemFiles = true; + # # allowWallpaperTintingInWindows = true; + general = { + softwareUpdate = { + automaticallyDownloadNewUpdatesWhenAvailable = true; + automaticallyInstallMacOSUpdates = false; + automaticallyInstallApplicationUpdatesFromTheAppStore = false; + automaticallyInstallSecurityResponseAndSystemFiles = true; + }; + # dateAndTime = { + # # setTimeAndDateAutomatically = true; + # "24HourTime" = "System"; + # # show24HourTimeOnLockScreen = false; + # # setTimeZoneAutomaticallyUsingCurrentLocation = true; + # }; + # keyboard = { + # keyRepeatRate = 6; # 1-7 + # keyRepeatDelay = 4; # 1-6 + # adjustKeyboardBrightnessInLowLight = true; + # keyboardBrightness = 0.5; + # turnKeyboardBacklightOffAfterInactivity = "Never"; + # pressGlobeKeyTo = "Show Emoji & Symbols"; + # keyboardNavigation = false; + # useF1F2EtcAsStandardFunctionKeys = false; + # dictation.enabled = false; + # }; }; - # dateAndTime = { - # # setTimeAndDateAutomatically = true; - # "24HourTime" = "System"; - # # show24HourTimeOnLockScreen = false; - # # setTimeZoneAutomaticallyUsingCurrentLocation = true; - # }; - # keyboard = { - # keyRepeatRate = 6; # 1-7 - # keyRepeatDelay = 4; # 1-6 - # adjustKeyboardBrightnessInLowLight = true; - # keyboardBrightness = 0.5; - # turnKeyboardBacklightOffAfterInactivity = "Never"; - # pressGlobeKeyTo = "Show Emoji & Symbols"; - # keyboardNavigation = false; - # useF1F2EtcAsStandardFunctionKeys = false; - # dictation.enabled = false; - # }; + # trackpad = { + # trackingSpeed = 4; + # click = "Medium"; + # forceClickAndHapticFeedback = true; + # tapToClick = true; + # }; }; - # trackpad = { - # trackingSpeed = 4; - # click = "Medium"; - # forceClickAndHapticFeedback = true; - # tapToClick = true; - # }; - }; }; }; }